diff options
| author |   blsaws <bryan.sullivan@att.com> | 2016-03-14 13:56:02 -0700 |
|---|---|---|
| committer |   blsaws <bs3131@att.com> | 2016-04-01 08:30:07 -0700 |
| commit | 116e6e78025b7ae3f3f54be0bca6595871303b82 (patch) | |
| tree | ba34417b4dfd19400ce5fa01424b0fcc6de43201 /tests/adhoc/dmz01-clean.sh | |
| parent | 79a4957986b6b069b880c45f55a293ee0223c6d1 (diff) | |
Change object names to avoid conflicts.
JIRA: COPPER-4
Change-Id: I86e5bc8ed51232ab25e01203fd83e68453b34cc5
Signed-off-by: blsaws <bryan.sullivan@att.com>
Diffstat (limited to 'tests/adhoc/dmz01-clean.sh')
| -rw-r--r-- | tests/adhoc/dmz01-clean.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/adhoc/dmz01-clean.sh b/tests/adhoc/dmz01-clean.sh index ee70867..fff7dea 100644 --- a/tests/adhoc/dmz01-clean.sh +++ b/tests/adhoc/dmz01-clean.sh @@ -38,23 +38,23 @@ instance=$(nova list | awk "/ cirros2 / { print \$2 }") if [ "$instance" != "" ]; then nova delete $instance fi -router=$(neutron router-list | awk "/ external / { print \$2 }") +router=$(neutron router-list | awk "/ test_router / { print \$2 }") -internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}') +test_internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}') -if [ "$internal_interface" != "" ]; then neutron router-interface-delete $router port=$internal_interface +if [ "$test_internal_interface" != "" ]; then neutron router-interface-delete $router port=$test_internal_interface fi -public_interface=$(neutron router-port-list $router | grep 191.168.10.2 | awk '{print $2}') +test_public_interface=$(neutron router-port-list $router | grep 191.168.10.2 | awk '{print $2}') -if [ "$public_interface" != "" ]; then neutron router-interface-delete $router port=$public_interface +if [ "$test_public_interface" != "" ]; then neutron router-interface-delete $router port=$test_public_interface fi -neutron router-interface-delete $router $internal_interface +neutron router-interface-delete $router $test_internal_interface -neutron router-gateway-clear external +neutron router-gateway-clear test_router -neutron router-delete external +neutron router-delete test_router port=$(neutron port-list | awk "/ 10.0.0.1 / { print \$2 }") @@ -66,12 +66,12 @@ port=$(neutron port-list | awk "/ 10.0.0.2 / { print \$2 }") if [ "$port" != "" ]; then neutron port-delete $port fi -neutron subnet-delete internal +neutron subnet-delete test_internal -neutron net-delete internal +neutron net-delete test_internal -neutron subnet-delete public +neutron subnet-delete test_public -neutron net-delete public +neutron net-delete test_public set +x #echo off |