diff options
| author |   Gitelman, Tal (tg851x) <tg851x@intl.att.com> | 2018-03-14 20:04:22 +0200 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2018-03-14 18:08:16 +0000 |
| commit | b247b7b1d89aec6cf9bc46782b49903277b725e7 (patch) | |
| tree | 039271c18495c812a2e4d1ad87b3e238e70f0727 /catalog-be/sdc-backend-init/chef-repo/cookbooks | |
| parent | 8b9114fc27e1849179e31c713bbd54c2119ee154 (diff) | |
Onap normatives are imported always
Change-Id: I3f35be9732a4b0ddba268debe1766976402fa560
Issue-ID: SDC-1103
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/sdc-backend-init/chef-repo/cookbooks')
| -rw-r--r-- | catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb | 7 |
1 files changed, 6 insertions, 1 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 d5f0ff4095..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 @@ -16,7 +16,12 @@ bash "excuting-import_Normatives" do # add --debug=true to the importNormativeAll.py arguments to enable debug 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" "http://#{be_ip}:8080/sdc2/rest/v1/screen" > ${check_normative} + status_code=$(curl -s -o ${check_normative} -w "%{http_code}\\n" -X GET -H 'Content-Type: application/json;charset=UTF-8' -H 'USER_ID: jh0003' -H 'X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090' "http://#{be_ip}:8080/sdc2/rest/v1/screen") + if [ "$status_code" != 200 ] ; then + exit "$status_code" + fi + + #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" "http://#{be_ip}:8080/sdc2/rest/v1/screen" > ${check_normative} resources_len=`cat ${check_normative}| jq '.["resources"]|length'` mkdir -p /var/lib/jetty/logs |