Change example so CLI names match object arguments

I would like to extract the arguments automatically from the
example command line arguments.  If the names matched, it would
be much easier.

Change-Id: I0877fe8a0b6f5a61505fdecddd2f72ee8c505d29

examples/authenticate.py

@@ -48,15 +48,15 @@ class TestAuthenticator(base.BaseAuthPlugin):
 
 def make_authenticate(opts):
     return authenticator.create(
-        username=opts.os_username,
+        username=opts.username,
-        password=opts.os_password,
+        password=opts.password,
-        token=opts.os_token,
+        token=opts.token,
-        auth_url=opts.os_auth_url,
+        auth_url=opts.auth_url,
-        version=opts.os_identity_api_version,
+        version=opts.identity_api_version,
-        project_name=opts.os_project_name,
+        project_name=opts.project_name,
-        domain_name=opts.os_domain_name,
+        domain_name=opts.domain_name,
-        project_domain_name=opts.os_project_domain_name,
+        project_domain_name=opts.project_domain_name,
-        user_domain_name=opts.os_user_domain_name,
+        user_domain_name=opts.user_domain_name,
     )
 
 

examples/common.py

@@ -118,12 +118,14 @@ def option_parser():
     # Global arguments
     parser.add_argument(
         '--os-auth-url',
+        dest='auth_url',
         metavar='<auth-url>',
         default=env('OS_AUTH_URL'),
         help='Authentication URL (Env: OS_AUTH_URL)',
     )
     parser.add_argument(
         '--os-project-name',
+        dest='project_name',
         metavar='<auth-project-name>',
         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='<auth-domain-name>',
         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='<auth-project-domain-name>',
         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='<auth-user-domain-name>',
         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='<auth-username>',
         default=env('OS_USERNAME'),
         help='Authentication username (Env: OS_USERNAME)',
     )
     parser.add_argument(
         '--os-password',
+        dest='password',
         metavar='<auth-password>',
         default=env('OS_PASSWORD'),
         help='Authentication password (Env: OS_PASSWORD)',
     )
     parser.add_argument(
         '--os-region-name',
+        dest='region_name',
         metavar='<region>',
         default=env('OS_REGION_NAME'),
         help='Service region (Env: OS_REGION_NAME)')
     parser.add_argument(
         '--os-cacert',
+        dest='cacert',
         metavar='<ca-bundle-file>',
         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='<identity-api-version>',
         default=env(
             'OS_IDENTITY_API_VERSION',
@@ -194,6 +204,7 @@ def option_parser():
     )
     parser.add_argument(
         '--os-token',
+        dest='token',
         metavar='<token>',
         default=env('OS_TOKEN'),
         help='Defaults to env[OS_TOKEN]',

examples/session.py

@@ -29,19 +29,19 @@ from openstack import session
 
 def make_session(opts):
     return session.Session.create(
-        username=opts.os_username,
+        username=opts.username,
-        password=opts.os_password,
+        password=opts.password,
-        token=opts.os_token,
+        token=opts.token,
-        auth_url=opts.os_auth_url,
+        auth_url=opts.auth_url,
-        version=opts.os_identity_api_version,
+        version=opts.identity_api_version,
-        project_name=opts.os_project_name,
+        project_name=opts.project_name,
-        domain_name=opts.os_domain_name,
+        domain_name=opts.domain_name,
-        project_domain_name=opts.os_project_domain_name,
+        project_domain_name=opts.project_domain_name,
-        user_domain_name=opts.os_user_domain_name,
+        user_domain_name=opts.user_domain_name,
-        cacert=opts.os_cacert,
+        cacert=opts.cacert,
         insecure=opts.insecure,
         user_agent='SDKExample',
-        region=opts.os_region_name,
+        region=opts.region_name,
     )
 
 

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
     )