Increment the release versions for csit

Change-Id: I12d2c9d01d2c3f5e705bf9c40bed923a20e2f106
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-735

diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap
index 8df0d07..6cf8fb2 100644 (file)
--- a/scripts/optf-has/has/has-properties/conductor.conf.onap
+++ b/scripts/optf-has/has/has-properties/conductor.conf.onap
@@ -132,7 +132,8 @@ log_dir = /var/log
 
 
 [auth]
-appkey = h@ss3crtky400fdntc#001
+# appkey = h@ss3crtky400fdntc#001
+appkey =
 
 [aaf_api]
 

diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh
index 862691f..f851051 100755 (executable)
--- a/scripts/optf-has/has/has_script.sh
+++ b/scripts/optf-has/has/has_script.sh
@@ -31,7 +31,7 @@ cd ${DIR}
 COND_CONF=/tmp/conductor/properties/conductor.conf
 LOG_CONF=/tmp/conductor/properties/log.conf
 IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has
-IMAGE_VER=1.3.2-SNAPSHOT-latest
+IMAGE_VER=2.0.2-SNAPSHOT-latest
 BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer
 
 mkdir -p /tmp/conductor/properties
@@ -84,15 +84,15 @@ curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/ve
 echo "Onboard conductor into music"
 curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" -H "Authorization: Basic Y29uZHVjdG9yOmMwbmR1Y3Qwcg==" --data @${WORKSPACE}/tests/optf-has/has/data/onboard.json
 
-docker run -d --name cond-cont -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
+docker run -d --name cond-cont --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
 sleep 15
-docker run -d --name cond-api -p "8091:8091" -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
+docker run -d --name cond-api --user root -p "8091:8091" -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
 sleep 15
-docker run -d --name cond-solv -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
+docker run -d --name cond-solv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
 sleep 15
-docker run -d --name cond-resv -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
+docker run -d --name cond-resv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
 sleep 5
-docker run -d --name cond-data -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
+docker run -d --name cond-data --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
 sleep 15
 
 COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' cond-api`

diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf.json b/scripts/optf-osdf/osdf/osdf-properties/osdf.json
index e52cb0c..ae059f3 100644 (file)
--- a/scripts/optf-osdf/osdf/osdf-properties/osdf.json
+++ b/scripts/optf-osdf/osdf/osdf-properties/osdf.json
@@ -13,21 +13,21 @@
                 "name": "conductor",
                 "values": {
                     "UserName": "admin1",
-                    "Password": "22234d3472ef5da8ecba5a096110a024f1db5cf195c665f910d558c9e83db19d"
+                    "Password": "plan.15"
                 }
             },
             {
                 "name": "policyPlatform",
                 "values": {
                     "UserName": "testpdp",
-                    "Password": "7a03bdee7a0381daf4ee426b9d2b695e3f4233ffd19a852a3fb0ff0156fbdde7"
+                    "Password": "alpha123"
                 }
             },
             {
                 "name": "policyClient",
                 "values": {
                     "UserName": "python",
-                    "Password": "3a3c8546c91f99f4becc069ba0fbb13ef46f4f3028f5bba09f3f4a9030ddc0a0"
+                    "Password": "test"
                 }
             },
             {
@@ -48,35 +48,35 @@
                 "name": "osdfPlacement",
                 "values": {
                     "UserName": "test",
-                    "Password": "c66b1570ae257375e500f9fe0e62b2a325466137ac5f29581e2e05cce1170212"
+                    "Password": "testpwd"
                 }
             },
             {
                 "name": "osdfPlacementSO",
                 "values": {
                     "UserName": "so_test",
-                    "Password": "3d62d49b3e4ada38fd4146d2d82f4ba2f09345a46f15970cd439924c991b8202"
+                    "Password": "so_testpwd"
                 }
             },
             {
                 "name": "osdfPlacementVFC",
                 "values": {
                     "UserName": "vfc_test",
-                    "Password": "1fb1cd581f96060d29ecad06be97151656bf29bce66bad587cd2fbaf5ea1e66d"
+                    "Password": "vfc_testpwd"
                 }
             },
             {
                 "name": "osdfCMScheduler",
                 "values": {
                     "UserName": "test1",
-                    "Password": "c5279fb02d7bac5269b1a644ac8e36f41f6ba7a2eae03dc469cb80d71811322b"
+                    "Password": "testpwd1"
                 }
             },
             {
                 "name": "configDb",
                 "values": {
                     "UserName": "osdf",
-                    "Password": "40697f254409c2b97763892ecdeb50c847d605f5beb6f988f1c142a7e0344d0c"
+                    "Password": "passwd"
                 }
             },
             {
@@ -90,14 +90,14 @@
                 "name": "osdfPCIOpt",
                 "values": {
                     "UserName": "pci_test",
-                    "Password": "fbf4dcb7f7cda8fdfb742838b0c90ae5bea249801f3f725fdc98941a6e4c347c"
+                    "Password": "pci_testpwd"
                 }
             },
             {
                 "name": "osdfOptEngine",
                 "values": {
                     "UserName": "opt_test",
-                    "Password": "02946408ce6353d45540cd01d912686f19f48c3d8a955d5effdc14c6a43477e5"
+                    "Password": "opt_testpwd"
                 }
             }
         ]

diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
index 6578567..95856df 100755 (executable)
--- a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
+++ b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
@@ -49,4 +49,4 @@ configDbGetCellListUrl: 'getCellList'
 configDbGetNbrListUrl: 'getNbrList'
 
 #key
-appkey: os35@rrtky400fdntc#001t5
\ No newline at end of file
+appkey:

diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh
index 3554b55..2f2d0c9 100755 (executable)
--- a/scripts/optf-osdf/osdf/osdf_script.sh
+++ b/scripts/optf-osdf/osdf/osdf_script.sh
@@ -34,7 +34,7 @@ cd ${DIR}
 # run docker containers
 OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml
 IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf
-IMAGE_VER=2.0.1-SNAPSHOT-latest
+IMAGE_VER=2.0.3-SNAPSHOT-latest
 
 mkdir -p /tmp/osdf/properties
 mkdir -p /tmp/sms/properties