diff options
3 files changed, 24 insertions, 11 deletions
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb index 631ba5efba..a8d474b792 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb @@ -26,11 +26,11 @@ bash "excuting-import_Normatives" do resources_len=`cat ${check_normative}| jq '.["resources"]|length'` mkdir -p /var/lib/jetty/logs if [ $resources_len -eq 0 ] ; then - python importONAPNormativeAll.py --debug=true -i #{be_ip} > /var/lib/jetty/logs/importNormativeAll.log + python importONAPNormativeAll.py -i #{be_ip} > /var/lib/jetty/logs/importNormativeAll.log rc=$? if [[ $rc != 0 ]]; then exit $rc; fi else - python upgradeONAPNormative.py --debug=true -i #{be_ip} > /var/lib/jetty/logs/upgradeNormative.log + python upgradeONAPNormative.py -i #{be_ip} > /var/lib/jetty/logs/upgradeNormative.log rc=$? if [[ $rc != 0 ]]; then exit $rc; fi fi 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" ] } |