update for name change to Neutron
Note: Nova and Horizon are not updated until those projects have
migrated.
Change-Id: I256ef20e7caadd9c96e6dd908c5d8b69ca5c4aeb
diff --git a/exercises/boot_from_volume.sh b/exercises/boot_from_volume.sh
index 358b3d2..1814732 100755
--- a/exercises/boot_from_volume.sh
+++ b/exercises/boot_from_volume.sh
@@ -32,9 +32,9 @@
# Import configuration
source $TOP_DIR/openrc
-# Import quantum functions if needed
-if is_service_enabled quantum; then
- source $TOP_DIR/lib/quantum
+# Import neutron functions if needed
+if is_service_enabled neutron; then
+ source $TOP_DIR/lib/neutron
fi
# Import exercise configuration
diff --git a/exercises/euca.sh b/exercises/euca.sh
index ac21b6b..eec8636 100755
--- a/exercises/euca.sh
+++ b/exercises/euca.sh
@@ -33,9 +33,9 @@
# Import EC2 configuration
source $TOP_DIR/eucarc
-# Import quantum functions if needed
-if is_service_enabled quantum; then
- source $TOP_DIR/lib/quantum
+# Import neutron functions if needed
+if is_service_enabled neutron; then
+ source $TOP_DIR/lib/neutron
fi
# Import exercise configuration
diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh
index b741efb..b22ef11 100755
--- a/exercises/floating_ips.sh
+++ b/exercises/floating_ips.sh
@@ -30,9 +30,9 @@
# Import configuration
source $TOP_DIR/openrc
-# Import quantum functions if needed
-if is_service_enabled quantum; then
- source $TOP_DIR/lib/quantum
+# Import neutron functions if needed
+if is_service_enabled neutron; then
+ source $TOP_DIR/lib/neutron
fi
# Import exercise configuration
@@ -155,7 +155,7 @@
# Test we can ping our floating IP within ASSOCIATE_TIMEOUT seconds
ping_check "$PUBLIC_NETWORK_NAME" $FLOATING_IP $ASSOCIATE_TIMEOUT
-if ! is_service_enabled quantum; then
+if ! is_service_enabled neutron; then
# Allocate an IP from second floating pool
TEST_FLOATING_IP=$(nova floating-ip-create $TEST_FLOATING_POOL | grep $TEST_FLOATING_POOL | get_field 1)
die_if_not_set $LINENO TEST_FLOATING_IP "Failure creating floating IP in $TEST_FLOATING_POOL"
@@ -179,7 +179,7 @@
# Clean up
# --------
-if ! is_service_enabled quantum; then
+if ! is_service_enabled neutron; then
# Delete second floating IP
nova floating-ip-delete $TEST_FLOATING_IP || \
die $LINENO "Failure deleting floating IP $TEST_FLOATING_IP"
diff --git a/exercises/quantum-adv-test.sh b/exercises/quantum-adv-test.sh
index abec5e4..4367e2e 100755
--- a/exercises/quantum-adv-test.sh
+++ b/exercises/quantum-adv-test.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#
-# **quantum-adv-test.sh**
+# **neutron-adv-test.sh**
-# Perform integration testing of Nova and other components with Quantum.
+# Perform integration testing of Nova and other components with Neutron.
echo "*********************************************************************"
echo "Begin DevStack Exercise: $0"
@@ -43,16 +43,16 @@
# Import configuration
source $TOP_DIR/openrc
-# Import quantum functions
-source $TOP_DIR/lib/quantum
+# Import neutron functions
+source $TOP_DIR/lib/neutron
-# If quantum is not enabled we exit with exitcode 55, which means exercise is skipped.
-quantum_plugin_check_adv_test_requirements || exit 55
+# If neutron is not enabled we exit with exitcode 55, which means exercise is skipped.
+neutron_plugin_check_adv_test_requirements || exit 55
# Import exercise configuration
source $TOP_DIR/exerciserc
-# Quantum Settings
+# Neutron Settings
# ----------------
TENANTS="DEMO1"
@@ -161,7 +161,7 @@
function get_network_id {
local NETWORK_NAME="$1"
- local NETWORK_ID=`quantum net-list -F id -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`
+ local NETWORK_ID=`neutron net-list -F id -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`
echo $NETWORK_ID
}
@@ -232,9 +232,9 @@
source $TOP_DIR/openrc admin admin
local TENANT_ID=$(get_tenant_id $TENANT)
source $TOP_DIR/openrc $TENANT $TENANT
- local NET_ID=$(quantum net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )
- quantum subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR
- quantum-debug probe-create --device-owner compute $NET_ID
+ local NET_ID=$(neutron net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )
+ neutron subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR
+ neutron-debug probe-create --device-owner compute $NET_ID
source $TOP_DIR/openrc demo demo
}
@@ -320,10 +320,10 @@
local TENANT_ID=$(get_tenant_id $TENANT)
#TODO(nati) comment out until l3-agent merged
#for res in port subnet net router;do
- for net_id in `quantum net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do
+ for net_id in `neutron net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do
delete_probe $net_id
- quantum subnet-list | grep $net_id | awk '{print $2}' | xargs -I% quantum subnet-delete %
- quantum net-delete $net_id
+ neutron subnet-list | grep $net_id | awk '{print $2}' | xargs -I% neutron subnet-delete %
+ neutron net-delete $net_id
done
source $TOP_DIR/openrc demo demo
}
diff --git a/exercises/volumes.sh b/exercises/volumes.sh
index 7913641..f574bb3 100755
--- a/exercises/volumes.sh
+++ b/exercises/volumes.sh
@@ -30,9 +30,9 @@
# Import configuration
source $TOP_DIR/openrc
-# Import quantum functions if needed
-if is_service_enabled quantum; then
- source $TOP_DIR/lib/quantum
+# Import neutron functions if needed
+if is_service_enabled neutron; then
+ source $TOP_DIR/lib/neutron
fi
# Import exercise configuration