diff options
| author |   aribeiro <anderson.ribeiro@est.tech> | 2020-04-02 14:05:57 +0100 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-04-05 15:05:20 +0000 |
| commit | 9cd184ef2b013197cd984cf881335c08a9eab01f (patch) | |
| tree | 0755585896774b9b3462e1c85a563af5e10bd7b3 /catalog-be/src | |
| parent | dd463c2843dcfbc5b375d90630788f5f269c7b0a (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
Diffstat (limited to 'catalog-be/src')
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 72 | ||||
| -rw-r--r-- | catalog-be/src/test/resources/yamlValidation/test-no-valid.yml | 4 |
2 files changed, 38 insertions, 38 deletions
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 |