Fix property inconsistency between tosca and xproto
Change-Id: I6e9c512db0d78b44462f1a083388060d9a691dbe
diff --git a/xos/tosca/custom_types/vsgw.m4 b/xos/tosca/custom_types/vsgw.m4
index 9deb54b..aedc4c5 100644
--- a/xos/tosca/custom_types/vsgw.m4
+++ b/xos/tosca/custom_types/vsgw.m4
@@ -15,4 +15,16 @@
properties:
xos_base_props
xos_base_service_props
+ service_message:
+ type: string
+ required: true
+ tosca.nodes.VSGWTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ VSGW Tenant
+ properties:
+ xos_base_tenant_props
+ tenant_message:
+ type: string
+ required: true
diff --git a/xos/tosca/custom_types/vsgw.yaml b/xos/tosca/custom_types/vsgw.yaml
index f6ad712..62d3ebf 100644
--- a/xos/tosca/custom_types/vsgw.yaml
+++ b/xos/tosca/custom_types/vsgw.yaml
@@ -1,5 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
+# compile this with "m4 vbbu.m4 > vsgw.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
@@ -11,11 +13,18 @@
# Subscriber
+
+
+
+# end m4 macros
+
+
+
node_types:
tosca.nodes.VSGWService:
derived_from: tosca.nodes.Root
description: >
- vSGW Service
+ VSGW Service
capabilities:
scalable:
type: tosca.capabilities.Scalable
@@ -71,12 +80,12 @@
description: Version number of Service.
service_message:
type: string
- required: false
+ required: true
tosca.nodes.VSGWTenant:
derived_from: tosca.nodes.Root
description: >
- A Tenant of the vsgw service
+ VSGW Tenant
properties:
kind:
type: string
@@ -88,5 +97,4 @@
description: Service specific ID opaque to XOS but meaningful to service
tenant_message:
type: string
- required: false
-
+ required: true