summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-09-28 02:23:00 +0300
committerMichael Lando <ml636r@att.com>2017-09-28 02:23:00 +0300
commit860fe27cfdca42547fc09414133b235f1cc5713f (patch)
tree86a805fefd90c46c15a420cb917a04d8c7fb2894
parent18c8a1fec198d4343c04a70db370b94e269bd817 (diff)
Fix for normative scripts
Change-Id: Ibd995c092e45aa1aaedbd687dcc39bf6333a4f3a Issue-ID: SDC-410 Signed-off-by: Michael Lando <ml636r@att.com>
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py7
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb2
-rw-r--r--sdc-os-chef/sdc-backend/startup.sh2
3 files changed, 8 insertions, 3 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
index 085467e09a..4d0ec291f5 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
@@ -11,6 +11,7 @@ from importPolicyTypes import importPolicyTypes
from importGroupTypes import importGroupTypes
from importNormativeCapabilities import importNormativeCapabilities
from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
+from importOnapTypes import importOnapTypes
from importCommon import *
@@ -112,7 +113,11 @@ def main(argv):
resultsHeat = upgradeTypesPerConfigFile(beHost, bePort, adminUser, baseFileLocation, updateversion)
handleResults(resultsHeat, 'false')
-
+
+ fileLocation = baseFileLocation + "onap-types/"
+ resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+ handleResults(resultsHeat, updateversion)
+
errorAndExit(0, None)
if __name__ == "__main__":
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
index dc8e4b79c9..8dff57abe8 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
@@ -10,7 +10,7 @@ bash "import-normatives" do
tar xvfz /tmp/normatives.tar.gz
cd normatives/scripts/import/tosca/
/bin/chmod +x importNormativeAll.py
- python importNormativeAll.py -i "#{node['HOST_IP']}" --debug=true > /var/lib/jetty/logs/importNormativeAll.log
+ python importNormativeAll.py -i localhost --debug=true > /var/lib/jetty/logs/importNormativeAll.log
EOH
end
diff --git a/sdc-os-chef/sdc-backend/startup.sh b/sdc-os-chef/sdc-backend/startup.sh
index 98699d9486..a0c237da62 100644
--- a/sdc-os-chef/sdc-backend/startup.sh
+++ b/sdc-os-chef/sdc-backend/startup.sh
@@ -26,7 +26,7 @@ python /root/chef-solo/cookbooks/sdc-normatives/files/default/check_Backend_Heal
# executing the normatives
cd /root/chef-solo
check_normative="/tmp/check_normative.out"
-curl -s -X GET -H "Content-Type: application/json;charset=UTF-8" -H "USER_ID: jh0003" -H "X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090" -H "Cache-Control: no-cache" -H "Postman-Token: af08ca1c-302f-1431-404f-ed84246e07c9" "http://${HOST_IP}:8080/sdc2/rest/v1/screen" > ${check_normative}
+curl -s -X GET -H "Content-Type: application/json;charset=UTF-8" -H "USER_ID: jh0003" -H "X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090" -H "Cache-Control: no-cache" -H "Postman-Token: af08ca1c-302f-1431-404f-ed84246e07c9" "http://localhost:8080/sdc2/rest/v1/screen" > ${check_normative}
echo "normal['HOST_IP'] = \"${HOST_IP}\"" > /root/chef-solo/cookbooks/sdc-normatives/attributes/default.rb
resources_len=`cat ${check_normative}| jq '.["resources"]|length'`