Adding 'name' to yamls and json in model

[policy/models.git] / models-examples / src / main / resources / policies / sdnc.policy.naming.input.tosca.yaml

diff --git a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
index 825e95d..42287c2 100644 (file)
--- a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
@@ -1,41 +1,46 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
-    -   SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP:
+    -   SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP:
             type: onap.policies.Naming
             version: 1.0.0
+            type_version: 1.0.0
+            name: SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP
             properties:
-                policy-instance-name: ONAP_VNF_NAMING_TIMESTAMP
+                policy-instance-name: ONAP_NF_NAMING_TIMESTAMP
                 naming-models:
                 -   naming-type: VNF
                     naming-recipe: AIC_CLOUD_REGION|DELIMITER|CONSTANT|DELIMITER|TIMESTAMP
+                    name-operation: 'to_lower_case()'
                     naming-properties:
                     -   property-name: AIC_CLOUD_REGION
                     -   property-name: CONSTANT
-                        property-value: ONAP-NF
+                        property-value: onap-nf
                     -   property-name: TIMESTAMP
-                    -   property-value: _
+                    -   property-value: '-'
                         property-name: DELIMITER
                 -   naming-type: VNFC
                     naming-recipe: VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE
+                    name-operation: 'to_lower_case()'
                     naming-properties:
                     -   property-name: VNF_NAME
                     -   property-name: SEQUENCE
                         increment-sequence:
                             max: zzz
                             scope: ENTIRETY
-                            start-value: 1
-                            length: 3
-                            increment: 1
+                            start-value: '1'
+                            length: '3'
+                            increment: '1'
                             sequence-type: alpha-numeric
                     -   property-name: NFC_NAMING_CODE
-                    -   property-value: _
+                    -   property-value: '-'
                         property-name: DELIMITER
                 -   naming-type: VF-MODULE
                     naming-recipe: VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE
+                    name-operation: 'to_lower_case()'
                     naming-properties:
                     -   property-name: VNF_NAME
-                    -   property-value: _
+                    -   property-value: '-'
                         property-name: DELIMITER
                     -   property-name: VF_MODULE_LABEL
                     -   property-name: VF_MODULE_TYPE
@@ -43,7 +48,7 @@ topology_template:
                         increment-sequence:
                             max: zzz
                             scope: PRECEEDING
-                            start-value: 1
-                            length: 3
-                            increment: 1
-                            sequence-type: alpha-numeric
\ No newline at end of file
+                            start-value: '1'
+                            length: '3'
+                            increment: '1'
+                            sequence-type: alpha-numeric