adding epc-as-a-service, bring up entire custom service chain at once
Change-Id: I2e32e4e9f3479caf7648f8bde7629356691784d3
diff --git a/xos/tosca/custom_types/macros.m4 b/xos/tosca/custom_types/macros.m4
new file mode 100644
index 0000000..4ce86cc
--- /dev/null
+++ b/xos/tosca/custom_types/macros.m4
@@ -0,0 +1,83 @@
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+# inheriting from the parent template. Until we get that figured out, use
+# m4 macros do our inheritance
+
+define(xos_base_props,
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ replaces:
+ type: string
+ required: false
+ descrption: Replaces/renames this object)
+# Service
+define(xos_base_service_caps,
+ scalable:
+ type: tosca.capabilities.Scalable
+ service:
+ type: tosca.capabilities.xos.Service)
+define(xos_base_service_props,
+ kind:
+ type: string
+ default: generic
+ description: Type of service.
+ view_url:
+ type: string
+ required: false
+ description: URL to follow when icon is clicked in the Service Directory.
+ icon_url:
+ type: string
+ required: false
+ description: ICON to display in the Service Directory.
+ enabled:
+ type: boolean
+ default: true
+ published:
+ type: boolean
+ default: true
+ description: If True then display this Service in the Service Directory.
+ public_key:
+ type: string
+ required: false
+ description: Public key to install into Instances to allows Services to SSH into them.
+ private_key_fn:
+ type: string
+ required: false
+ description: Location of private key file
+ versionNumber:
+ type: string
+ required: false
+ description: Version number of Service.)
+# Subscriber
+define(xos_base_subscriber_caps,
+ subscriber:
+ type: tosca.capabilities.xos.Subscriber)
+define(xos_base_subscriber_props,
+ kind:
+ type: string
+ default: generic
+ description: Kind of subscriber
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service)
+define(xos_base_tenant_props,
+ 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)
+
+# end m4 macros
diff --git a/xos/tosca/custom_types/vepc.m4 b/xos/tosca/custom_types/vepc.m4
new file mode 100644
index 0000000..72715e9
--- /dev/null
+++ b/xos/tosca/custom_types/vepc.m4
@@ -0,0 +1,52 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vepc.m4 > vepc.yaml"
+
+# include macros
+include(macros.m4)
+
+node_types:
+ tosca.nodes.VEPCService:
+ derived_from: tosca.nodes.Root
+ description: >
+ VEPC Service
+ capabilities:
+ xos_base_service_caps
+ properties:
+ xos_base_props
+ xos_base_service_props
+
+ tosca.nodes.VEPCTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ VEPC Tenant
+ properties:
+ xos_base_tenant_props
+ description:
+ type: string
+ required: false
+ has_vhss:
+ type: boolean
+ required: true
+ has_vmme:
+ type: boolean
+ required: true
+ has_vmm:
+ type: boolean
+ required: true
+ has_vsm:
+ type: boolean
+ required: true
+ has_vsgwc:
+ type: boolean
+ required: true
+ has_vsgwu:
+ type: boolean
+ required: true
+ has_vpgwc:
+ type: boolean
+ required: true
+ has_vpgwu:
+ type: boolean
+ required: true
+
diff --git a/xos/tosca/custom_types/vepc.yaml b/xos/tosca/custom_types/vepc.yaml
new file mode 100644
index 0000000..14e339c
--- /dev/null
+++ b/xos/tosca/custom_types/vepc.yaml
@@ -0,0 +1,121 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vepc.m4 > vepc.yaml"
+
+# include macros
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+# inheriting from the parent template. Until we get that figured out, use
+# m4 macros do our inheritance
+
+
+# Service
+
+
+# Subscriber
+
+
+
+
+# end m4 macros
+
+
+node_types:
+ tosca.nodes.VEPCService:
+ derived_from: tosca.nodes.Root
+ description: >
+ VEPC Service
+ capabilities:
+ scalable:
+ type: tosca.capabilities.Scalable
+ service:
+ type: tosca.capabilities.xos.Service
+ properties:
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ replaces:
+ type: string
+ required: false
+ descrption: Replaces/renames this object
+ kind:
+ type: string
+ default: generic
+ description: Type of service.
+ view_url:
+ type: string
+ required: false
+ description: URL to follow when icon is clicked in the Service Directory.
+ icon_url:
+ type: string
+ required: false
+ description: ICON to display in the Service Directory.
+ enabled:
+ type: boolean
+ default: true
+ published:
+ type: boolean
+ default: true
+ description: If True then display this Service in the Service Directory.
+ public_key:
+ type: string
+ required: false
+ description: Public key to install into Instances to allows Services to SSH into them.
+ private_key_fn:
+ type: string
+ required: false
+ description: Location of private key file
+ versionNumber:
+ type: string
+ required: false
+ description: Version number of Service.
+
+ tosca.nodes.VEPCTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ VEPC 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
+ description:
+ type: string
+ required: false
+ has_vhss:
+ type: boolean
+ required: true
+ has_vmme:
+ type: boolean
+ required: true
+ has_vmm:
+ type: boolean
+ required: true
+ has_vsm:
+ type: boolean
+ required: true
+ has_vsgwc:
+ type: boolean
+ required: true
+ has_vsgwu:
+ type: boolean
+ required: true
+ has_vpgwc:
+ type: boolean
+ required: true
+ has_vpgwu:
+ type: boolean
+ required: true
+
diff --git a/xos/tosca/resources/vepcservice.py b/xos/tosca/resources/vepcservice.py
new file mode 100644
index 0000000..38c6128
--- /dev/null
+++ b/xos/tosca/resources/vepcservice.py
@@ -0,0 +1,7 @@
+from service import XOSService
+from services.vepc.models import VEPCService
+
+class XOSVEPCService(XOSService):
+ provides = "tosca.nodes.VEPCService"
+ xos_model = VEPCService
+ copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
diff --git a/xos/tosca/resources/vepctenant.py b/xos/tosca/resources/vepctenant.py
new file mode 100644
index 0000000..e2089b2
--- /dev/null
+++ b/xos/tosca/resources/vepctenant.py
@@ -0,0 +1,31 @@
+from xosresource import XOSResource
+from core.models import Tenant, Service
+from services.vepc.models import VEPCTenant
+
+class XOSVEPCTenant(XOSResource):
+ provides = "tosca.nodes.VEPCTenant"
+ xos_model = VEPCTenant
+ name_field = None
+ copyin_props = ("description", "has_vhss", "has_vmme", "has_vmm", "has_vsm", "has_vsgwc", "has_vsgwu", "has_vpgwc", "has_vpgwu",)
+
+ def get_xos_args(self, throw_exception=True):
+ args = super(XOSVEPCTenant, self).get_xos_args()
+
+ provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=throw_exception)
+ if provider_name:
+ args["provider_service"] = self.get_xos_object(Service, throw_exception=throw_exception, name=provider_name)
+
+ return args
+
+ def get_existing_objs(self):
+ args = self.get_xos_args(throw_exception=False)
+ provider_service = args.get("provider", None)
+ if provider_service:
+ return [ self.get_xos_object(provider_service=provider_service) ]
+ return []
+
+ def postprocess(self, obj):
+ pass
+
+ def can_delete(self, obj):
+ return super(XOSVEPCTenant, self).can_delete(obj)