ONAP normative fixes

Change-Id: I3670033775c4cb2328494ce1e52f60b636f387f5
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

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 6107261..1311fe9 100644 (file)
--- 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 3b4ed54..78b257d 100644 (file)
--- 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 41372d5..3ad8a4b 100644 (file)
--- 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 (executable)
index 3979de6..0000000
--- 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 f782ce3..3baf473 100644 (file)
--- 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 dac5853..646a14d 100644 (file)
--- 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"