Add swift user and project in non-default domain
Swift has functional tests that check access controls
between users and projects in differing domains. Those tests
are currently skipped by default since swift tests are
configured to use keystone v2 API. In order for those
tests to pass when using keystone v3 API, a user and
project must be setup in a non-default domain.
This patch creates a domain, and a user and project in
that domain, in support of swift functional tests moving
to using keystone v3 API.
Changes:
lib/swift
- create a new domain, project and user for
swift testing
- add new project and user credentials to swift
test config file
- set correct identity service url in swift test
config file according to kesytone API version
functions-common
- add function get_or_create_domain
- modify get_or_create_user and get_or_create_project
functions to optionally specify a domain
Change-Id: I557de01bf196075f2f3adcdf4dd1b43756d8a0ae
diff --git a/functions-common b/functions-common
index 333f31d..4b41bed 100644
--- a/functions-common
+++ b/functions-common
@@ -790,38 +790,70 @@
mv ${tmpfile} ${policy_file}
}
+# Gets or creates a domain
+# Usage: get_or_create_domain <name> <description>
+function get_or_create_domain {
+ local os_url="$KEYSTONE_SERVICE_URI/v3"
+ # Gets domain id
+ local domain_id=$(
+ # Gets domain id
+ openstack --os-token=$OS_TOKEN --os-url=$os_url \
+ --os-identity-api-version=3 domain show $1 \
+ -f value -c id 2>/dev/null ||
+ # Creates new domain
+ openstack --os-token=$OS_TOKEN --os-url=$os_url \
+ --os-identity-api-version=3 domain create $1 \
+ --description "$2" \
+ -f value -c id
+ )
+ echo $domain_id
+}
+
# Gets or creates user
-# Usage: get_or_create_user <username> <password> <project> [<email>]
+# Usage: get_or_create_user <username> <password> <project> [<email> [<domain>]]
function get_or_create_user {
if [[ ! -z "$4" ]]; then
local email="--email=$4"
else
local email=""
fi
+ local os_cmd="openstack"
+ local domain=""
+ if [[ ! -z "$5" ]]; then
+ domain="--domain=$5"
+ os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI/v3 --os-identity-api-version=3"
+ fi
# Gets user id
local user_id=$(
# Gets user id
- openstack user show $1 -f value -c id 2>/dev/null ||
+ $os_cmd user show $1 $domain -f value -c id 2>/dev/null ||
# Creates new user
- openstack user create \
+ $os_cmd user create \
$1 \
--password "$2" \
--project $3 \
$email \
+ $domain \
-f value -c id
)
echo $user_id
}
# Gets or creates project
-# Usage: get_or_create_project <name>
+# Usage: get_or_create_project <name> [<domain>]
function get_or_create_project {
# Gets project id
+ local os_cmd="openstack"
+ local domain=""
+ if [[ ! -z "$2" ]]; then
+ domain="--domain=$2"
+ os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI/v3 --os-identity-api-version=3"
+ fi
local project_id=$(
# Gets project id
- openstack project show $1 -f value -c id 2>/dev/null ||
+ $os_cmd project show $1 $domain -f value -c id 2>/dev/null ||
# Creates new project if not exists
- openstack project create $1 -f value -c id
+ $os_cmd project create $1 $domain -f value -c id
)
echo $project_id
}