openstack
/
devstack
Code Issues Proposed changes

Merge "Neutron: use "OSC show -f value -c id" instead of "OSC list + grep""

This commit is contained in:
Jenkins 2016-11-28 23:45:09 +00:00 committed by Gerrit Code Review
parent e1b75c3636 d038b60e65
commit 42a21ec58d
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exercises/neutron-adv-test.sh
View File

@ -156,7 +156,7 @@ function get_role_id {
function get_network_id {
local NETWORK_NAME="$1"
local NETWORK_ID
NETWORK_ID=`openstack network list | grep $NETWORK_NAME | awk '{print $2}'`
NETWORK_ID=`openstack network show -f value -c id $NETWORK_NAME`
echo $NETWORK_ID
}

3
lib/tempest
View File

@ -242,8 +242,7 @@ function configure_tempest {
# the public network (for floating ip access) is only available
# if the extension is enabled.
if is_networking_extension_supported 'external-net'; then
public_network_id=$(openstack network list | grep $PUBLIC_NETWORK_NAME | \
awk '{print $2}')
public_network_id=$(openstack network show -f value -c id $PUBLIC_NETWORK_NAME)
fi
iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG

2
tools/ping_neutron.sh
View File

@ -54,7 +54,7 @@ fi
REMAINING_ARGS="${@:2}"
# BUG: with duplicate network names, this fails pretty hard.
NET_ID=$(openstack network list | grep "$NET_NAME" | awk '{print $2}')
NET_ID=$(openstack network show -f value -c id "$NET_NAME")
PROBE_ID=$(neutron-debug probe-list -c id -c network_id | grep "$NET_ID" | awk '{print $2}' | head -n 1)
# This runs a command inside the specific netns