aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-12-06 15:09:07 +0800
committeryunlong ying <ying.yunlong@zte.com.cn>2017-12-06 07:10:03 +0000
commitb058e493280568e05cd3e8f44e157cb585ae1df8 (patch)
tree55641edbc4784b3d6fb1fc01104cba29ff895eea
parent4cc6edb27d762555658eb85217f67c419e5d4818 (diff)
Fix vfc-ztevmanagerdriver service name
In order to maintain vnfm driver's naming consistency, modify vfc zte driver micro name ztevmanagerdriver to ztevnfmdriver Change-Id: I804d35951602d67bf2fe055e1372ba5abf3c0432 Issue-ID: VFC-602 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r--test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh10
-rw-r--r--test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh2
-rw-r--r--test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot6
-rw-r--r--version-manifest/src/main/resources/docker-manifest.csv2
4 files changed, 10 insertions, 10 deletions
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
index fca54fae6..047c067e8 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
@@ -42,13 +42,13 @@ done
echo sleep 60
sleep 60
-# start vfc-ztevmanagerdriver
-docker run -d --name vfc-ztevmanagerdriver -p 8410:8410 -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver
-ZTEVMANAGERDRIVER_IP=`get-instance-ip.sh vfc-ztevmanagerdriver`
+# start vfc-ztevnfmdriver
+docker run -d --name vfc-ztevnfmdriver -p 8410:8410 -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/ztevnfmdriver
+ZTEVNFMDRIVER_IP=`get-instance-ip.sh vfc-ztevnfmdriver`
# Wait for initialization
for i in {1..10}; do
- curl -sS ${ZTEVMANAGERDRIVER_IP}:8410 && break
+ curl -sS ${ZTEVNFMDRIVER_IP}:8410 && break
echo sleep $i
sleep $i
done
@@ -64,4 +64,4 @@ for i in {1..20}; do
done
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v ZTEVMANAGERDRIVER_IP:${ZTEVMANAGERDRIVER_IP} -v MSB_IP:${MSB_IAG_IP} -v SERVICE_IP:${SERVICE_IP} -v SCRIPTS:${SCRIPTS}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v ZTEVNFMDRIVER_IP:${ZTEVNFMDRIVER_IP} -v MSB_IP:${MSB_IAG_IP} -v SERVICE_IP:${SERVICE_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh
index e440068fb..a7909581e 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh
@@ -19,6 +19,6 @@
kill-instance.sh msb_internal_apigateway
kill-instance.sh msb_discovery
kill-instance.sh msb_consul
-kill-instance.sh vfc-ztevmanagerdriver
+kill-instance.sh vfc-ztevnfmdriver
kill-instance.sh vfc-svnfm-huawei
diff --git a/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot b/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot
index 7d7d305b1..44a4f9d90 100644
--- a/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot
+++ b/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot
@@ -6,13 +6,13 @@ Library json
*** Variables ***
@{return_ok_list}= 200 201 202
-${queryswagger_url} /api/ztevmanagerdriver/v1/swagger.json
+${queryswagger_url} /api/ztevnfmdriver/v1/swagger.json
*** Test Cases ***
VnfresSwaggerTest
- [Documentation] query ztevmanagerdriver swagger info rest test
+ [Documentation] query ztevnfmdriver swagger info rest test
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${ZTEVMANAGERDRIVER_IP}:8410 headers=${headers}
+ Create Session web_session http://${ZTEVNFMDRIVER_IP}:8410 headers=${headers}
${resp}= Get Request web_session ${queryswagger_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 35e992adc..a29cfd555 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -59,7 +59,7 @@ onap/vfc/vnfres,v1.0.1
onap/vfc/wfengine-activiti,v1.0.0
onap/vfc/wfengine-mgrservice,v1.0.0
onap/vfc/ztesdncdriver,v1.0.0
-onap/vfc/ztevmanagerdriver,v1.0.2
+onap/vfc/ztevnfmdriver,v1.0.2
onap/vnfsdk/refrepo,1.0.0
onap/vnfsdk/refrepo-postgres,1.0.0
openecomp/aai-resources,v1.1.0