From 223f7b86989f873c08e2ce0a1db2c6453e10e8b6 Mon Sep 17 00:00:00 2001
From: yanyanhu <yanyanhu@cn.ibm.com>
Date: Fri, 22 May 2015 02:06:40 -0400
Subject: [PATCH] Replace sdk user_reference module with profile

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
---
 senlinclient/cliargs.py    | 17 ++++++++---------
 senlinclient/common/sdk.py | 30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/senlinclient/cliargs.py b/senlinclient/cliargs.py
index 05c098c0..02e7d6d9 100644
--- a/senlinclient/cliargs.py
+++ b/senlinclient/cliargs.py
@@ -143,30 +143,29 @@ def add_global_identity_args(parser):
     parser.add_argument(
         '--os-api-name', dest='user_preferences',
         metavar='<service>=<name>',
-        action=sdk.UserPreferenceAction,
-        default=sdk.UserPreferenceAction.env('OS_API_NAME'),
+        action=sdk.ProfileAction,
+        default=sdk.ProfileAction.env('OS_API_NAME'),
         help=_('Desired API names, defaults to env[OS_API_NAME]'))
 
     parser.add_argument(
         '--os-api-region', dest='user_preferences',
         metavar='<service>=<region>',
-        action=sdk.UserPreferenceAction,
-        default=sdk.UserPreferenceAction.env('OS_API_REGION',
-                                             'OS_REGION_NAME'),
+        action=sdk.ProfileAction,
+        default=sdk.ProfileAction.env('OS_API_REGION', 'OS_REGION_NAME'),
         help=_('Desired API region, defaults to env[OS_API_REGION]'))
 
     parser.add_argument(
         '--os-api-version', dest='user_preferences',
         metavar='<service>=<version>',
-        action=sdk.UserPreferenceAction,
-        default=sdk.UserPreferenceAction.env('OS_API_VERSION'),
+        action=sdk.ProfileAction,
+        default=sdk.ProfileAction.env('OS_API_VERSION'),
         help=_('Desired API versions, defaults to env[OS_API_VERSION]'))
 
     parser.add_argument(
         '--os-api-visibility', dest='user_preferences',
         metavar='<service>=<visibility>',
-        action=sdk.UserPreferenceAction,
-        default=sdk.UserPreferenceAction.env('OS_API_VISIBILITY'),
+        action=sdk.ProfileAction,
+        default=sdk.ProfileAction.env('OS_API_VISIBILITY'),
         help=_('Desired API visibility, defaults to env[OS_API_VISIBILITY]'))
 
 
diff --git a/senlinclient/common/sdk.py b/senlinclient/common/sdk.py
index ba6edc86..c7461c82 100644
--- a/senlinclient/common/sdk.py
+++ b/senlinclient/common/sdk.py
@@ -13,8 +13,8 @@
 import argparse
 from openstack import connection
 from openstack import exceptions
+from openstack import profile
 from openstack import resource as base
-from openstack import user_preference
 from openstack import utils
 import os
 
@@ -26,12 +26,12 @@ from senlinclient.common import exc
 prop = base.prop
 
 
-class UserPreferenceAction(argparse.Action):
-    '''A custom action to parse user preferences as key=value pairs
+class ProfileAction(argparse.Action):
+    '''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
     def env(cls, *vars):
@@ -40,8 +40,8 @@ class UserPreferenceAction(argparse.Action):
             if values is None:
                 continue
             cls.set_option(v, values)
-            return cls.pref
-        return cls.pref
+            return cls.prof
+        return cls.prof
 
     @classmethod
     def set_option(cls, var, values):
@@ -55,26 +55,26 @@ class UserPreferenceAction(argparse.Action):
                 if '=' in kvp:
                     service, value = kvp.split('=')
                 else:
-                    service = cls.pref.ALL
+                    service = cls.prof.ALL
                     value = kvp
             else:
                 if '=' in kvp:
                     service, value = kvp.split('=')
                 else:
-                    service = cls.pref.ALL
+                    service = cls.prof.ALL
                     value = kvp
             if var == 'name':
-                cls.pref.set_name(service, value)
+                cls.prof.set_name(service, value)
             elif var == 'region':
-                cls.pref.set_region(service, value)
+                cls.prof.set_region(service, value)
             elif var == 'version':
-                cls.pref.set_version(service, value)
+                cls.prof.set_version(service, value)
             elif var == 'visibility':
-                cls.pref.set_visibility(service, value)
+                cls.prof.set_visibility(service, value)
 
     def __call__(self, parser, namespace, values, option_string=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)
 
 
@@ -151,7 +151,7 @@ class Resource(base.Resource):
 
 def create_connection(preferences, user_agent, **kwargs):
         try:
-            conn = connection.Connection(preference=preferences,
+            conn = connection.Connection(profile=preferences,
                                          user_agent=user_agent,
                                          **kwargs)
         except exceptions.HttpException as ex: