commit 676b9aa8e45d403b051324e6b86035656cf2e04f
author Omar Abdelkader <omikader@gmail.com> Wed Aug 30 10:40:49 2017 -0600
committer Omar Abdelkader <omikader@gmail.com> Tue Sep 05 14:22:16 2017 -0600
tree 9dfd0c2a7e26f95d6fd4984bf4aa9b24f25191f5
parent e4080aed4ebd5d412ba1a5f442f5692f8b05269e

epc-as-a-service functionality added

Change-Id: Ia1da1cb2c82eaf77cf87e9e80f3f1a93c433cbe5

xos/models.py

diff --git a/xos/models.py b/xos/models.py
index 12e137f..459d9f7 100644
--- a/xos/models.py
+++ b/xos/models.py
@@ -15,15 +15,13 @@
 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 VHSSService(VHSSService_decl):
    class Meta:
         proxy = True 
 
    def create_tenant(self, **kwargs):
-       t = VHSSTenant(kind="vEPC", provider_service=self, connect_method="na", tenant_message="vhss tenant in service chain", **kwargs)
+       t = VHSSTenant(kind="vEPC", provider_service=self, connect_method="na", **kwargs)
        t.save()
        return t
 

xos/tosca/custom_types/vhss.m4

diff --git a/xos/tosca/custom_types/vhss.m4 b/xos/tosca/custom_types/vhss.m4
index 9a2ee17..69f6e1d 100644
--- a/xos/tosca/custom_types/vhss.m4
+++ b/xos/tosca/custom_types/vhss.m4
@@ -22,7 +22,4 @@
             A Tenant of the vHSS service
         properties:
             xos_base_tenant_props
-            tenant_message:
-                type: string
-                required: false
 

xos/tosca/custom_types/vhss.yaml

diff --git a/xos/tosca/custom_types/vhss.yaml b/xos/tosca/custom_types/vhss.yaml
index db0c41b..1c18c58 100644
--- a/xos/tosca/custom_types/vhss.yaml
+++ b/xos/tosca/custom_types/vhss.yaml
@@ -92,7 +92,4 @@
                 type: string
                 required: false
                 description: Service specific ID opaque to XOS but meaningful to service
-            tenant_message:
-                type: string
-                required: false
 

xos/tosca/resources/vhsstenant.py

diff --git a/xos/tosca/resources/vhsstenant.py b/xos/tosca/resources/vhsstenant.py
index aa027a1..3ffc83f 100644
--- a/xos/tosca/resources/vhsstenant.py
+++ b/xos/tosca/resources/vhsstenant.py
@@ -6,7 +6,7 @@
     provides = "tosca.nodes.VHSSTenant"
     xos_model = VHSSTenant
     name_field = "service_specific_id"
-    copyin_props = ("tenant_message",)
+    copyin_props = ()
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVHSSTenant, self).get_xos_args()

xos/vhss.xproto

diff --git a/xos/vhss.xproto b/xos/vhss.xproto
index 4a951f7..831dd1e 100644
--- a/xos/vhss.xproto
+++ b/xos/vhss.xproto
@@ -12,5 +12,4 @@
 message VHSSTenant (TenantWithContainer){
      option name = "VHSSTenant";
      option verbose_name = "Virtual Home Subscriber Server Tenant";
-     required string tenant_message = 1 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
 }