From db612142c80ed879a1917a53cb104e76e1be66b3 Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 4 Aug 2017 18:54:57 +0800
Subject: [PATCH] Rename jasmine to daisy4nfv-jasmine

Change-Id: I973de329009cf9e5d3d690d6429c923252f26a7e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
 backend/kolla/prepare.sh                       | 2 +-
 code/daisy/daisy/api/backends/kolla/install.py | 4 ++--
 tools/setup/install/install_func.sh            | 2 +-
 tools/setup/install/install_interface.sh       | 6 +++---
 tools/setup/makefile                           | 6 +++---
 tools/setup/uninstall/uninstall_interface.sh   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/kolla/prepare.sh b/backend/kolla/prepare.sh
index dda4647a..90f138c0 100755
--- a/backend/kolla/prepare.sh
+++ b/backend/kolla/prepare.sh
@@ -28,5 +28,5 @@ yum -y install ansible
 
 # multicast related
 prepare_dir=$(dirname $(readlink -f "$0"))
-yum install -y $prepare_dir/jasmine*.rpm
+yum install -y $prepare_dir/daisy4nfv-jasmine*.rpm
 docker load < $prepare_dir/registry-server.tar
diff --git a/code/daisy/daisy/api/backends/kolla/install.py b/code/daisy/daisy/api/backends/kolla/install.py
index e7563b46..af44ba44 100755
--- a/code/daisy/daisy/api/backends/kolla/install.py
+++ b/code/daisy/daisy/api/backends/kolla/install.py
@@ -444,9 +444,9 @@ def _thread_bin(req, cluster_id, host, root_passwd, fp, host_name_ip_list,
           (host_ip, host_prepare_file, host_prepare_file)
     daisy_cmn.subprocess_call(cmd, fp)
 
-    # scp jasmine.rpm to the same dir of prepare.sh at target host
+    # scp daisy4nfv-jasmine.rpm to the same dir of prepare.sh at target host
     cmd = "scp -o ConnectTimeout=10 \
-           /var/lib/daisy/tools/jasmine*.rpm \
+           /var/lib/daisy/tools/daisy4nfv-jasmine*.rpm \
            root@%s:%s" % (host_ip, host_prepare_file)
     daisy_cmn.subprocess_call(cmd, fp)
 
diff --git a/tools/setup/install/install_func.sh b/tools/setup/install/install_func.sh
index 673cdac7..e9475d3e 100755
--- a/tools/setup/install/install_func.sh
+++ b/tools/setup/install/install_func.sh
@@ -144,7 +144,7 @@ function kolla_install
   fi
 
   if [ ! -f "/var/lib/daisy/tools/registry-server.tar" ];then
-      cp $imagedir/registry-server.tar /var/lib/daisy/tools/ # keep jasmine for target hosts
+      cp $imagedir/registry-server.tar /var/lib/daisy/tools/ # keep it for target hosts
   fi
 
   docker load < $imagedir/registry-server.tar
diff --git a/tools/setup/install/install_interface.sh b/tools/setup/install/install_interface.sh
index 7d520979..c0be86d8 100644
--- a/tools/setup/install/install_interface.sh
+++ b/tools/setup/install/install_interface.sh
@@ -87,10 +87,10 @@ function all_install
     write_install_log "install wget rpm"
     install_rpm_by_yum "wget"
 
-    write_install_log "install jasmine"
+    write_install_log "install daisy4nfv-jasmine"
     mkdir -p /var/lib/daisy/tools/
-    cp jasmine*.rpm /var/lib/daisy/tools/ # keep jasmine for target hosts
-    install_rpm_by_daisy_yum "jasmine"
+    cp daisy4nfv-jasmine*.rpm /var/lib/daisy/tools/ # keep it for target hosts
+    install_rpm_by_daisy_yum "daisy4nfv-jasmine"
 
     if [ -f "/etc/zte-docker" ];then
         write_install_log "install pxe_docker_install rpm"
diff --git a/tools/setup/makefile b/tools/setup/makefile
index ebea8993..41970e8e 100755
--- a/tools/setup/makefile
+++ b/tools/setup/makefile
@@ -57,9 +57,9 @@ bin: binclean binforce
 	git clone https://gerrit.opnfv.org/gerrit/daisy && \
 	cd ./daisy/code/jasmine && \
 	./autogen.sh && ./configure && make rpm
-	$(CP) ./jasmine/daisy/code/jasmine/x86_64/jasmine*.rpm $(_TECS_TOOLS_PATH)/setup/bin_temp/
-	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/jasmine-devel*.rpm
-	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/jasmine-debuginfo*.rpm
+	$(CP) ./jasmine/daisy/code/jasmine/x86_64/daisy4nfv-jasmine*.rpm $(_TECS_TOOLS_PATH)/setup/bin_temp/
+	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-jasmine-devel*.rpm
+	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-jasmine-debuginfo*.rpm
 
 	if [ -e makefile_patch.sh ]; then ./makefile_patch.sh $(_TECS_TOOLS_PATH) ; fi
 	cd $(_TECS_TOOLS_PATH)/setup; chmod +x ./makeself.sh; ./makeself.sh ./bin_temp $(_TECS_TARGET_PATH)/$(PURE_OS_TYPE)/$(ARCH)/$(VER_PREFIX)_$(BIN_TYPE).$(VER_SUFFIX) tecs ./setup.sh
diff --git a/tools/setup/uninstall/uninstall_interface.sh b/tools/setup/uninstall/uninstall_interface.sh
index 42baa6a9..9313f390 100755
--- a/tools/setup/uninstall/uninstall_interface.sh
+++ b/tools/setup/uninstall/uninstall_interface.sh
@@ -20,7 +20,7 @@ function uninstall_daisy
     remove_rpms_by_yum "python-django-horizon  daisy-dashboard"
     remove_rpms_by_yum "daisy python-daisyclient  python-daisy"
     remove_rpms_by_yum "daisy-discoverd python-daisy-discoverd"
-    remove_rpms_by_yum "jasmine"
+    remove_rpms_by_yum "daisy4nfv-jasmine"
     rpm -e  pxe_server_install
     for i in `ps -elf | grep daisy-api |grep -v grep | awk -F ' ' '{print $4}'`;do kill -9 $i;done
     for j in `ps -elf | grep daisy-registry |grep -v grep | awk -F ' ' '{print $4}'`;do kill -9 $j;done