aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/resources/import
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2018-08-21 17:34:06 +0300
committerTal Gitelman <tg851x@intl.att.com>2018-08-21 17:34:06 +0300
commit34db62e9a6b338219980c21ba9f39029f481f866 (patch)
treead1e0f970854f80706ec0d62264c65e482cde9e1 /catalog-be/src/main/resources/import
parentd08b71befd5685675a4bb54ba35b89ab3573261f (diff)
Import normative improvement
extCp2 tag allignment Change-Id: I22befdeba9368b2248d668c8ef1043ca7efb026a Issue-ID: SDC-557 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import')
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml29
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json2
2 files changed, 22 insertions, 9 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 d4c6bf10b8..2462302f5d 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
@@ -930,14 +930,6 @@ org.openecomp.datatypes.network.IPv6SubnetAssignments:
required: true
description: Indicates IPv6 subnet assignments
-org.openecomp.datatypes.network.RelatedNetworksAssignments:
- derived_from: org.openecomp.datatypes.Root
- properties:
- related_network_role:
- description: The network role of the related network, sharing provider network
- type: string
- required: false
-
org.openecomp.datatypes.network.NetworkAssignments:
derived_from: org.openecomp.datatypes.Root
properties:
@@ -966,6 +958,17 @@ org.openecomp.datatypes.network.NetworkAssignments:
type: org.openecomp.datatypes.network.IPv6SubnetAssignments
required: true
description: IPv6 defualt subnet assignments
+ related_networks:
+ type: list
+ required: false
+ description: Related Networks List.
+ entry_schema:
+ type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+ is_trunked:
+ type: boolean
+ required: true
+ description: \"true\" indicates that network is trunked
+ default: false
org.openecomp.datatypes.network.ProviderNetwork:
derived_from: org.openecomp.datatypes.Root
@@ -1280,6 +1283,15 @@ org.openecomp.datatypes.ImageInfo:
type: string
required: false
default: md5
+
+org.openecomp.datatypes.network.RelatedNetworksAssignments:
+ derived_from: org.openecomp.datatypes.Root
+ properties:
+ related_network_role:
+ type: string
+ description: The network role of the related network, sharing provider network.
+ required: false
+
#ONAP types
tosca.datatypes.nfv.VnfcConfigurableProperties:
derived_from: tosca.datatypes.Root
@@ -1405,6 +1417,7 @@ tosca.datatypes.nfv.injectFile: #used for vCPE usecase
type: string
required: true
tosca.datatypes.nfv.L2AddressData:
+ derived_from: tosca.datatypes.Root
properties:
mac_address_assignment:
type: boolean
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json
index 71bf0d2b24..dba29c4ac8 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json
@@ -16,6 +16,6 @@
}
],
"tags": [
- "ExtCp2"
+ "ExtCP2"
]
}