commit a1d6e29611aee26ae2eff13e2950a098013a1a02
author Omar Abdelkader <omikader@gmail.com> Wed Aug 30 10:46:28 2017 -0600
committer Omar Abdelkader <omikader@gmail.com> Tue Sep 05 13:12:48 2017 -0600
tree 8e307067a6cc6a34e76c043cce7fd9cdb608e7a6
parent dc68880a534e2207afdf828366ae035b8997da7e

epc-as-a-service functionality added

Change-Id: I20b5dd073ef75c83a07c41c987b7ec05e4aa2f06

xos/models.py

diff --git a/xos/models.py b/xos/models.py
index dcd19c5..16bc8c2 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 VSGWCService(VSGWCService_decl):
    class Meta:
         proxy = True 
 
    def create_tenant(self, **kwargs):
-       t = VSGWCTenant(kind="vEPC", provider_service=self, connect_method="na", tenant_message="vsgwc tenant in service chain", **kwargs)
+       t = VSGWCTenant(kind="vEPC", provider_service=self, connect_method="na", **kwargs)
        t.save()
        return t
 

xos/tosca/custom_types/vsgwc.m4

diff --git a/xos/tosca/custom_types/vsgwc.m4 b/xos/tosca/custom_types/vsgwc.m4
index 144921a..9e24b92 100644
--- a/xos/tosca/custom_types/vsgwc.m4
+++ b/xos/tosca/custom_types/vsgwc.m4
@@ -22,6 +22,3 @@
             VSGWC Tenant
         properties:
             xos_base_tenant_props
-            tenant_message:
-                type: string
-                required: false

xos/tosca/custom_types/vsgwc.yaml

diff --git a/xos/tosca/custom_types/vsgwc.yaml b/xos/tosca/custom_types/vsgwc.yaml
index bedc21f..de51ecd 100644
--- a/xos/tosca/custom_types/vsgwc.yaml
+++ b/xos/tosca/custom_types/vsgwc.yaml
@@ -92,6 +92,3 @@
                 type: string
                 required: false
                 description: Service specific ID opaque to XOS but meaningful to service
-            tenant_message:
-                type: string
-                required: false

xos/tosca/resources/vsgwctenant.py

diff --git a/xos/tosca/resources/vsgwctenant.py b/xos/tosca/resources/vsgwctenant.py
index 6b1d46c..d27028b 100644
--- a/xos/tosca/resources/vsgwctenant.py
+++ b/xos/tosca/resources/vsgwctenant.py
@@ -6,7 +6,7 @@
     provides = "tosca.nodes.VSGWCTenant"
     xos_model = VSGWCTenant
     name_field = "service_specific_id"
-    copyin_props = ("tenant_message",)
+    copyin_props = ()
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVSGWCTenant, self).get_xos_args()

xos/vsgwc.xproto

diff --git a/xos/vsgwc.xproto b/xos/vsgwc.xproto
index dfe65f0..a84f7cf 100644
--- a/xos/vsgwc.xproto
+++ b/xos/vsgwc.xproto
@@ -12,5 +12,4 @@
 message VSGWCTenant (TenantWithContainer){
      option name = "VSGWCTenant";
      option verbose_name = "Virtual Serving Gateway -- Control Plane Tenant";
-     required string tenant_message = 1 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
 }