diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-10-29 05:04:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-10-29 05:04:59 +0000 |
commit | bba1d6ece49f235197216e031bb156901c11e744 (patch) | |
tree | 16478f1997688b4cbe5b28331ac23e2d0fd7329d | |
parent | 63c7a576e194f48f0edb5a0b2d9c4f1d37516e74 (diff) | |
parent | 036d42d7087a3c83a5feec0ad0a4c6af35df72c9 (diff) | |
download | python-novaclient-2.34.0.tar.gz |
Merge "Revert "Remove novaclient.v1_1 module""2.34.0
-rw-r--r-- | novaclient/tests/unit/v2/test_shell.py | 11 | ||||
-rw-r--r-- | novaclient/v1_1/__init__.py | 43 |
2 files changed, 54 insertions, 0 deletions
diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index 1033ffb4..e74fbdcc 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -2541,6 +2541,17 @@ class ShellTest(utils.TestCase): self.assertEqual(set([]), unaccounted_for, failure_msg) +class ShellTestV11(ShellTest): + FAKE_ENV = { + 'NOVA_USERNAME': 'username', + 'NOVA_PASSWORD': 'password', + 'NOVA_PROJECT_ID': 'project_id', + 'OS_COMPUTE_API_VERSION': '1.1', + 'NOVA_URL': 'http://no.where', + 'OS_AUTH_URL': 'http://no.where/v2.0', + } + + class ShellWithSessionClientTest(ShellTest): def setUp(self): diff --git a/novaclient/v1_1/__init__.py b/novaclient/v1_1/__init__.py new file mode 100644 index 00000000..9da76817 --- /dev/null +++ b/novaclient/v1_1/__init__.py @@ -0,0 +1,43 @@ +# +# All Rights Reserved. +# +# 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. + +# NOTE(akurilin): This module is left for backward compatibility. Feel free to +# remove it, when openstack project will use correct way to +# obtain novaclient object. +# Known problems: +# * python-openstackclient - +# https://bugs.launchpad.net/python-openstackclient/+bug/1418024 +# * neutron - https://bugs.launchpad.net/neutron/+bug/1418017 + + +import sys +import warnings + +from novaclient import v2 + +warnings.warn("Module novaclient.v1_1 is deprecated (taken as a basis for " + "novaclient.v2). " + "The preferable way to get client class or object you can find " + "in novaclient.client module.") + + +class MovedModule(object): + def __init__(self, new_module): + self.new_module = new_module + + def __getattr__(self, attr): + return getattr(self.new_module, attr) + +sys.modules["novaclient.v1_1"] = MovedModule(v2) |