Add missing 'scalar-unit.bitrate' data type

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I33faf90f04667ef2b8a334dfba39fe256a21c223
Issue-ID: SDC-4300

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 5ff50bf..aec4531 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -40,6 +40,9 @@ scalar-unit.time:
 scalar-unit.frequency:
   derived_from: scalar-unit
 
+scalar-unit.bitrate:
+  derived_from: scalar-unit
+
 tosca.datatypes.Credential:
   derived_from: tosca.datatypes.Root
   properties:

diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
index b879179..5a34ccb 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
@@ -26,6 +26,8 @@ scalar-unit.time:
   derived_from: scalar-unit
 scalar-unit.frequency:
   derived_from: scalar-unit
+scalar-unit.bitrate:
+  derived_from: scalar-unit
 onap.datatypes.ToscaConceptIdentifier:
   derived_from: tosca.datatypes.Root
   properties:

diff --git a/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
index fa5e0e1..8d8b779 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
@@ -40,6 +40,9 @@ scalar-unit.time:
 scalar-unit.frequency:
   derived_from: scalar-unit
 
+scalar-unit.bitrate:
+  derived_from: scalar-unit
+
 tosca.datatypes.nfv.L2AddressData:
   derived_from: tosca.datatypes.Root
   description: Describes the information on the MAC addresses to be assigned to a connection point.

diff --git a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
index b879179..5a34ccb 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
@@ -26,6 +26,8 @@ scalar-unit.time:
   derived_from: scalar-unit
 scalar-unit.frequency:
   derived_from: scalar-unit
+scalar-unit.bitrate:
+  derived_from: scalar-unit
 onap.datatypes.ToscaConceptIdentifier:
   derived_from: tosca.datatypes.Root
   properties:

diff --git a/catalog-be/src/main/resources/import/tosca/models/upgrade/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/upgrade/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
index fa5e0e1..8d8b779 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/models/upgrade/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/upgrade/etsi-SOL001-v2.5.1/tosca/data-types/dataTypes.yml
@@ -40,6 +40,9 @@ scalar-unit.time:
 scalar-unit.frequency:
   derived_from: scalar-unit
 
+scalar-unit.bitrate:
+  derived_from: scalar-unit
+
 tosca.datatypes.nfv.L2AddressData:
   derived_from: tosca.datatypes.Root
   description: Describes the information on the MAC addresses to be assigned to a connection point.

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 4d6bd89..ae98ac0 100644 (file)
--- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
+++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
@@ -34,17 +34,19 @@ scalar-unit.time:
 scalar-unit.frequency:
   derived_from: scalar-unit
 
-  
-tosca.datatypes.Credential: 
+scalar-unit.bitrate:
+  derived_from: scalar-unit
+
+tosca.datatypes.Credential:
   derived_from: tosca.datatypes.Root
-  properties: 
-    protocol: 
+  properties:
+    protocol:
       type: string
       required: false
-    token_type: 
+    token_type:
       type: string
       default: password
-    token: 
+    token:
       type: string
     keys:
       type: map

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
index a799d0d..3d3d553 100644 (file)
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml
@@ -62,6 +62,9 @@ data_types:
   scalar-unit.time:
     derived_from: tosca.datatypes.Root
 
+  scalar-unit.bitrate:
+    derived_from: tosca.datatypes.Root
+
   tosca.datatypes.network.NetworkInfo:
     derived_from: tosca.datatypes.Root
     description: The Network type is a complex TOSCA data type used to describe logical network information.

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/tosca/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/tosca/data.yml
index c77b89c..b0e74d3 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/tosca/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/tosca/data.yml
@@ -62,6 +62,9 @@ data_types:
   scalar-unit.time:
     derived_from: tosca.datatypes.Root
 
+  scalar-unit.bitrate:
+    derived_from: tosca.datatypes.Root
+
   tosca.datatypes.network.NetworkInfo:
     derived_from: tosca.datatypes.Root
     description: The Network type is a complex TOSCA data type used to describe logical network information.

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
index 68e3363..36ea256 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
@@ -32,6 +32,8 @@ data_types:
     derived_from: tosca.datatypes.Root
   scalar-unit.time:
     derived_from: tosca.datatypes.Root
+  scalar-unit.bitrate:
+    derived_from: tosca.datatypes.Root
   tosca.datatypes.network.NetworkInfo:
     derived_from: tosca.datatypes.Root
     description: The Network type is a complex TOSCA data type used to describe logical network information.

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/data.yml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/data.yml
index 3197845..38aa6c8 100644 (file)
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/data.yml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/data.yml
@@ -62,6 +62,9 @@ data_types:
   scalar-unit.time:
     derived_from: tosca.datatypes.Root
 
+  scalar-unit.bitrate:
+    derived_from: tosca.datatypes.Root
+
   tosca.datatypes.network.NetworkInfo:
     derived_from: tosca.datatypes.Root
     description: The Network type is a complex TOSCA data type used to describe logical network information.