summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2019-05-16 08:24:58 -0500
committerDean Troyer <dtroyer@gmail.com>2019-05-16 19:19:58 -0500
commit1b2595a9594e1a6965e6086aad7782cf3e39bafa (patch)
tree7e4acf99a10ff715891eac2d8740e8bc6e6a2411 /openstackclient/common
parent4b91cd49658bd5a9224976ebd3a6f352d1eef5b0 (diff)
downloadpython-openstackclient-1b2595a9594e1a6965e6086aad7782cf3e39bafa.tar.gz
Remove code migrated to osc-lib long ago
* Remove openstackclient.api.utils and use osc_lib.api.utils * Remove openstackclient.common.clientmanager.ClientManager.auth_ref * Remove openstackclient.common.commandmanager Change-Id: I67e1dbc53cc0b37967c0011bcb2fc09bdef62d94 Signed-off-by: Dean Troyer <dtroyer@gmail.com>
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py7
-rw-r--r--openstackclient/common/commandmanager.py59
2 files changed, 0 insertions, 66 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index aa1045e4..c1118ad3 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -91,13 +91,6 @@ class ClientManager(clientmanager.ClientManager):
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
diff --git a/openstackclient/common/commandmanager.py b/openstackclient/common/commandmanager.py
deleted file mode 100644
index c190e33e..00000000
--- a/openstackclient/common/commandmanager.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2012-2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-"""Modify cliff.CommandManager"""
-
-import pkg_resources
-
-import cliff.commandmanager
-
-
-class CommandManager(cliff.commandmanager.CommandManager):
- """Add additional functionality to cliff.CommandManager
-
- Load additional command groups after initialization
- Add _command_group() methods
- """
-
- def __init__(self, namespace, convert_underscores=True):
- self.group_list = []
- super(CommandManager, self).__init__(namespace, convert_underscores)
-
- def load_commands(self, namespace):
- self.group_list.append(namespace)
- return super(CommandManager, self).load_commands(namespace)
-
- def add_command_group(self, group=None):
- """Adds another group of command entrypoints"""
- if group:
- self.load_commands(group)
-
- def get_command_groups(self):
- """Returns a list of the loaded command groups"""
- return self.group_list
-
- def get_command_names(self, group=None):
- """Returns a list of commands loaded for the specified group"""
- group_list = []
- if group is not None:
- for ep in pkg_resources.iter_entry_points(group):
- cmd_name = (
- ep.name.replace('_', ' ')
- if self.convert_underscores
- else ep.name
- )
- group_list.append(cmd_name)
- return group_list
- return list(self.commands.keys())