diff options
| -rw-r--r-- | test-requirements.txt | 16 | ||||
| -rw-r--r-- | tests/clients.py | 69 | ||||
| -rw-r--r-- | tests/test_keystone.py | 27 |
3 files changed, 0 insertions, 112 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index fc20695c0..e1185df8b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,24 +1,8 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. bandit!=1.6.0,>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 -beautifulsoup4>=4.6.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT -extras>=1.0.0 # MIT -graphviz!=0.5.0,>=0.4 # MIT License hacking>=3.0.1,<3.1.0 # Apache-2.0 -oslo.log>=3.36.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -PrettyTable<0.8,>=0.7.1 # BSD -PyYAML>=3.10 # MIT -python-barbicanclient>=4.0.0 # Apache-2.0 -python-heatclient>=1.10.0 # Apache-2.0 -python-neutronclient>=6.3.0 # Apache-2.0 -python-openstackclient>=3.12.0 # Apache-2.0 -python-swiftclient>=3.2.0 # Apache-2.0 -pytz>=2013.6 # MIT stestr>=2.2.0 # Apache-2.0 -testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT diff --git a/tests/clients.py b/tests/clients.py deleted file mode 100644 index cbeb41890..000000000 --- a/tests/clients.py +++ /dev/null @@ -1,69 +0,0 @@ -# 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. - - -from keystoneclient.v2_0 import client as ksclient -import logging - -logging.basicConfig(level=logging.WARNING) -LOG = logging.getLogger(__name__) - - -class OpenStackClients(object): - - def __init__(self): - self._connected_clients = {} - self._supported_clients = self.__class__.__subclasses__() - self.client = None - - def get_client(self, name): - if name in self._connected_clients: - return self._connected_clients[name] - try: - aclass = next(s for s in self._supported_clients if name in - s.__name__) - sclient = aclass() - connected_client = sclient.create() - self._connected_clients[name] = connected_client - return connected_client - - except StopIteration: - LOG.warning("Requested client %s not found", name) - raise - - def create(self): - pass - - -class KeystoneClient(OpenStackClients): - - def __init__(self): - super(KeystoneClient, self).__init__() - # TODO(Jeff Peeler): this shouldn't be hard coded - self.creds = {'auth_url': 'http://10.0.0.4:5000/v2.0', - 'username': 'admin', - 'password': 'steakfordinner', - 'tenant_name': 'admin'} - - def create(self): - if self.client is None: - self.client = ksclient.Client(**self.creds) - return self.client - - -if __name__ == '__main__': - # TODO(Jeff Peeler): mock this - client_mgr = OpenStackClients() - ks = client_mgr.get_client('KeystoneClient') - LOG.info(ks) - ks2 = client_mgr.get_client('KeystoneClient') - LOG.info(ks2) diff --git a/tests/test_keystone.py b/tests/test_keystone.py deleted file mode 100644 index dbbba88ad..000000000 --- a/tests/test_keystone.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -from tests import clients -import testtools - - -# TODO(jeffrey4l): remove this skip when this test can passed. -@testtools.skip -class KeystoneTest(testtools.TestCase): - def setUp(self): - super(KeystoneTest, self).setUp() - self.kc = clients.OpenStackClients().get_client('KeystoneClient') - - def test_tenants(self): - result = self.kc.tenants.list() - # only admin tenant - self.assertEqual(1, len(result)) |