openstack/python-senlinclient
Code Issues Proposed changes

Replace sdk user_reference module with profile

Browse Source 
user_reference module has been replaced by profile module in latest
release of python-openstacksdk. This patch makes some modifications
in client to follow this change.

Change-Id: Ia10f77fafe0401afe6c36a767db81d5445e81f4e
This commit is contained in:
yanyanhu 2015-05-22 02:06:40 -04:00
parent 3a2321e941
commit 223f7b8698
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
senlinclient/cliargs.py
View File

@ -143,30 +143,29 @@ def add_global_identity_args(parser):
parser.add_argument( parser.add_argument(
'--os-api-name', dest='user_preferences', '--os-api-name', dest='user_preferences',
metavar='<service>=<name>', metavar='<service>=<name>',
action=sdk.UserPreferenceAction, action=sdk.ProfileAction,
default=sdk.UserPreferenceAction.env('OS_API_NAME'), default=sdk.ProfileAction.env('OS_API_NAME'),
help=_('Desired API names, defaults to env[OS_API_NAME]')) help=_('Desired API names, defaults to env[OS_API_NAME]'))
parser.add_argument( parser.add_argument(
'--os-api-region', dest='user_preferences', '--os-api-region', dest='user_preferences',
metavar='<service>=<region>', metavar='<service>=<region>',
action=sdk.UserPreferenceAction, action=sdk.ProfileAction,
default=sdk.UserPreferenceAction.env('OS_API_REGION', default=sdk.ProfileAction.env('OS_API_REGION', 'OS_REGION_NAME'),
'OS_REGION_NAME'),
help=_('Desired API region, defaults to env[OS_API_REGION]')) help=_('Desired API region, defaults to env[OS_API_REGION]'))
parser.add_argument( parser.add_argument(
'--os-api-version', dest='user_preferences', '--os-api-version', dest='user_preferences',
metavar='<service>=<version>', metavar='<service>=<version>',
action=sdk.UserPreferenceAction, action=sdk.ProfileAction,
default=sdk.UserPreferenceAction.env('OS_API_VERSION'), default=sdk.ProfileAction.env('OS_API_VERSION'),
help=_('Desired API versions, defaults to env[OS_API_VERSION]')) help=_('Desired API versions, defaults to env[OS_API_VERSION]'))
parser.add_argument( parser.add_argument(
'--os-api-visibility', dest='user_preferences', '--os-api-visibility', dest='user_preferences',
metavar='<service>=<visibility>', metavar='<service>=<visibility>',
action=sdk.UserPreferenceAction, action=sdk.ProfileAction,
default=sdk.UserPreferenceAction.env('OS_API_VISIBILITY'), default=sdk.ProfileAction.env('OS_API_VISIBILITY'),
help=_('Desired API visibility, defaults to env[OS_API_VISIBILITY]')) help=_('Desired API visibility, defaults to env[OS_API_VISIBILITY]'))

30
senlinclient/common/sdk.py
View File

@ -13,8 +13,8 @@
import argparse import argparse
from openstack import connection from openstack import connection
from openstack import exceptions from openstack import exceptions
from openstack import profile
from openstack import resource as base from openstack import resource as base
from openstack import user_preference
from openstack import utils from openstack import utils
import os import os
@ -26,12 +26,12 @@ from senlinclient.common import exc
prop = base.prop prop = base.prop
class UserPreferenceAction(argparse.Action): class ProfileAction(argparse.Action):
'''A custom action to parse user preferences as key=value pairs '''A custom action to parse profiles as key=value pairs
Stores results in users preferences object. Stores results in profiles object.
''' '''
pref = user_preference.UserPreference() prof = profile.Profile()
@classmethod @classmethod
def env(cls, *vars): def env(cls, *vars):
@ -40,8 +40,8 @@ class UserPreferenceAction(argparse.Action):
if values is None: if values is None:
continue continue
cls.set_option(v, values) cls.set_option(v, values)
return cls.pref return cls.prof
return cls.pref return cls.prof
@classmethod @classmethod
def set_option(cls, var, values): def set_option(cls, var, values):
@ -55,26 +55,26 @@ class UserPreferenceAction(argparse.Action):
if '=' in kvp: if '=' in kvp:
service, value = kvp.split('=') service, value = kvp.split('=')
else: else:
service = cls.pref.ALL service = cls.prof.ALL
value = kvp value = kvp
else: else:
if '=' in kvp: if '=' in kvp:
service, value = kvp.split('=') service, value = kvp.split('=')
else: else:
service = cls.pref.ALL service = cls.prof.ALL
value = kvp value = kvp
if var == 'name': if var == 'name':
cls.pref.set_name(service, value) cls.prof.set_name(service, value)
elif var == 'region': elif var == 'region':
cls.pref.set_region(service, value) cls.prof.set_region(service, value)
elif var == 'version': elif var == 'version':
cls.pref.set_version(service, value) cls.prof.set_version(service, value)
elif var == 'visibility': elif var == 'visibility':
cls.pref.set_visibility(service, value) cls.prof.set_visibility(service, value)
def __call__(self, parser, namespace, values, option_string=None): def __call__(self, parser, namespace, values, option_string=None):
if getattr(namespace, self.dest, None) is None: if getattr(namespace, self.dest, None) is None:
setattr(namespace, self.dest, UserPreferenceAction.pref) setattr(namespace, self.dest, ProfileAction.prof)
self.set_option(option_string, values) self.set_option(option_string, values)
@ -151,7 +151,7 @@ class Resource(base.Resource):
def create_connection(preferences, user_agent, **kwargs): def create_connection(preferences, user_agent, **kwargs):
try: try:
conn = connection.Connection(preference=preferences, conn = connection.Connection(profile=preferences,
user_agent=user_agent, user_agent=user_agent,
**kwargs) **kwargs)
except exceptions.HttpException as ex: except exceptions.HttpException as ex: