| ... | ... |
@@ -156,7 +156,7 @@ function get_role_id {
|
| 156 | 156 |
function get_network_id {
|
| 157 | 157 |
local NETWORK_NAME="$1" |
| 158 | 158 |
local NETWORK_ID |
| 159 |
- NETWORK_ID=`openstack network list | grep $NETWORK_NAME | awk '{print $2}'`
|
|
| 159 |
+ NETWORK_ID=`openstack network show -f value -c id $NETWORK_NAME` |
|
| 160 | 160 |
echo $NETWORK_ID |
| 161 | 161 |
} |
| 162 | 162 |
|
| ... | ... |
@@ -242,8 +242,7 @@ function configure_tempest {
|
| 242 | 242 |
# the public network (for floating ip access) is only available |
| 243 | 243 |
# if the extension is enabled. |
| 244 | 244 |
if is_networking_extension_supported 'external-net'; then |
| 245 |
- public_network_id=$(openstack network list | grep $PUBLIC_NETWORK_NAME | \ |
|
| 246 |
- awk '{print $2}')
|
|
| 245 |
+ public_network_id=$(openstack network show -f value -c id $PUBLIC_NETWORK_NAME) |
|
| 247 | 246 |
fi |
| 248 | 247 |
|
| 249 | 248 |
iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG |
| ... | ... |
@@ -54,7 +54,7 @@ fi |
| 54 | 54 |
REMAINING_ARGS="${@:2}"
|
| 55 | 55 |
|
| 56 | 56 |
# BUG: with duplicate network names, this fails pretty hard. |
| 57 |
-NET_ID=$(openstack network list | grep "$NET_NAME" | awk '{print $2}')
|
|
| 57 |
+NET_ID=$(openstack network show -f value -c id "$NET_NAME") |
|
| 58 | 58 |
PROBE_ID=$(neutron-debug probe-list -c id -c network_id | grep "$NET_ID" | awk '{print $2}' | head -n 1)
|
| 59 | 59 |
|
| 60 | 60 |
# This runs a command inside the specific netns |