summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraribeiro <anderson.ribeiro@est.tech>2020-04-02 14:05:57 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-04-05 15:05:20 +0000
commit9cd184ef2b013197cd984cf881335c08a9eab01f (patch)
tree0755585896774b9b3462e1c85a563af5e10bd7b3
parentdd463c2843dcfbc5b375d90630788f5f269c7b0a (diff)
Fix data type properties declaration
According to TOSCA Network properties definition the keyname 'ip_version:' should have Integer as valid_values rather than String Where the keyname 'count:' is declared as a String type the default value should be String rather than Integer Fix misspelled ONAP types 'onap.datatypes.monitoring.measurementType' and 'onap.datatypes.monitoring.managedObjectDNsBasic' Fix the keynames 'upstream:' and 'downstream:' as both are declared as a String type the valid_values should be String rather than Integer Issue-ID: SDC-2864 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I56afdf2818b5f2463fb6088cd8b468fd38ef5086
-rw-r--r--asdctool/src/main/resources/config/dataTypes.yml6
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml72
-rw-r--r--catalog-be/src/test/resources/yamlValidation/test-no-valid.yml4
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml2
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml2
7 files changed, 45 insertions, 45 deletions
diff --git a/asdctool/src/main/resources/config/dataTypes.yml b/asdctool/src/main/resources/config/dataTypes.yml
index 43fd05a348..7198260f29 100644
--- a/asdctool/src/main/resources/config/dataTypes.yml
+++ b/asdctool/src/main/resources/config/dataTypes.yml
@@ -230,8 +230,8 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
status: SUPPORTED
constraints:
- valid_values:
- - '4'
- - '6'
+ - 4
+ - 6
name:
type: string
description: The name of the subnet
@@ -525,7 +525,7 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
type: string
description: Count
required: false
- default: 1
+ default: "1"
status: SUPPORTED
scaling_enabled:
type: boolean
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index 9d9cb43b36..76016bfb3e 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -262,8 +262,8 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
status: supported
constraints:
- valid_values:
- - '4'
- - '6'
+ - 4
+ - 6
name:
type: string
description: The name of the subnet
@@ -568,7 +568,7 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
type: string
description: Count
required: false
- default: 1
+ default: "1"
status: supported
scaling_enabled:
type: boolean
@@ -2381,7 +2381,7 @@ onap.datatypes.monitoring.measurementGroup:
required: true
default: []
entry_schema:
- type: onap.datatypes.monitoring.managedObjectDNSBasics
+ type: onap.datatypes.monitoring.managedObjectDNsBasics
onap.datatypes.monitoring.measurementTypes:
derived_from: tosca.datatypes.Root
@@ -2391,7 +2391,7 @@ onap.datatypes.monitoring.measurementTypes:
description: Measurement type object
required: true
entry_schema:
- type: onap.dataypes.monitoring.measurementType
+ type: onap.datatypes.monitoring.measurementType
onap.datatypes.monitoring.measurementType:
derived_from: tosca.datatypes.Root
@@ -2409,7 +2409,7 @@ onap.datatypes.monitoring.managedObjectDNsBasics:
description: Managed object distinguished name object
required: true
entry_schema:
- type: onap.dataypes.monitoring.managedObjectDNsBasic
+ type: onap.datatypes.monitoring.managedObjectDNsBasic
onap.datatypes.monitoring.managedObjectDNsBasic:
derived_from: tosca.datatypes.Root
@@ -2736,42 +2736,42 @@ onap.datatypes.partner.bandwidth:
required: true
constraints:
- valid_values:
- - 128
- - 512
- - 1
- - 2
- - 5
- - 10
- - 20
- - 25
- - 30
- - 40
- - 50
- - 100
- - 250
- - 500
- - 1000
+ - "128"
+ - "512"
+ - "1"
+ - "2"
+ - "5"
+ - "10"
+ - "20"
+ - "25"
+ - "30"
+ - "40"
+ - "50"
+ - "100"
+ - "250"
+ - "500"
+ - "1000"
upstream:
type: string
description: up speed
required: false
constraints:
- valid_values:
- - 128
- - 512
- - 1
- - 2
- - 5
- - 10
- - 20
- - 25
- - 30
- - 40
- - 50
- - 100
- - 250
- - 500
- - 1000
+ - "128"
+ - "512"
+ - "1"
+ - "2"
+ - "5"
+ - "10"
+ - "20"
+ - "25"
+ - "30"
+ - "40"
+ - "50"
+ - "100"
+ - "250"
+ - "500"
+ - "1000"
units:
type: string
description: unit of speed
diff --git a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
index 335758e887..4d6bd8992d 100644
--- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
+++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
@@ -247,8 +247,8 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
status: SUPPORTED
constraints:
- valid_values:
- - '4'
- - '6'
+ - 4
+ - 6
name:
type: string
description: The name of the subnet
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
index b469eb567f..bf05105017 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
@@ -629,7 +629,7 @@ data_types:
description: Count
type: string
status: supported
- default: 1
+ default: "1"
required: false
scaling_enabled:
description: Indicates whether service scaling is enabled
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
index 613d721154..80ad68b47c 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -355,7 +355,7 @@ data_types:
description: Count
type: string
status: supported
- default: 1
+ default: "1"
required: false
scaling_enabled:
description: Indicates whether service scaling is enabled
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
index fd0938f9e2..a3808900c2 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
@@ -581,7 +581,7 @@ data_types:
type: string
description: Count
required: false
- default: 1
+ default: "1"
status: supported
scaling_enabled:
type: boolean
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
index b916e420a1..70311edd32 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -359,7 +359,7 @@ data_types:
type: string
description: Count
required: false
- default: 1
+ default: "1"
status: supported
scaling_enabled:
type: boolean