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.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.sh')
| -rw-r--r-- | tests/adhoc/dmz01.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/adhoc/dmz01.sh b/tests/adhoc/dmz01.sh index 22ecc3a..d39b603 100644 --- a/tests/adhoc/dmz01.sh +++ b/tests/adhoc/dmz01.sh @@ -49,31 +49,31 @@ IMAGE_ID=$(glance image-list | awk "/ cirros-0.3.3-x86_64-dmz / { print \$2 }") glance --os-image-api-version 2 image-tag-update $IMAGE_ID "dmz" -neutron net-create public --router:external=true --provider:network_type=flat --provider:physical_network=physnet1 +neutron net-create test_public --router:test_router=true --provider:network_type=flat --provider:physical_network=physnet1 -neutron subnet-create --disable-dhcp public 192.168.10.0/24 +neutron subnet-create --disable-dhcp test_public 192.168.10.0/24 -neutron net-create internal +neutron net-create test_internal -neutron subnet-create internal 10.0.0.0/24 --name internal --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8 +neutron subnet-create test_internal 10.0.0.0/24 --name test_internal --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8 -neutron router-create external +neutron router-create test_router -neutron router-gateway-set external public +neutron router-gateway-set test_router test_public -neutron router-interface-add external subnet=internal +neutron router-interface-add test_router subnet=test_internal # add a delay since the previous command takes the neutron-api offline for a while (?) sleep 30 -INTERNAL_NET=$(neutron net-list | awk "/ internal / { print \$2 }") +test_internal_NET=$(neutron net-list | awk "/ test_internal / { print \$2 }") neutron security-group-create dmz neutron security-group-rule-create --direction ingress dmz -nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$INTERNAL_NET --security-groups dmz cirros1 +nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET --security-groups dmz cirros1 -nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64-dmz --nic net-id=$INTERNAL_NET --security-groups dmz cirros2 +nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64-dmz --nic net-id=$test_internal_NET --security-groups dmz cirros2 openstack congress policy create test |