openstack/devstack
Code Issues Proposed changes

Update neutron-adv-test to use openstackclient commands

Browse Source 
There were a few references of keystoneclient in
exercises/neutron-adv-test.sh, this patch will change those
commands to their openstackclient equivalents.

Change-Id: I88892fcfacd3dd6354ec269b270cee3da358447a
This commit is contained in:
Steve Martinelli 2014-03-14 00:33:58 -05:00
parent b65dc0afee
commit 2a09d0c6a8
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,15 +100,6 @@ PUBLIC_ROUTER1_NET="admin-net1"
DEMO1_ROUTER1_NET="demo1-net1" DEMO1_ROUTER1_NET="demo1-net1"
DEMO2_ROUTER1_NET="demo2-net1" DEMO2_ROUTER1_NET="demo2-net1"
KEYSTONE="keystone"
# Manually create a token by querying keystone (sending JSON data). Keystone
# returns a token and catalog of endpoints. We use python to parse the token
# and save it.
TOKEN=`keystone token-get | grep ' id ' | awk '{print $4}'`
die_if_not_set $LINENO TOKEN "Keystone fail to get token"
# Various functions # Various functions
# ----------------- # -----------------
@ -150,21 +141,21 @@ function get_image_id {
function get_tenant_id { function get_tenant_id {
local TENANT_NAME=$1 local TENANT_NAME=$1
local TENANT_ID=`keystone tenant-list | grep " $TENANT_NAME " | head -n 1 | get_field 1` local TENANT_ID=`openstack project list | grep " $TENANT_NAME " | head -n 1 | get_field 1`
die_if_not_set $LINENO TENANT_ID "Failure retrieving TENANT_ID for $TENANT_NAME" die_if_not_set $LINENO TENANT_ID "Failure retrieving TENANT_ID for $TENANT_NAME"
echo "$TENANT_ID" echo "$TENANT_ID"
} }
function get_user_id { function get_user_id {
local USER_NAME=$1 local USER_NAME=$1
local USER_ID=`keystone user-list | grep $USER_NAME | awk '{print $2}'` local USER_ID=`openstack user list | grep $USER_NAME | awk '{print $2}'`
die_if_not_set $LINENO USER_ID "Failure retrieving USER_ID for $USER_NAME" die_if_not_set $LINENO USER_ID "Failure retrieving USER_ID for $USER_NAME"
echo "$USER_ID" echo "$USER_ID"
} }
function get_role_id { function get_role_id {
local ROLE_NAME=$1 local ROLE_NAME=$1
local ROLE_ID=`keystone role-list | grep $ROLE_NAME | awk '{print $2}'` local ROLE_ID=`openstack role list | grep $ROLE_NAME | awk '{print $2}'`
die_if_not_set $LINENO ROLE_ID "Failure retrieving ROLE_ID for $ROLE_NAME" die_if_not_set $LINENO ROLE_ID "Failure retrieving ROLE_ID for $ROLE_NAME"
echo "$ROLE_ID" echo "$ROLE_ID"
} }
@ -199,28 +190,21 @@ function neutron_debug_admin {
} }
function add_tenant { function add_tenant {
local TENANT=$1 openstack project create $1
local USER=$2 openstack user create $2 --password ${ADMIN_PASSWORD} --project $1
openstack role add Member --project $1 --user $2
$KEYSTONE tenant-create --name=$TENANT
$KEYSTONE user-create --name=$USER --pass=${ADMIN_PASSWORD}
local USER_ID=$(get_user_id $USER)
local TENANT_ID=$(get_tenant_id $TENANT)
$KEYSTONE user-role-add --user-id $USER_ID --role-id $(get_role_id Member) --tenant-id $TENANT_ID
} }
function remove_tenant { function remove_tenant {
local TENANT=$1 local TENANT=$1
local TENANT_ID=$(get_tenant_id $TENANT) local TENANT_ID=$(get_tenant_id $TENANT)
$KEYSTONE tenant-delete $TENANT_ID openstack project delete $TENANT_ID
} }
function remove_user { function remove_user {
local USER=$1 local USER=$1
local USER_ID=$(get_user_id $USER) local USER_ID=$(get_user_id $USER)
$KEYSTONE user-delete $USER_ID openstack user delete $USER_ID
} }
function create_tenants { function create_tenants {