openstack
/
heat
Code Issues Proposed changes

Use openstack commands for prepare_test_network.sh 

There is not yet an openstack command to create a subnet so the old
command is used.

The tests work fine without adding the ROUTER_GW_IP route, so this has
been removed.

Change-Id: Ic5f9c3ab130ad089fb12a7f2182dc8136faa6daf
This commit is contained in:
Steve Baker 2016-06-29 00:38:33 +00:00
parent 07399d4de5
commit 8479545525
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat_integrationtests/prepare_test_network.sh
View File

@ -14,16 +14,12 @@
# This script creates default tenant networks for the tests
set -x
set -ex
source $DEST/devstack/openrc admin admin
PUB_SUBNET_ID=`neutron subnet-list | grep ' public-subnet ' | awk '{split($0,a,"|"); print a[2]}'`
ROUTER_GW_IP=`neutron port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F '"' -v subnet_id="${PUB_SUBNET_ID//[[:space:]]/}" '$4 == subnet_id { print $8; }'`
HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24
# create a heat specific private network (default 'private' network has ipv6 subnet)
source $DEST/devstack/openrc demo demo
HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24
neutron net-create heat-net
openstack network create heat-net
neutron subnet-create --name heat-subnet heat-net $HEAT_PRIVATE_SUBNET_CIDR
neutron router-interface-add router1 heat-subnet
sudo route add -net $HEAT_PRIVATE_SUBNET_CIDR gw $ROUTER_GW_IP
openstack router add subnet router1 heat-subnet