diff --git a/examples/authenticate.py b/examples/authenticate.py index 36863edc..307b1602 100644 --- a/examples/authenticate.py +++ b/examples/authenticate.py @@ -48,15 +48,15 @@ class TestAuthenticator(base.BaseAuthPlugin): def make_authenticate(opts): return authenticator.create( - username=opts.os_username, - password=opts.os_password, - token=opts.os_token, - auth_url=opts.os_auth_url, - version=opts.os_identity_api_version, - project_name=opts.os_project_name, - domain_name=opts.os_domain_name, - project_domain_name=opts.os_project_domain_name, - user_domain_name=opts.os_user_domain_name, + username=opts.username, + password=opts.password, + token=opts.token, + auth_url=opts.auth_url, + version=opts.identity_api_version, + project_name=opts.project_name, + domain_name=opts.domain_name, + project_domain_name=opts.project_domain_name, + user_domain_name=opts.user_domain_name, ) diff --git a/examples/common.py b/examples/common.py index 050ec3a5..ddfbfd93 100755 --- a/examples/common.py +++ b/examples/common.py @@ -118,12 +118,14 @@ def option_parser(): # Global arguments parser.add_argument( '--os-auth-url', + dest='auth_url', metavar='', default=env('OS_AUTH_URL'), help='Authentication URL (Env: OS_AUTH_URL)', ) parser.add_argument( '--os-project-name', + dest='project_name', metavar='', default=env('OS_PROJECT_NAME', default=env('OS_TENANT_NAME')), help='Project name of the requested project-level' @@ -131,6 +133,7 @@ def option_parser(): ) parser.add_argument( '--os-domain-name', + dest='domain_name', metavar='', default=env('OS_DOMAIN_NAME'), help='Domain name for scope of ' @@ -138,6 +141,7 @@ def option_parser(): ) parser.add_argument( '--os-project-domain-name', + dest='project_domain_name', metavar='', default=env('OS_PROJECT_DOMAIN_NAME'), help='Project domain name for scope of ' @@ -145,6 +149,7 @@ def option_parser(): ) parser.add_argument( '--os-user-domain-name', + dest='user_domain_name', metavar='', default=env('OS_USER_DOMAIN_NAME'), help='User domain name for scope of ' @@ -152,23 +157,27 @@ def option_parser(): ) parser.add_argument( '--os-username', + dest='username', metavar='', default=env('OS_USERNAME'), help='Authentication username (Env: OS_USERNAME)', ) parser.add_argument( '--os-password', + dest='password', metavar='', default=env('OS_PASSWORD'), help='Authentication password (Env: OS_PASSWORD)', ) parser.add_argument( '--os-region-name', + dest='region_name', metavar='', default=env('OS_REGION_NAME'), help='Service region (Env: OS_REGION_NAME)') parser.add_argument( '--os-cacert', + dest='cacert', metavar='', default=env('OS_CACERT'), help='CA certificate bundle file (Env: OS_CACERT)', @@ -186,6 +195,7 @@ def option_parser(): ) parser.add_argument( '--os-identity-api-version', + dest='identity_api_version', metavar='', default=env( 'OS_IDENTITY_API_VERSION', @@ -194,6 +204,7 @@ def option_parser(): ) parser.add_argument( '--os-token', + dest='token', metavar='', default=env('OS_TOKEN'), help='Defaults to env[OS_TOKEN]', diff --git a/examples/session.py b/examples/session.py index 21d78c2f..13639c1e 100644 --- a/examples/session.py +++ b/examples/session.py @@ -29,19 +29,19 @@ from openstack import session def make_session(opts): return session.Session.create( - username=opts.os_username, - password=opts.os_password, - token=opts.os_token, - auth_url=opts.os_auth_url, - version=opts.os_identity_api_version, - project_name=opts.os_project_name, - domain_name=opts.os_domain_name, - project_domain_name=opts.os_project_domain_name, - user_domain_name=opts.os_user_domain_name, - cacert=opts.os_cacert, + username=opts.username, + password=opts.password, + token=opts.token, + auth_url=opts.auth_url, + version=opts.identity_api_version, + project_name=opts.project_name, + domain_name=opts.domain_name, + project_domain_name=opts.project_domain_name, + user_domain_name=opts.user_domain_name, + cacert=opts.cacert, insecure=opts.insecure, user_agent='SDKExample', - region=opts.os_region_name, + region=opts.region_name, ) diff --git a/examples/transport.py b/examples/transport.py index d7ac3f83..8317f82e 100755 --- a/examples/transport.py +++ b/examples/transport.py @@ -31,7 +31,7 @@ USER_AGENT = 'SDKExample' def make_transport(opts): return transport.Transport.create( - cacert=opts.os_cacert, + cacert=opts.cacert, insecure=opts.insecure, user_agent=USER_AGENT )