x/monasca-vagrant
Code Issues Proposed changes

Renamed tenant to project for the keystone v2->v3 switch

Browse Source 
Change-Id: I3d5a33f5db5000279a918ab0e0bb0bc837827411
This commit is contained in:
Tim Kuhlman 2014-11-05 12:29:49 -07:00
parent 14a96911b4
commit 433f377c94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/smoke.py
View File

@ -22,7 +22,7 @@
OS_USERNAME OS_USERNAME
OS_PASSWORD OS_PASSWORD
OS_TENANT_NAME OS_PROJECT_NAME
OS_AUTH_URL OS_AUTH_URL
MONASCA_API_URL MONASCA_API_URL

10
tests/utils.py
View File

@ -15,7 +15,7 @@ from monagent.common.keystone import Keystone
OS_USERNAME = 'mini-mon' OS_USERNAME = 'mini-mon'
OS_PASSWORD = 'password' OS_PASSWORD = 'password'
OS_TENANT_NAME = 'mini-mon' OS_PROJECT_NAME = 'mini-mon'
OS_AUTH_URL = 'http://192.168.10.5:35357/v3/' OS_AUTH_URL = 'http://192.168.10.5:35357/v3/'
@ -94,7 +94,7 @@ def setup_cli():
# These need to be set because we are invoking the CLI as a process # These need to be set because we are invoking the CLI as a process
set_if_not_env('OS_USERNAME', OS_USERNAME) set_if_not_env('OS_USERNAME', OS_USERNAME)
set_if_not_env('OS_PASSWORD', OS_PASSWORD) set_if_not_env('OS_PASSWORD', OS_PASSWORD)
set_if_not_env('OS_TENANT_NAME', OS_TENANT_NAME) set_if_not_env('OS_PROJECT_NAME', OS_PROJECT_NAME)
set_if_not_env('OS_AUTH_URL', OS_AUTH_URL) set_if_not_env('OS_AUTH_URL', OS_AUTH_URL)
set_if_not_env('MONASCA_API_URL', 'http://' + api_host + ':8080/v2.0/') set_if_not_env('MONASCA_API_URL', 'http://' + api_host + ':8080/v2.0/')
os.environ['http_proxy'] = '' os.environ['http_proxy'] = ''
@ -106,7 +106,7 @@ def setup_cli():
def create_mon_client(): def create_mon_client():
api_host = get_api_host() api_host = get_api_host()
token = get_token(OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, token = get_token(OS_USERNAME, OS_PASSWORD, OS_PROJECT_NAME,
OS_AUTH_URL) OS_AUTH_URL)
api_version = '2_0' api_version = '2_0'
@ -115,11 +115,11 @@ def create_mon_client():
return client.Client(api_version, endpoint, **kwargs) return client.Client(api_version, endpoint, **kwargs)
def get_token(os_username, os_password, os_tenant_name, os_auth_url): def get_token(os_username, os_password, os_project_name, os_auth_url):
keystone = Keystone(os_auth_url, keystone = Keystone(os_auth_url,
os_username, os_username,
os_password, os_password,
os_tenant_name) os_project_name)
return keystone.refresh_token() return keystone.refresh_token()