Adding new network settings clean

- the new network settings patch uses new network names that
  thet current code can't clean up. This patch adds the clean
  so that the clean can land before the patch gets reviewed more.

Change-Id: I8c8998f24e48929862db40f2d90a2d6c82e70254
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit 0d970ec91f5ff3a758fcba8c8b2a9d64ab20e593)

diff --git a/ci/clean.sh b/ci/clean.sh
index e4b2d10..c00a4df 100755 (executable)
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -30,8 +30,12 @@ for lib in common-functions parse-functions; do
 done
 
 vm_index=4
-ovs_bridges="br-admin br-private br-public br-storage"
-OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network"
+ovs_bridges="br-admin br-tenant br-public br-storage"
+ovs_bridges+=" br-private br-external" # Legecy names, remove in E river
+
+#OPNFV_NETWORK_TYPES=$(python3 -c 'from apex.common.constants import OPNFV_NETWORK_TYPES; print(" ".join(OPNFV_NETWORK_TYPES))')
+OPNFV_NETWORK_TYPES+=" admin tenant external storage api"
+OPNFV_NETWORK_TYPES+=" admin_network private_network public_network storage_network api_network" # Legecy names, remove in E river
 
 
 display_usage() {
@@ -75,7 +79,7 @@ parse_cmdline "$@"
 
 if [ -n "$INVENTORY_FILE" ]; then
   echo -e "${blue}INFO: Parsing inventory file...${reset}"
-  if ! python3.4 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then
+  if ! python3 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then
     echo -e "${red}WARN: Unable to shutdown all nodes! Please check /var/log/apex.log${reset}"
   else
     echo -e "${blue}INFO: Node shutdown complete...${reset}"