refactor vMM cord-3.0
Change-Id: I2672d03515178057180e172b6a8f47ea8da68056
diff --git a/xos/admin.py b/xos/admin.py
deleted file mode 100644
index fff263f..0000000
--- a/xos/admin.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from core.admin import ReadOnlyAwareAdmin, SliceInline
-from core.middleware import get_request
-from core.models import User
-
-from django import forms
-from django.contrib import admin
-
-from services.vmm.models import *
-
-class VMMServiceForm(forms.ModelForm):
-
- class Meta:
- model = VMMService
- fields = '__all__'
-
- def __init__(self, *args, **kwargs):
- super(VMMServiceForm, self).__init__(*args, **kwargs)
-
- def save(self, commit=True):
- return super(VMMServiceForm, self).save(commit=commit)
-
-class VMMServiceAdmin(ReadOnlyAwareAdmin):
-
- model = VMMService
- verbose_name = "VMM Service"
- verbose_name_plural = "VMM Services"
- form = VMMServiceForm
- inlines = [SliceInline]
-
- list_display = ('backend_status_icon', 'name', 'enabled')
- list_display_links = ('backend_status_icon', 'name')
-
- fieldsets = [(None, {
- 'fields': ['backend_status_text', 'name', 'enabled', 'versionNumber', 'description',],
- 'classes':['suit-tab suit-tab-general',],
- })]
-
- readonly_fields = ('backend_status_text', )
- user_readonly_fields = ['name', 'enabled', 'versionNumber', 'description',]
-
- extracontext_registered_admins = True
-
- suit_form_tabs = (
- ('general', 'VMM Service Details', ),
- ('slices', 'Slices',),
- )
-
- suit_form_includes = (('mcordadmin.html',
- 'top',
- 'administration'),)
-
- def get_queryset(self, request):
- return VMMService.get_service_objects_by_user(request.user)
-
-admin.site.register(VMMService, VMMServiceAdmin)
-
-class VMMTenantForm(forms.ModelForm):
-
- class Meta:
- model = VMMTenant
- fields = '__all__'
-
- creator = forms.ModelChoiceField(queryset=User.objects.all())
-
- def __init__(self, *args, **kwargs):
- super(VMMTenantForm, self).__init__(*args, **kwargs)
-
- self.fields['kind'].widget.attrs['readonly'] = True
- self.fields['kind'].initial = "vmm"
-
- self.fields['provider_service'].queryset = VMMService.get_service_objects().all()
-
- if self.instance:
- self.fields['creator'].initial = self.instance.creator
- self.fields['tenant_message'].initial = self.instance.tenant_message
- self.fields['image_name'].initial = self.instance.image_name
-
- if (not self.instance) or (not self.instance.pk):
- self.fields['creator'].initial = get_request().user
- if VMMService.get_service_objects().exists():
- self.fields['provider_service'].initial = VMMService.get_service_objects().all()[0]
-
- def save(self, commit=True):
- self.instance.creator = self.cleaned_data.get('creator')
- self.instance.tenant_message = self.cleaned_data.get('tenant_message')
- self.instance.image_name = self.cleaned_data.get('image_name')
- return super(VMMTenantForm, self).save(commit=commit)
-
-
-class VMMTenantAdmin(ReadOnlyAwareAdmin):
-
- verbose_name = "VMM Service Tenant"
- verbose_name_plural = "VMM Service Tenants"
-
- list_display = ('id', 'backend_status_icon', 'instance', 'tenant_message', 'image_name')
- list_display_links = ('backend_status_icon', 'instance', 'tenant_message', 'id', 'image_name')
-
- fieldsets = [(None, {
- 'fields': ['backend_status_text', 'kind', 'provider_service', 'instance', 'creator', 'tenant_message', 'image_name'],
- 'classes': ['suit-tab suit-tab-general'],
- })]
-
- readonly_fields = ('backend_status_text', 'instance',)
-
- form = VMMTenantForm
-
- suit_form_tabs = (('general', 'Details'),)
-
- def get_queryset(self, request):
- return VMMTenant.get_tenant_objects_by_user(request.user)
-
-admin.site.register(VMMTenant, VMMTenantAdmin)
diff --git a/xos/header.py b/xos/header.py
deleted file mode 100644
index 2e60747..0000000
--- a/xos/header.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from django.db import models
-from core.models import Service, PlCoreBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, NetworkParameter, NetworkParameterType, Port, AddressPool
-from core.models.plcorebase import StrippedCharField
-import os
-from django.db import models, transaction
-from django.forms.models import model_to_dict
-from django.db.models import *
-from operator import itemgetter, attrgetter, methodcaller
-from core.models import Tag
-from core.models.service import LeastLoadedNodeScheduler
-import traceback
-from xos.exceptions import *
-from xos.config import Config
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.fields import GenericForeignKey
diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
old mode 100644
new mode 100755
diff --git a/xos/models.py b/xos/models.py
index 8e19f54..a119fce 100644
--- a/xos/models.py
+++ b/xos/models.py
@@ -2,6 +2,22 @@
from models_decl import VMMService_decl
from models_decl import VMMTenant_decl
+from django.db import models
+from core.models import Service, PlCoreBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, NetworkParameter, NetworkParameterType, Port, AddressPool
+from core.models.plcorebase import StrippedCharField
+import os
+from django.db import models, transaction
+from django.forms.models import model_to_dict
+from django.db.models import *
+from operator import itemgetter, attrgetter, methodcaller
+from core.models import Tag
+from core.models.service import LeastLoadedNodeScheduler
+import traceback
+from xos.exceptions import *
+from xos.config import Config
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.fields import GenericForeignKey
+
class VMMService(VMMService_decl):
class Meta:
proxy = True
diff --git a/xos/synchronizer/steps/sync_vmmetenant.py b/xos/synchronizer/steps/sync_vmmtenant.py
similarity index 76%
rename from xos/synchronizer/steps/sync_vmmetenant.py
rename to xos/synchronizer/steps/sync_vmmtenant.py
index afc2487..44458be 100644
--- a/xos/synchronizer/steps/sync_vmmetenant.py
+++ b/xos/synchronizer/steps/sync_vmmtenant.py
@@ -17,7 +17,7 @@
template_name = "vmmtenant_playbook.yaml"
- service_key_name = "/opt/xos/synchronizers/vmm/vmm_private_key"
+ service_key_name = "/opt/xos/configurations/mcord/mcord_private_key"
def __init__(self, *args, **kwargs):
super(SyncVMMTenant, self).__init__(*args, **kwargs)
@@ -33,22 +33,10 @@
return objs
- def get_vmmservice(self, o):
- if not o.provider_service:
- return None
-
- vmmservice = VMMService.get_service_objects().filter(id=o.provider_service.id)
-
- if not vmmservice:
- return None
-
- return vmmservice[0]
-
# Gets the attributes that are used by the Ansible template but are not
# part of the set of default attributes.
def get_extra_attributes(self, o):
fields = {}
fields['tenant_message'] = o.tenant_message
- fields['image_name'] = o.image_name
return fields
diff --git a/xos/synchronizer/steps/vmmetenant_playbook.yaml b/xos/synchronizer/steps/vmmtenant_playbook.yaml
similarity index 78%
rename from xos/synchronizer/steps/vmmetenant_playbook.yaml
rename to xos/synchronizer/steps/vmmtenant_playbook.yaml
index c8a74d0..699448d 100644
--- a/xos/synchronizer/steps/vmmetenant_playbook.yaml
+++ b/xos/synchronizer/steps/vmmtenant_playbook.yaml
@@ -5,6 +5,8 @@
user: ubuntu
sudo: yes
tasks:
-
+ vars:
+ - tenant_message: "{{ tenant_message }}"
+
# - name: write message
# shell: echo "{{ tenant_message }}" > /var/tmp/index.html
diff --git a/xos/synchronizer/vmm-synchronizer.py b/xos/synchronizer/vmm-synchronizer.py
old mode 100644
new mode 100755
diff --git a/xos/templates/mcordadmin.html b/xos/templates/mcordadmin.html
deleted file mode 100644
index ebf41d0..0000000
--- a/xos/templates/mcordadmin.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class = "left-nav">
- <ul>
- <li>
- <a href="/admin/mcordservice/vmmcomponent/">
- MCORD Service Components
- </a>
- </li>
- </ul>
-</div>
diff --git a/xos/tosca/custom_types/vmm.m4 b/xos/tosca/custom_types/vmm.m4
index 0cd9125..e24c534 100644
--- a/xos/tosca/custom_types/vmm.m4
+++ b/xos/tosca/custom_types/vmm.m4
@@ -16,3 +16,13 @@
xos_base_props
xos_base_service_props
+ tosca.nodes.VMMTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ VMM Tenant
+ properties:
+ xos_base_tenant_props
+ tenant_message:
+ type: string
+ required: false
+
diff --git a/xos/tosca/custom_types/vmm.yaml b/xos/tosca/custom_types/vmm.yaml
index 3c1f701..ae38c00 100644
--- a/xos/tosca/custom_types/vmm.yaml
+++ b/xos/tosca/custom_types/vmm.yaml
@@ -79,3 +79,20 @@
required: false
description: Version number of Service.
+ tosca.nodes.VMMTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ VMM Tenant
+ properties:
+ kind:
+ type: string
+ default: generic
+ description: Kind of tenant
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service
+ tenant_message:
+ type: string
+ required: false
+
diff --git a/xos/tosca/resources/vmmservice.py b/xos/tosca/resources/vmmservice.py
index 830ed1e..55fc17c 100644
--- a/xos/tosca/resources/vmmservice.py
+++ b/xos/tosca/resources/vmmservice.py
@@ -4,4 +4,4 @@
class XOSVMMService(XOSService):
provides = "tosca.nodes.VMMService"
xos_model = VMMService
- copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
\ No newline at end of file
+ copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
diff --git a/xos/tosca/resources/vmmtenant.py b/xos/tosca/resources/vmmtenant.py
index 3d987f2..f559fc7 100644
--- a/xos/tosca/resources/vmmtenant.py
+++ b/xos/tosca/resources/vmmtenant.py
@@ -1,18 +1,19 @@
-from services.vmm.models import VMMTenant, VMMService
from xosresource import XOSResource
+from core.models import Tenant, Service
+from services.vmm.models import VMMTenant
class XOSVMMTenant(XOSResource):
provides = "tosca.nodes.VMMTenant"
xos_model = VMMTenant
- copyin_props = ["tenant_message", "image_name"]
+ copyin_props = ("tenant_message",)
name_field = None
def get_xos_args(self, throw_exception=True):
args = super(XOSVMMTenant, self).get_xos_args()
- provider_name = self.get_requirement("tosca.relationships.MemberOfService", throw_exception=throw_exception)
+ provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=throw_exception)
if provider_name:
- args["provider_service"] = self.get_xos_object(VMMService, throw_exception=throw_exception, name=provider_name)
+ args["provider_service"] = self.get_xos_object(Service, throw_exception=throw_exception, name=provider_name)
return args
diff --git a/xos/vmm-onboard.yaml b/xos/vmm-onboard.yaml
index b4b62b1..574c56b 100644
--- a/xos/vmm-onboard.yaml
+++ b/xos/vmm-onboard.yaml
@@ -14,8 +14,6 @@
# The following will concatenate with base_url automatically, if
# base_url is non-null.
xproto: ./
- admin: admin.py
- admin_template: templates/mcordadmin.html
tosca_custom_types: tosca/custom_types/vmm.yaml
synchronizer: synchronizer/manifest
synchronizer_run: vmm-synchronizer.py
diff --git a/xos/vmm.xproto b/xos/vmm.xproto
index 60670ff..45cb746 100644
--- a/xos/vmm.xproto
+++ b/xos/vmm.xproto
@@ -1,15 +1,16 @@
-option name = "vmm";
+option name = "vMM";
+option verbose_name = "Virtual Mobility Management";
option app_label = "vmm";
-option verbose_name = "vMM Service";
option kind = "vEPC";
option legacy = "True";
message VMMService (Service){
- required string service_message = 1 [help_text = "Service Message to Display", max_length = 254, null = False, db_index = False, blank = False];
+ option name = "VMMService";
+ option verbose_name = "Virtual Mobility Management Service";
}
message VMMTenant (TenantWithContainer){
- option name = "vmmtenant";
- option verbose_name = "vMM Tenant";
+ option name = "VMMTenant";
+ option verbose_name = "Virtual Mobility Management Tenant";
required string tenant_message = 1 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
}