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>

29 files changed, 32 insertions, 33 deletions

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 2ddf499cb5..145766b3b0 100644
--- 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 fdff979178..3a7104fd9d 100644
--- 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 6a8a9b8349..de251c3843 100644
--- 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 ab83bd3d45..643f731f09 100644
--- 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 07667da622..a8230c5b56 100644
--- 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 c1a81460d5..fa37f50d8a 100644
--- 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 c9dda19d5c..bc1f5efd68 100644
--- 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 64cb598ef4..ded2373e50 100644
--- 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 6fceaac079..5906243270 100644
--- 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 29057f4556..244a048653 100644
--- 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 d1e9dfefae..823e131761 100644
--- 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 bc245a9387..4bbd1335af 100644
--- 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 ee94cc6363..19db291648 100644
--- 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 a69e350139..cf86be62a6 100644
--- 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 8f6d419536..02c4f76f62 100644
--- 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 18ea9bc3c6..48425a7bb2 100644
--- 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 526a80113a..47d424f407 100644
--- 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 438dd071a8..0da8976fe7 100644
--- 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 e4fed62ea5..58b06e4616 100644
--- 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 902b3bb596..d15c56e079 100644
--- 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 50901ed13a..418744cdcd 100644
--- 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 bcb8280d1d..a98c176265 100644
--- 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 d86e9e8bca..1b642cdcb1 100644
--- 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 c77b89c10f..a799d0d25b 100644
--- 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 4c86523746..0ddc15175c 100644
--- 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 c90210f4b8..32a6d43381 100644
--- 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 336a473cf5..af68802eaf 100644
--- 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 d40a524499..da9c14a230 100644
--- 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 8a287d0b0c..233b59be44 100644
--- 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