Updating Global Types

Issues in Global Types causing JTOSCA validation to fail

Change-Id: I20adb7eba614bf560093dfe01b16cdd78bf1d099
Issue-ID: SDC-1042
Signed-off-by: priyanshu <pagarwal@amdocs.com>

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml
index 2ddf499..145766b 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_onap_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: onap/_index.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
index fdff979..3a7104f 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_onap_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: onap/capabilities.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
index 6a8a9b8..de251c3 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_onap_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: onap/data.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
index ab83bd3..643f731 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_onap_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: onap/nodes.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
index 07667da..a8230c5 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_onap_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: onap/relationships.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml
index c1a8146..fa37f50 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-heat/_index.yml
@@ -26,5 +26,5 @@ imports:
     file: nodes.yml
 - groups:
     file: groups.yml
-  data:
+- data:
     file: data.yml
\ No newline at end of file

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
index c9dda19..bc1f5ef 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-heat/data.yml
@@ -633,7 +633,7 @@ data_types:
         - greater_or_equal: 0
       count:
         description: Count
-        type: string
+        type: integer
         status: SUPPORTED
         default: 1
         required: false

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
index 64cb598..ded2373 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-heat/groups.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
index 6fceaac..5906243 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-heat/nodes.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml
index 29057f4..244a048 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-inventory/_index.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml
index d1e9dfe..823e131 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-inventory/capabilities.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml
index bc245a9..4bbd133 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-inventory/data.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml
index ee94cc6..19db291 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-inventory/nodes.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml
index a69e350..cf86be6 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp-inventory/relationships.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
index 8f6d419..02c4f76 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/_index.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
index 18ea9bc..48425a7 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/capabilities.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index 526a801..47d424f 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/data.yml
@@ -383,7 +383,7 @@ data_types:
         - greater_or_equal: 0
       count:
         description: Count
-        type: string
+        type: integer
         status: SUPPORTED
         default: 1
         required: false

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
index 438dd07..0da8976 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/groups.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index e4fed62..58b06e4 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/nodes.yml
@@ -365,7 +365,6 @@ node_types:
         description: vfc naming
         type: org.openecomp.datatypes.Naming
         status: SUPPORTED
-        default: false
         required: false
       min_instances:
         description: Minimum number of VFC Instances

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
index 902b3bb..d15c56e 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_openecomp_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: openecomp/relationships.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml
index 50901ed..418744c 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/_index.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml
index bcb8280..a98c176 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/artifacts.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml
index d86e9e8..1b642cd 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/capabilities.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
index c77b89c..a799d0d 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/data.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml
index 4c86523..0ddc151 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/groups.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml
index c90210f..32a6d43 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/interfaces.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml
index 336a473..af68802 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/nodes.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml
index d40a524..da9c14a 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/policies.yml

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml
index 8a287d0..233b59b 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 
 metadata:
   filename: tosca/relationships.yml