From c58da3126e944a95be4a7440cf52e28f4e1bf529 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 6 Mar 2025 10:11:58 +0900
Subject: [PATCH] Drop logic for nova-network

nova-network was removed multiple cycles ago and neutron is now
the only option available.

Change-Id: I41fe32a111751d090dbbb92203ecc770b474d2ac
---
 integration/scripts/conf/test_begin.conf |  1 -
 integration/scripts/localrc.rc           | 14 ++------------
 integration/scripts/trovestack           | 19 +++++--------------
 integration/scripts/trovestack.rc        |  3 ---
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf
index 83f6de8608..07a660658f 100644
--- a/integration/scripts/conf/test_begin.conf
+++ b/integration/scripts/conf/test_begin.conf
@@ -63,7 +63,6 @@
     "rabbit_runs_locally": true,
     "dbaas_datastore": "%datastore_type%",
     "dbaas_datastore_version": "%datastore_version%",
-    "neutron_enabled": %neutron_enabled%,
     "swift_enabled": %swift_enabled%,
     "shared_network": "%shared_network%",
     "trove_mgmt_network": "trove-mgmt",
diff --git a/integration/scripts/localrc.rc b/integration/scripts/localrc.rc
index f87ca536e2..68828d9a8c 100644
--- a/integration/scripts/localrc.rc
+++ b/integration/scripts/localrc.rc
@@ -16,14 +16,7 @@ ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
 ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
 ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
 ENABLED_SERVICES+=,-n-novnc,-n-xvnc
-if [[ $ENABLE_NEUTRON = true ]]; then
-    ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta
-    disable_service n-net
-else
-    PUBLIC_INTERFACE=eth0
-    enable_service n-net
-    disable_service neutron q-svc q-agt q-dhcp q-l3 q-meta
-fi
+ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta
 # OSprofiler depends on Ceilometer
 if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then
     CEILOMETER_BACKEND=mysql
@@ -39,10 +32,7 @@ if [[ $ENABLE_MISTRAL = true ]]; then
 fi
 
 # Use Git repositories for client components
-LIBS_FROM_GIT=python-troveclient
-if [[ $ENABLE_NEUTRON = true ]]; then
-    LIBS_FROM_GIT+=,python-neutronclient
-fi
+LIBS_FROM_GIT=python-troveclient,python-neutronclient
 if [[ $ENABLE_MISTRAL = true ]]; then
     LIBS_FROM_GIT+=,python-mistralclient
 fi
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index f5eac6ab0a..9729689df2 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -633,25 +633,16 @@ function mod_confs() {
     sed -i "s/%admin_password%/$ADMIN_PASSWORD/g" $TEST_CONF
     sed -i "s/%service_password%/$SERVICE_PASSWORD/g" $TEST_CONF
 
-    # Enable neutron tests if needed
-    sed -i "s/%neutron_enabled%/$ENABLE_NEUTRON/g" $TEST_CONF
-
     # Enable backup related tests if Swift is enabled
     sed -i "s/%swift_enabled%/$ENABLE_SWIFT/g" $TEST_CONF
 
     # If neutron is enabled, the devstack plugin has already set up the shared
     # private network for testing.
-    if [[ $ENABLE_NEUTRON = true ]]; then
-        TROVE_NET_ID=$(openstack $CLOUD_ADMIN_ARG network list | grep " $TROVE_PRIVATE_NETWORK_NAME " | awk '{print $2}')
-        TROVE_SUBNET_ID=$(openstack $CLOUD_ADMIN_ARG subnet list | grep " $TROVE_PRIVATE_SUBNET_NAME " | awk '{print $2}')
-        echo "Using network ${TROVE_PRIVATE_NETWORK_NAME} (${TROVE_NET_ID}): ${TROVE_PRIVATE_SUBNET_NAME} (${TROVE_SUBNET_ID})"
-        sed -i "s,%shared_network%,$TROVE_NET_ID,g" $TEST_CONF
-        sed -i "s,%shared_network_subnet%,$TROVE_SUBNET_ID,g" $TEST_CONF
-    else
-        # do not leave invalid keys in the configuration when using Nova for networking
-        sed -i "/%shared_network%/d" $TEST_CONF
-        sed -i "/%shared_network_subnet%/d" $TEST_CONF
-    fi
+    TROVE_NET_ID=$(openstack $CLOUD_ADMIN_ARG network list | grep " $TROVE_PRIVATE_NETWORK_NAME " | awk '{print $2}')
+    TROVE_SUBNET_ID=$(openstack $CLOUD_ADMIN_ARG subnet list | grep " $TROVE_PRIVATE_SUBNET_NAME " | awk '{print $2}')
+    echo "Using network ${TROVE_PRIVATE_NETWORK_NAME} (${TROVE_NET_ID}): ${TROVE_PRIVATE_SUBNET_NAME} (${TROVE_SUBNET_ID})"
+    sed -i "s,%shared_network%,$TROVE_NET_ID,g" $TEST_CONF
+    sed -i "s,%shared_network_subnet%,$TROVE_SUBNET_ID,g" $TEST_CONF
 
     if [[ "$DATASTORE_TYPE" = "vertica" ]]; then
         # Vertica needs more time than mysql for its boot/start/stop operations.
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index eaf745509a..29396a47e7 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -10,9 +10,6 @@
 # Try REGION_NAME then OS_REGION_NAME then RegionOne (the devstack default)
 REGION_NAME=${REGION_NAME:-${OS_REGION_NAME:-RegionOne}}
 
-# Enable Neutron
-ENABLE_NEUTRON=$(get_bool ENABLE_NEUTRON true)
-
 # Enable Swift
 ENABLE_SWIFT=$(get_bool ENABLE_SWIFT true)