commit ac37f26b44af7fb08be540db4cec8b628a83f6ae
author Omar Abdelkader <omikader@gmail.com> Wed Aug 30 10:44:22 2017 -0600
committer Omar Abdelkader <omikader@gmail.com> Tue Sep 05 14:13:20 2017 -0600
tree 693d63be88326565d460dcc919e25ff22e22d091
parent 897570330745167f1b2c0fa71d156f20f837ee4e

epc-as-a-service functionality added

Change-Id: Ifb68ab583f7fe8fcfc9fba588a10e1e02bc8b59f

xos/models.py

diff --git a/xos/models.py b/xos/models.py
index d8c7bc9..07c3404 100644
--- a/xos/models.py
+++ b/xos/models.py
@@ -16,8 +16,6 @@
 from xos.exceptions import *
 from sets import Set
 from xos.config import Config
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.fields import GenericForeignKey
 
 class VPGWCService(VPGWCService_decl):
    class Meta:

xos/tosca/custom_types/vpgwc.m4

diff --git a/xos/tosca/custom_types/vpgwc.m4 b/xos/tosca/custom_types/vpgwc.m4
index f8ae6c3..63e6ef8 100644
--- a/xos/tosca/custom_types/vpgwc.m4
+++ b/xos/tosca/custom_types/vpgwc.m4
@@ -22,12 +22,3 @@
             CORD - The vPGWC Tenant
         properties:
             xos_base_tenant_props
-            display_message:
-                type: string
-                required: false
-            s5s8_pgw_tag:
-                type: string
-                required: false
-            image_name:
-                type: string
-                required: false

xos/tosca/custom_types/vpgwc.yaml

diff --git a/xos/tosca/custom_types/vpgwc.yaml b/xos/tosca/custom_types/vpgwc.yaml
index e985449..ee7c45f 100644
--- a/xos/tosca/custom_types/vpgwc.yaml
+++ b/xos/tosca/custom_types/vpgwc.yaml
@@ -90,12 +90,3 @@
                 type: string
                 required: false
                 description: Service specific ID opaque to XOS but meaningful to service
-            display_message:
-                type: string
-                required: false
-            s5s8_pgw_tag:
-                type: string
-                required: false
-            image_name:
-                type: string
-                required: false

xos/tosca/resources/vpgwctenant.py

diff --git a/xos/tosca/resources/vpgwctenant.py b/xos/tosca/resources/vpgwctenant.py
index 4b73116..49052c9 100644
--- a/xos/tosca/resources/vpgwctenant.py
+++ b/xos/tosca/resources/vpgwctenant.py
@@ -6,7 +6,7 @@
     provides = "tosca.nodes.VPGWCTenant"
     xos_model = VPGWCTenant
     name_field = None
-    copyin_props = ["s5s8_pgw_tag", "display_message", "image_name"]
+    copyin_props = ()
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVPGWCTenant, self).get_xos_args()

xos/vpgwc.xproto

diff --git a/xos/vpgwc.xproto b/xos/vpgwc.xproto
index 2af3b3e..5873d83 100644
--- a/xos/vpgwc.xproto
+++ b/xos/vpgwc.xproto
@@ -12,7 +12,4 @@
 message VPGWCTenant (TenantWithContainer) {
     option name = "VPGWCTenant";
     option verbose_name = "Virtual Packet Gateway -- Control Plane Tenant";
-    optional string display_message = 1 [db_index = False, max_length = 1024, null = True, blank = False, default = "New vPGWC Component"];
-    optional string s5s8_pgw_tag = 2 [db_index = False, max_length = 1024, null = True, content = "stripped", blank = False, default = "300"];
-    optional string image_name = 3 [db_index = False, max_length = 1024, null = True, content = "stripped", blank = False, default = "default"];
 }