diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-04 08:46:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-04 08:46:39 +0000 |
| commit | 51e8fb68f82c59d75cd992a257d733fc2fd8672c (patch) | |
| tree | 77a0220ddf26a91d399bfb802d3a3f69a09421bd | |
| parent | 0a9b03130f15613a5aba83757c08e3814cf2d532 (diff) | |
| parent | edfe0df7d276c81a977d4f5699a683ab535d6618 (diff) | |
Merge "ONAP normative fixes"
6 files changed, 6 insertions, 18 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/pom.xml b/sdc-os-chef/pom.xml index 41372d5801..3ad8a4b811 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -67,9 +67,7 @@ ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb </path> <lines> - <line>normal['version'] = - "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - </line> + <line>normal['version'] = "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line> </lines> </file> </files> 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 diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb index dac5853353..646a14dc27 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb @@ -1,2 +1 @@ -normal['version'] = - "1.1.0" +normal['version'] = "1.2.0" |