openstack/devstack
Code Issues Proposed changes

Merge "Run neutron-debug with admin tenant in neutron-adv-test"

Browse Source
This commit is contained in:
Jenkins 2014-01-15 21:25:20 +00:00 committed by Gerrit Code Review
commit c560cd121a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,14 @@ function confirm_server_active {
fi fi
} }
function neutron_debug_admin {
local os_username=$OS_USERNAME
local os_tenant_id=$OS_TENANT_ID
source $TOP_DIR/openrc admin admin
neutron-debug $@
source $TOP_DIR/openrc $os_username $os_tenant_id
}
function add_tenant { function add_tenant {
local TENANT=$1 local TENANT=$1
local USER=$2 local USER=$2
@ -241,7 +249,7 @@ function create_network {
local NET_ID=$(neutron net-create --tenant-id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' ) local NET_ID=$(neutron net-create --tenant-id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )
die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $TENANT_ID $NET_NAME $EXTRA" die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $TENANT_ID $NET_NAME $EXTRA"
neutron subnet-create --ip-version 4 --tenant-id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR neutron subnet-create --ip-version 4 --tenant-id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR
neutron-debug probe-create --device-owner compute $NET_ID neutron_debug_admin probe-create --device-owner compute $NET_ID
source $TOP_DIR/openrc demo demo source $TOP_DIR/openrc demo demo
} }