diff options
4 files changed, 4 insertions, 13 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json index 6107261dd9..1311fe9f32 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json +++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json @@ -7,7 +7,7 @@ "resourceType": "VL", "categories": [ { - "name": "Generic", + "name": "Network Connectivity", "subcategories": [ { "name": "Virtual Links" diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py index 3b4ed5463f..78b257d6f3 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -51,9 +51,9 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "subInterface", "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration"#, - #"underlayVpn", - #"overlayTunnel" + "vnfConfiguration", + "underlayVpn", + "overlayTunnel" ] responseCodes = [200, 201] diff --git a/sdc-os-chef/scripts/docker_clean.sh b/sdc-os-chef/scripts/docker_clean.sh deleted file mode 100755 index 3979de6e73..0000000000 --- a/sdc-os-chef/scripts/docker_clean.sh +++ /dev/null @@ -1,8 +0,0 @@ -pat=$1 -docker_ids=`docker ps -a | grep ${pat} | awk '{print $1}'` -for X in ${docker_ids} -do - docker rm -f ${X} -done - - diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb index f782ce30fd..3baf4732fa 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb @@ -11,7 +11,6 @@ bash "upgrade-normatives" do cd normatives/scripts/import/tosca/ /bin/chmod +x upgradeNormative.py importGroupTypes.py python upgradeNormative.py -i localhost --debug=true > /var/lib/jetty/logs/upgradeNormative.log - python importGroupTypes.py -i localhost > /var/lib/jetty/logs/importGroupTypes.log EOH end |