Merge "Remove code migrated to osc-lib long ago"

Author: Zuul

openstackclient/api/utils.py

@@ -91,13 +91,6 @@ def setup_auth(self):
 
         return super(ClientManager, self).setup_auth()
 
-    @property
-    def auth_ref(self):
-        if not self._auth_required:
-            return None
-        else:
-            return super(ClientManager, self).auth_ref
-
     def _fallback_load_auth_plugin(self, e):
         # NOTES(RuiChen): Hack to avoid auth plugins choking on data they don't
         #                 expect, delete fake token and endpoint, then try to

openstackclient/common/clientmanager.py

@@ -22,12 +22,12 @@
 import sys
 
 from glanceclient.common import utils as gc_utils
+from osc_lib.api import utils as api_utils
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.api import utils as api_utils
 from openstackclient.i18n import _
 
 if os.name == "nt":

openstackclient/common/commandmanager.py

@@ -21,13 +21,13 @@
 
 from glanceclient.common import utils as gc_utils
 from openstack.image import image_signer
+from osc_lib.api import utils as api_utils
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.api import utils as api_utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 

openstackclient/image/v1/image.py

@@ -20,13 +20,13 @@
 import sys
 
 from osc_lib.api import auth
+from osc_lib.command import commandmanager
 from osc_lib import shell
 import six
 
 import openstackclient
 from openstackclient.common import client_config as cloud_config
 from openstackclient.common import clientmanager
-from openstackclient.common import commandmanager
 
 
 DEFAULT_DOMAIN = 'default'