Refactoring the sdc-BE-init python scripts

Deeper refactoring of python script:
- create the python package with init script
- support for python 3.x
- reuse code
- new design
- support for .json conf file
- update the docker chef script

Issue-ID: SDC-2784
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I02169eb7d0e3e90851ba1811536d1712c3b4145f

2 files changed, 57 insertions, 59 deletions

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
index 97d140ab1f..bf8065b079 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
@@ -1,46 +1,43 @@
 if node['disableHttp']
   protocol = "https"
+  https_flag = "--https"
   be_port = node['BE']['https_port']
 else
   protocol = "http"
+  https_flag = ""
   be_port = node['BE']['http_port']
 end
 
-
-template "/var/tmp/user.py" do
-    source "user.py.erb"
-    sensitive true
-    mode 0755
-    variables({
-      :protocol => protocol,
-      :be_ip => node['Nodes']['BE'],
-      :be_port => be_port
-    })
+if node['BE']['user_conf']
+  user_conf_dir = "--conf " + node['BE']['user_conf']
+else
+  # set default user configuration file
+  user_conf_dir = ""
 end
 
 bash "executing-create_user" do
-   code <<-EOH
-     python /var/tmp/user.py
-     rc=$?
-     if [[ $rc != 0 ]]; then exit $rc; fi
-   EOH
+  code <<-EOH
+    sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{user_conf_dir} #{https_flag}
+    rc=$?
+    if [[ $rc != 0 ]]; then exit $rc; fi
+  EOH
 end
 
 template "/var/tmp/consumers.py" do
-    source "consumers.py.erb"
-    sensitive true
-    mode 0755
-    variables({
-      :protocol => protocol,
-      :be_ip => node['Nodes']['BE'],
-      :be_port => be_port
-    })
+  source "consumers.py.erb"
+  sensitive true
+  mode 0755
+  variables({
+    :protocol => protocol,
+    :be_ip => node['Nodes']['BE'],
+    :be_port => be_port
+  })
 end
 
 bash "executing-consumers" do
-   code <<-EOH
-     python /var/tmp/consumers.py
-     rc=$?
-     if [[ $rc != 0 ]]; then exit $rc; fi
-   EOH
+  code <<-EOH
+    python /var/tmp/consumers.py
+    rc=$?
+    if [[ $rc != 0 ]]; then exit $rc; fi
+  EOH
 end
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 b640b3afe9..f59d91693d 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
@@ -3,7 +3,7 @@ be_ip=node['Nodes'][:BE]
 if node['disableHttp']
   protocol = "https"
   be_port = node['BE']['https_port']
-  param="-i #{be_ip} -p #{be_port} --scheme #{protocol}"
+  param="-i #{be_ip} -p #{be_port} --https"
 else
   protocol = "http"
   be_port = node['BE']['http_port']
@@ -11,38 +11,39 @@ else
 end
 
 cookbook_file "/var/tmp/normatives.tar.gz" do
-      source "normatives.tar.gz"
-   end
+  source "normatives.tar.gz"
+end
 
 bash "executing-import_Normatives" do
-   code <<-EOH
-     set -x
-     cd /var/tmp
-     tar xvfz /var/tmp/normatives.tar.gz
-     cd /var/tmp/normatives/scripts/import/tosca/
-     /bin/chmod +x *.py
-
-     # executing the normatives
-     # add --debug=true to the importNormativeAll.py arguments to enable debug
-
-     check_normative="/tmp/check_normative.out"
-     status_code=$(curl -k -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' "#{protocol}://#{be_ip}:#{be_port}/sdc2/rest/v1/screen")
-     if [ "$status_code" != 200 ] ; then
-        exit "$status_code"
-     fi
+  code <<-EOH
+    set -ex
 
-     #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" "#{protocol}://#{be_ip}:#{be_port}/sdc2/rest/v1/screen" > ${check_normative}
+    cd /var/tmp/
+    tar -xvf normatives.tar.gz
+    
+    # executing the normatives
+    # add --debug to the importNormativeAll.py arguments to enable debug
+    
+    check_normative="/tmp/check_normative.out"
+    status_code=$(curl -k -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' "#{protocol}://#{be_ip}:#{be_port}/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" "#{protocol}://#{be_ip}:#{be_port}/sdc2/rest/v1/screen" > ${check_normative}
+    
+    resources_len=`cat ${check_normative}| jq '.["resources"]|length'`
+    mkdir -p /var/lib/jetty/logs
 
-     resources_len=`cat ${check_normative}| jq '.["resources"]|length'`
-     mkdir -p /var/lib/jetty/logs
-     if [ $resources_len -eq 0 ] ; then
-        python importONAPNormativeAll.py #{param} > /var/lib/jetty/logs/importNormativeAll.log
-            rc=$?
-            if [[ $rc != 0 ]]; then exit $rc; fi
-     else
-        python upgradeONAPNormative.py #{param} > /var/lib/jetty/logs/upgradeNormative.log
-            rc=$?
-            if [[ $rc != 0 ]]; then exit $rc; fi
-     fi
-   EOH
+    cd /var/tmp/normatives/import/tosca/
+    if [ $resources_len -eq 0 ] ; then
+      sdcimportall #{param} > /var/lib/jetty/logs/importNormativeAll.log
+      rc=$?
+      if [[ $rc != 0 ]]; then exit $rc; fi
+    else
+      sdcupgradeall #{param} > /var/lib/jetty/logs/upgradeNormative.log
+      rc=$?
+      if [[ $rc != 0 ]]; then exit $rc; fi
+    fi
+  EOH
 end