epc-as-a-service functionality added

Change-Id: I4641f3dc885e3dd1c7a2950b9e7099b1aed42545
diff --git a/xos/tosca/custom_types/vpgwu.m4 b/xos/tosca/custom_types/vpgwu.m4
index b94b377..5e90bd6 100644
--- a/xos/tosca/custom_types/vpgwu.m4
+++ b/xos/tosca/custom_types/vpgwu.m4
@@ -22,12 +22,3 @@
             CORD - The vPGWU 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
diff --git a/xos/tosca/custom_types/vpgwu.yaml b/xos/tosca/custom_types/vpgwu.yaml
index af366e8..cb4c0a9 100644
--- a/xos/tosca/custom_types/vpgwu.yaml
+++ b/xos/tosca/custom_types/vpgwu.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
diff --git a/xos/tosca/resources/vpgwutenant.py b/xos/tosca/resources/vpgwutenant.py
index 06cbd42..8aa3033 100644
--- a/xos/tosca/resources/vpgwutenant.py
+++ b/xos/tosca/resources/vpgwutenant.py
@@ -6,7 +6,7 @@
     provides = "tosca.nodes.VPGWUTenant"
     xos_model = VPGWUTenant
     name_field = None
-    copyin_props = ["s5s8_pgw_tag", "display_message", "image_name"]
+    copyin_props = ()
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVPGWUTenant, self).get_xos_args()