Fixes to docker run

revertnig back to when the last merge passed

Change-Id: I7f681865f51ac070c9bbbfdbc1f4ffcdb00581b2
Issue-ID: SDC-2028
Signed-off-by: ilanap <ilanap@amdocs.com>

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 14085bd..ee794c2 100644 (file)
--- 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
@@ -3,8 +3,7 @@ template "/tmp/user.py" do
     sensitive true
     mode 0755
     variables({
-      :be_ip => node['Nodes']['BE'],
-      :be_port => node['BE']['http_port']
+      :be_ip => node['Nodes']['BE']
     })
 end
 
@@ -21,8 +20,7 @@ template "/tmp/consumers.py" do
     sensitive true
     mode 0755
     variables({
-      :be_ip => node['Nodes']['BE'],
-      :be_port => node['BE']['http_port']
+      :be_ip => node['Nodes']['BE']
     })
 end
 

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
index b929637..397930d 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
@@ -3,8 +3,7 @@ template "/tmp/check_Backend_Health.py" do
     sensitive true
     mode 0755
     variables({
-      :be_ip => node['Nodes']['BE'],
-      :be_port => node['BE']['http_port']
+      :be_ip => node['Nodes']['BE']
     })
 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 e8dc967..a8d474b 100644 (file)
--- 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,6 @@ cookbook_file "/tmp/normatives.tar.gz" do
    end
 
 be_ip=node['Nodes'][:BE]
-be_port=node['BE']['http_port']
 
 bash "excuting-import_Normatives" do
    code <<-EOH
@@ -17,21 +16,21 @@ bash "excuting-import_Normatives" do
      # add --debug=true to the importNormativeAll.py arguments to enable debug
 
      check_normative="/tmp/check_normative.out"
-     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}:#{be_port}/sdc2/rest/v1/screen")
+     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}:#{be_port}/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" "http://#{be_ip}:8080/sdc2/rest/v1/screen" > ${check_normative}
 
      resources_len=`cat ${check_normative}| jq '.["resources"]|length'`
      mkdir -p /var/lib/jetty/logs
      if [ $resources_len -eq 0 ] ; then
-        python importONAPNormativeAll.py -i #{be_ip} -p #{be_port} > /var/lib/jetty/logs/importNormativeAll.log
+        python importONAPNormativeAll.py -i #{be_ip} > /var/lib/jetty/logs/importNormativeAll.log
             rc=$?
             if [[ $rc != 0 ]]; then exit $rc; fi
      else
-        python upgradeONAPNormative.py -i #{be_ip}  -p #{be_port} > /var/lib/jetty/logs/upgradeNormative.log
+        python upgradeONAPNormative.py -i #{be_ip} > /var/lib/jetty/logs/upgradeNormative.log
             rc=$?
             if [[ $rc != 0 ]]; then exit $rc; fi
      fi

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
index 60e2da1..49d8266 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
@@ -6,7 +6,6 @@ from datetime import datetime
 
 beStat=0
 BE_IP="<%= @be_ip %>"
-BE_PORT="<%= @be_port %>"
 
 class bcolors:
     HEADER    = '\033[95m'
@@ -23,7 +22,7 @@ class bcolors:
 #    Functions
 ##############################
 def checkBackend():
-    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i http://" + BE_IP + ":" + BE_PORT + "/sdc2/rest/v1/user/jh0003"
+    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i http://" + BE_IP + ":8080/sdc2/rest/v1/user/jh0003"
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE )
     (out, err) = proc.communicate()

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/consumers.py.erb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/consumers.py.erb
index 7133bc9..b77930d 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/consumers.py.erb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/consumers.py.erb
@@ -5,7 +5,6 @@ import time
 from datetime import datetime
 
 BE_IP="<%= @be_ip %>"
-BE_PORT="<%= @be_port %>"
 
 class bcolors:
     HEADER    = '\033[95m'
@@ -22,7 +21,7 @@ class bcolors:
 #    Functions
 ##############################
 def checkBackend():
-    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i http://" + BE_IP  + ":" + BE_PORT + "/sdc2/rest/v1/user/jh0003"
+    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i http://" + BE_IP + ":8080/sdc2/rest/v1/user/jh0003"
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE )
     (out, err) = proc.communicate()
@@ -31,7 +30,7 @@ def checkBackend():
 
 
 def checkConsumer(consumerName):
-    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\"   http://" + BE_IP  + ":" + BE_PORT + "/sdc2/rest/v1/consumers/" + consumerName
+    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\"   http://" + BE_IP + ":8080/sdc2/rest/v1/consumers/" + consumerName
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE )
     (out, err) = proc.communicate()
@@ -41,7 +40,7 @@ def checkConsumer(consumerName):
 
 def createConsumer( consumerName, consumerSalt, consumerPass ):
     print '[INFO] ' + consumerName
-    command="curl -s -o /dev/null -w \"%{http_code}\" -X POST -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://"  + BE_IP  + ":" + BE_PORT + "/sdc2/rest/v1/consumers/ -d '{\"consumerName\": '" + consumerName + "', \"consumerSalt\": '" + consumerSalt + "',\"consumerPassword\": '" + consumerPass + "'}'"
+    command="curl -s -o /dev/null -w \"%{http_code}\" -X POST -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://" + BE_IP + ":8080/sdc2/rest/v1/consumers/ -d '{\"consumerName\": '" + consumerName + "', \"consumerSalt\": '" + consumerSalt + "',\"consumerPassword\": '" + consumerPass + "'}'"
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE)
 

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/user.py.erb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/user.py.erb
index a97e451..83ecf90 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/user.py.erb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/user.py.erb
@@ -5,7 +5,6 @@ import time
 from datetime import datetime
 
 BE_IP="<%= @be_ip %>"
-BE_PORT="<%= @be_port %>"
 
 class bcolors:
     HEADER    = '\033[95m'
@@ -22,7 +21,7 @@ class bcolors:
 #    Functions
 ##############################
 def checkBackend():
-    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://" + BE_IP + ":" + BE_PORT + "/sdc2/rest/v1/user/jh0003"
+    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://" + BE_IP + ":8080/sdc2/rest/v1/user/jh0003"
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE )
     (out, err) = proc.communicate()
@@ -31,7 +30,7 @@ def checkBackend():
 
 
 def checkUser(userName):
-    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\"   http://" + BE_IP + ":" + BE_PORT + "/sdc2/rest/v1/user/" + userName
+    command="curl -s -o /dev/null -I -w \"%{http_code}\" -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\"   http://" + BE_IP + ":8080/sdc2/rest/v1/user/" + userName
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE )
     (out, err) = proc.communicate()
@@ -43,7 +42,7 @@ def checkUser(userName):
 
 def createUser( firstName, lastName, userId , email_dom , role ):
     print '[INFO] create first:[' + firstName + '], last:[' + lastName + '], Id:[' + userId + '], email:[' + userId + '@' + email_dom + '], role:[' + role +']'
-    command="curl -s -o /dev/null -w \"%{http_code}\" -X POST -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://" + BE_IP + ":" + BE_PORT + "/sdc2/rest/v1/user/ -d '{\"firstName\": '" + firstName + "', \"lastName\": '" + lastName + "',\"userId\": '" + userId + "',\"email\": '" + userId + "@" + email_dom + "',\"role\": '" + role + "'}'"
+    command="curl -s -o /dev/null -w \"%{http_code}\" -X POST -i -H \"Accept: application/json; charset=UTF-8\" -H \"Content-Type: application/json\" -H \"USER_ID: jh0003\" http://" + BE_IP + ":8080/sdc2/rest/v1/user/ -d '{\"firstName\": '" + firstName + "', \"lastName\": '" + lastName + "',\"userId\": '" + userId + "',\"email\": '" + userId + "@" + email_dom + "',\"role\": '" + role + "'}'"
 
     proc = subprocess.Popen( command , shell=True , stdout=subprocess.PIPE)
     (out, err) = proc.communicate()

diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
index 0bfbd11..da4c532 100644 (file)
--- a/cucumber-js-test-apis-ci/docker_run.sh
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -17,19 +17,18 @@ then
     fi
 fi
 echo "Workspace under: $WORKSPACE"
+
 # add dynamic ports from kubernetes master
 if [ -z "$TEST_CI_BE_HOST" ]
 then
     TEST_CI_BE_HOST="$(ifconfig  'eth0' | sed -n '2p' | awk '{print $2}' | sed 's/addr://g')"
     TEST_CI_BE_PORT=8081
     TEST_CI_CATALOG_HOST=$TEST_CI_BE_HOST
+    TEST_CI_CATALOG_PORT=8080
     TEST_CI_AP_HOST=$TEST_CI_BE_HOST
     TEST_CI_AP_PORT=8080
 fi
-if [ -z "$TEST_CI_CATALOG_PORT" ]
-then
-    TEST_CI_CATALOG_PORT=8080
-fi
+
 
 echo "host $TEST_CI_BE_HOST"
 
@@ -52,14 +51,11 @@ chmod 777 $WORKSPACE/data/scripts/docker_run.sh
 
 sed -i "s/xxx/TEST_CI/g" $WORKSPACE/TEST_CI.json
 sed -i "s/yyy/$TEST_CI_BE_HOST/g" $WORKSPACE/TEST_CI.json
+sed -i "s/8080/$TEST_CI_BE_PORT/g" $WORKSPACE/TEST_CI.json
 mv $WORKSPACE/TEST_CI.json $WORKSPACE/data/environments
 
-sed -i "s/8080:8080/$TEST_CI_CATALOG_PORT:8080/g" $WORKSPACE/data/scripts/docker_run.sh
-sed -i "s/:8080\/sdc/:$TEST_CI_CATALOG_PORT\/sdc/g" $WORKSPACE/data/scripts/docker_run.sh
-
-
 echo "getting images for $IMAGES_TAG"
-$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -p 10001
+$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -sim -p 10001
 
 echo "setting configuration"
 

diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index 3a9e9d5..a6081c1 100644 (file)
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>cucumber-bdd</artifactId>
   <name>cucumber-bdd</name>
   <groupId>org.openecomp.sdc</groupId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <build>
     <plugins>
@@ -54,32 +54,32 @@
           </execution>
         </executions>
       </plugin>
-        <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
-            <configuration>   
-            </configuration>
-        </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+        </configuration>
+      </plugin>
     </plugins>
     <resources>
-        <resource>
-            <directory>${basedir}/docker</directory>
-            <targetPath>${project.build.directory}/docker_assembly</targetPath>
-            <filtering>false</filtering>
-        </resource>
-        <resource>
-            <directory>${basedir}</directory>
-               <includes>
-                       <include>features/**/*</include>
-                       <include>stepDefinitions/**/*</include>
-                       <include>plugins/**/*</include>
-                       <include>resources/**/*</include>
-                       <include>*.js*</include>
-               </includes>
-            <targetPath>${project.build.directory}/docker_assembly/cucumber</targetPath>
-            <filtering>false</filtering>
-        </resource>
-    </resources>  
+      <resource>
+        <directory>${basedir}/docker</directory>
+        <targetPath>${project.build.directory}/docker_assembly</targetPath>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>features/**/*</include>
+          <include>stepDefinitions/**/*</include>
+          <include>plugins/**/*</include>
+          <include>resources/**/*</include>
+          <include>*.js*</include>
+        </includes>
+        <targetPath>${project.build.directory}/docker_assembly/cucumber</targetPath>
+        <filtering>false</filtering>
+      </resource>
+    </resources>
   </build>
   <profiles>
     <profile>