update port from 9004 to 9006

Change-Id: Ic2ad8eda3b21b6c11cabf89d65f5a72956262750
Issue-Id: MULTICLOUD-95
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index 573cd29..e4d7772 100644 (file)
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -14,7 +14,7 @@ ENV AAI_SCHEMA_VERSION "v11"
 ENV AAI_USERNAME "AAI"
 ENV AAI_PASSWORD "AAI"
 
-EXPOSE 9004
+EXPOSE 9006
 
 # COPY ./ /opt/ocata/
 RUN apt-get update && \

diff --git a/ocata/run.sh b/ocata/run.sh
index 02c26f5..446172b 100644 (file)
--- a/ocata/run.sh
+++ b/ocata/run.sh
@@ -22,7 +22,7 @@ sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" ocata/pub/confi
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/newton
-nohup python manage.py runserver 0.0.0.0:9004 2>&1 &
+nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
 
 while [ ! -f logs/runtime_ocata.log ]; do
     sleep 1

diff --git a/ocata/stop.sh b/ocata/stop.sh
index 13a19ef..33bbc2c 100644 (file)
--- a/ocata/stop.sh
+++ b/ocata/stop.sh
@@ -12,5 +12,5 @@
 
 #!/bin/bash
 
-ps auxww | grep 'manage.py runserver 0.0.0.0:9004' | awk '{print $2}' | xargs kill -9
+ps auxww | grep 'manage.py runserver 0.0.0.0:9006' | awk '{print $2}' | xargs kill -9
 ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9

diff --git a/ocata/vagrant/Vagrantfile b/ocata/vagrant/Vagrantfile
index ac529ef..e42522e 100644 (file)
--- a/ocata/vagrant/Vagrantfile
+++ b/ocata/vagrant/Vagrantfile
@@ -33,6 +33,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.define "onap" do |config|
     config.vm.hostname = "onap"
+    config.vm.synced_folder "../..", "/openstack"
     config.vm.network "private_network", ip: "192.168.0.30"
     config.vm.network :private_network,  ip: "192.168.1.30"
     config.vm.provision "shell", path: "test/test_multicloud.sh", privileged: false

diff --git a/ocata/vagrant/test/Dockerfile b/ocata/vagrant/test/Dockerfile
index 33d1a18..f956b56 100644 (file)
--- a/ocata/vagrant/test/Dockerfile
+++ b/ocata/vagrant/test/Dockerfile
@@ -3,3 +3,5 @@ FROM multicloud-ocata:latest
 RUN apt-get update && \
      apt-get install -y vim
 ADD extsys.py /opt/ocata/lib/newton/newton/pub/msapi/extsys.py
+ADD run.sh /opt/ocata/run.sh
+RUN chmod 755 /opt/ocata/run.sh

diff --git a/ocata/vagrant/test/run.sh b/ocata/vagrant/test/run.sh
new file mode 100644 (file)
index 0000000..446172b
--- /dev/null
+++ b/ocata/vagrant/test/run.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright (c) 2017 Wind River Systems, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+#!/bin/bash
+
+sed -i "s/MSB_SERVICE_ADDR =.*/MSB_SERVICE_ADDR = \"${MSB_ADDR}\"/g" ocata/pub/config/config.py
+sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" ocata/pub/config/config.py
+sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" ocata/pub/config/config.py
+sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" ocata/pub/config/config.py
+sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" ocata/pub/config/config.py
+sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" ocata/pub/config/config.py
+sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" ocata/pub/config/config.py
+
+memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
+export PYTHONPATH=lib/newton
+nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
+
+while [ ! -f logs/runtime_ocata.log ]; do
+    sleep 1
+done
+
+tail -F logs/runtime_ocata.log
+

diff --git a/ocata/vagrant/test/test-compute.sh b/ocata/vagrant/test/test-compute.sh
index f68c31f..50c6286 100644 (file)
--- a/ocata/vagrant/test/test-compute.sh
+++ b/ocata/vagrant/test/test-compute.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }'  $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
 PROJECT_ID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects 2>/dev/null | python -mjson.tool | grep -B5 "name.*\"admin" | grep '\"id\"' | cut -f4 -d'"')
 curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/os-hypervisors

diff --git a/ocata/vagrant/test/test-extensions.sh b/ocata/vagrant/test/test-extensions.sh
index c4cfd00..65fc0d1 100644 (file)
--- a/ocata/vagrant/test/test-extensions.sh
+++ b/ocata/vagrant/test/test-extensions.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 curl -v -s  -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions
 curl -v -s  -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions/epa-caps

diff --git a/ocata/vagrant/test/test-identity.sh b/ocata/vagrant/test/test-identity.sh
index 6738610..e09fef7 100644 (file)
--- a/ocata/vagrant/test/test-identity.sh
+++ b/ocata/vagrant/test/test-identity.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }'  $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
 curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v2.0/tenants
 curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects

diff --git a/ocata/vagrant/test/test-image.sh b/ocata/vagrant/test/test-image.sh
index 6312bf7..6b4b2e2 100644 (file)
--- a/ocata/vagrant/test/test-image.sh
+++ b/ocata/vagrant/test/test-image.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }'  $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
 #curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/image/v2/images
 PROJECT_ID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects 2>/dev/null | python -mjson.tool | grep -B5 "name.*\"admin" | grep '\"id\"' | cut -f4 -d'"')

diff --git a/ocata/vagrant/test/test-network.sh b/ocata/vagrant/test/test-network.sh
index 49b1c44..b011c0f 100644 (file)
--- a/ocata/vagrant/test/test-network.sh
+++ b/ocata/vagrant/test/test-network.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }'  $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
 #curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks
 NETWORK_ID=$(curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X POST -d '{"network":{ "name": "testnetwork1"}}' $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks 2>/dev/null | python -mjson.tool | grep '"id"' | cut -f4 -d'"')

diff --git a/ocata/vagrant/test/test-orchestration.sh b/ocata/vagrant/test/test-orchestration.sh
index 11f281e..3d2bdc3 100644 (file)
--- a/ocata/vagrant/test/test-orchestration.sh
+++ b/ocata/vagrant/test/test-orchestration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ex
 
-MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
+MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
 TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }'  $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
 curl -v -s  -H "Content-Type: application/json"  -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/orchestration/stacks

diff --git a/ocata/vagrant/test/test_multicloud.sh b/ocata/vagrant/test/test_multicloud.sh
index 1c2534a..2466155 100644 (file)
--- a/ocata/vagrant/test/test_multicloud.sh
+++ b/ocata/vagrant/test/test_multicloud.sh
@@ -4,17 +4,17 @@ set -ex
 sudo apt-get update -y
 sudo apt-get install -y docker.io
 
-git clone http://gerrit.onap.org/r/multicloud/openstack
-cd openstack/ocata/docker
+cd /openstack/ocata/docker
 sudo docker build -t multicloud-ocata:latest .
 cd /vagrant/test
+cp /openstack/ocata/run.sh .
 sudo docker build -t multicloud-ocata-test:latest .
 sudo docker network create --subnet=172.16.77.0/24 onap
-sudo docker run -d -t  --name ocata-test --network onap --ip 172.16.77.40 -e MSB_ADDR=172.16.77.40 -e MSB_PORT=9004 multicloud-ocata-test
+sudo docker run -d -t  --name ocata-test --network onap --ip 172.16.77.40 -e MSB_ADDR=172.16.77.40 -e MSB_PORT=9006 multicloud-ocata-test
 
 while true; do
     sleep 10
-    curl http://172.16.77.40:9004/api/multicloud-ocata/v0/swagger.json && break
+    curl http://172.16.77.40:9006/api/multicloud-ocata/v0/swagger.json && break
 done
 
 for i in `cat tests`