From 827386f5aeb2cfe4421ae0d3a6a191db54bda333 Mon Sep 17 00:00:00 2001
From: baiziyu <baiziyu@inspur.com>
Date: Fri, 9 Sep 2022 18:25:27 +0800
Subject: [PATCH] Use venus clinet

Insert venusclient into requirements.txt

Change-Id: I0e50b65fb30f797b39cac067167ac3c0a3043685
---
 devstack/plugin.sh | 21 ++-------------------
 requirements.txt   |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a31b1cd..efff318 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -10,23 +10,6 @@ function configure_venus_dashboard {
     cp -a ${VENUS_DASHBOARD_DIR}/venus_dashboard/enabled/* ${HORIZON_DIR}/openstack_dashboard/local/enabled/
 }
 
-function install_venus_client {
-    VENUSCLINET_REPO="https://review.opendev.org/openstack/python-venusclient"
-    VENUSCLIENT_BRANCH="master"
-    VENUSCLIENT_DIR="${VENUS_DASHBOARD_DIR}/python-venusclient"
-
-    if [[ ! -d $VENUSCLIENT_DIR ]]; then
-        git_clone $VENUSCLINET_REPO $VENUSCLIENT_DIR $VENUSCLIENT_BRANCH
-
-        mv ${VENUSCLIENT_DIR}/venusclient ${VENUS_DASHBOARD_DIR}/venusclient
-        rm -rf ${VENUSCLIENT_DIR}
-    fi
-}
-
-function remove_venus_client {
-    rm -rf ${VENUS_DASHBOARD_DIR}/venusclient
-}
-
 function init_venus_dashboard {
     $PYTHON ${DEST}/horizon/manage.py collectstatic --noinput
     $PYTHON ${DEST}/horizon/manage.py compress --force
@@ -44,7 +27,6 @@ if is_service_enabled venus-dashboard; then
         # Perform installation of service source
         echo_summary "Installing Venus Dashboard"
         install_venus_dashboard
-        install_venus_client
 
      elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         # Configure after the other layer 1 and 2 services have been configured
@@ -60,7 +42,8 @@ if is_service_enabled venus-dashboard; then
 
     if [[ "$1" == "unstack" ]]; then
         # Shut down venus-dashboard services
-        remove_venus_client
+        # no-op
+        :
     fi
 
     if [[ "$1" == "clean" ]]; then
diff --git a/requirements.txt b/requirements.txt
index 9e0cc83..1452633 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,4 @@ XStatic-lodash>=4.16.4.1 # MIT License
 XStatic-moment>=2.8.4.1 # MIT License
 XStatic-Moment-Timezone>=0.5.22.0 # MIT License
 XStatic-smart-table>=1.4.13.2 # MIT License
-# python-venusclient>=2.5.0  # Apache-2.0
+python-venusclient>=1.0.0  # Apache-2.0 License