Change vfc-ztevmanagerdriver service name

In order to maintain vnfm driver's naming consistency, modify vfc zte
driver micro name ztevmanagerdriver to ztevnfmdriver.

Change-Id: Ida942a5f34496b1efb8bc48955e5cbbed1c34188
Issue-ID: VFC-602
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh
index 41cfb43..0a087b0 100644 (file)
--- a/boot/msb_vm_init.sh
+++ b/boot/msb_vm_init.sh
@@ -99,7 +99,7 @@ curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud
 #VF-C
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8403"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevmanagerdriver", "version": "v1", "url": "/api/ztevmanagerdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8410"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8410"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
 
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8411"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
 

diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index f2ec40c..269fa07 100755 (executable)
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -23,7 +23,7 @@ docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$ZTEVMANAGERDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
 
 docker rm -f vfc_wfengine_mgrservice
@@ -39,7 +39,7 @@ docker rm -f vfc_vnflcm
 docker rm -f vfc_vnfmgr
 docker rm -f vfc_vnfres
 docker rm -f vfc_ztesdncdriver
-docker rm -f vfc_ztevmanagerdriver
+docker rm -f vfc_ztevnfmdriver
 docker rm -f vfc_svnfm_nokia
 
 # Insert docker run instructions here
@@ -56,5 +56,5 @@ docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 $NEX
 docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
 docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
 docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_ztevmanagerdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$ZTEVMANAGERDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 5ae6515..7919f51 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -148,7 +148,7 @@ parameters:
   cli_docker: v1.1.0
 
   vfc_nokia_docker: v1.0.2
-  vfc_ztevmanagerdriver_docker: v1.0.2
+  vfc_ztevnfmdriver_docker: v1.0.2
   vfc_ztesdncdriver_docker: v1.0.0
   vfc_vnfres_docker: v1.0.1
   vfc_vnfmgr_docker: v1.0.1

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 27f5327..114d366 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -327,7 +327,7 @@ parameters:
     type: string
   vfc_nokia_docker:
     type: string
-  vfc_ztevmanagerdriver_docker:
+  vfc_ztevnfmdriver_docker:
     type: string
   vfc_ztesdncdriver_docker:
     type: string
@@ -1502,7 +1502,7 @@ resources:
             __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
             __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
-            __vfc_ztevmanagerdriver_docker__: { get_param: vfc_ztevmanagerdriver_docker }
+            __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
             __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
             __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
             __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1538,7 +1538,7 @@ resources:
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
             echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
-            echo "export ZTEVMANAGERDRIVER_DOCKER_VER=__vfc_ztevmanagerdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
             echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 982eabc..950f8ef 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -148,7 +148,7 @@ parameters:
   cli_docker: ${CLI_DOCKER}
 
   vfc_nokia_docker: ${NOKIA_DOCKER}
-  vfc_ztevmanagerdriver_docker: ${ZTEVMANAGERDRIVER_DOCKER}
+  vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER}
   vfc_ztesdncdriver_docker: ${ZTESDNCDRIVER_DOCKER}
   vfc_vnfres_docker: ${VNFRES_DOCKER}
   vfc_vnfmgr_docker: ${VNFMGR_DOCKER}