openstack/devstack
Code Issues Proposed changes

Use Neutron extension information to configure Tempest's public network

Browse Source 
Neutron L3 may implement a variety of extensions: router, external-net,
dvr, ext-gw-mode, extraroute, l3-ha, etc. The public network uuid is
only going to be made available if and only if the external-net extension
is available, because that's the one that provides Floating IP support.

Rather than making Tempest aware of q-l3 service (when q-* services
are supposed to be legacy), it is better to tune this configuration
based on the extension availability. This decouples Tempest from
Neutron setup internals.

Change-Id: I4889fc3d21bd221785b507995f1b3da0e8f52b46
Related-bug: 1582119
This commit is contained in:
Armando Migliaccio
2016-05-17 15:12:24 -07:00
parent f5db32dfdb
commit 53f59d802f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tempest
View File

@@ -238,7 +238,10 @@ function configure_tempest {
ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method} ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
if is_service_enabled q-l3; then # the public network (for floating ip access) is only available
# if the extension is enabled.
EXTERNAL_NETWORK_EXT=$(neutron ext-list | grep 'external-net' | get_field 1)
if [[ -n $EXTERNAL_NETWORK_EXT ]]; then
public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \ public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
awk '{print $2}') awk '{print $2}')
fi fi