diff options
| author | Radomir Dopieralski <openstack@sheep.art.pl> | 2015-03-23 09:24:39 +0100 |
|---|---|---|
| committer | Radomir Dopieralski <openstack@sheep.art.pl> | 2015-03-23 09:24:39 +0100 |
| commit | 17fc81842631381cc1c18a3477ed742c9766a94d (patch) | |
| tree | 68322ef05c21bd01613621beceb5f6d8447e1fda /tuskar_ui | |
| parent | 47ebc2a98d9cb487bd118e3641615b9e605cca57 (diff) | |
| download | tuskar-ui-17fc81842631381cc1c18a3477ed742c9766a94d.tar.gz | |
Use novaclient v2 instead of v1_1
Note that Horizon still uses version v1_1, so we are still getting the
warnings.
Change-Id: I32fe0f47c332ffb78f8774a245f0430a96cc7cf7
Diffstat (limited to 'tuskar_ui')
| -rw-r--r-- | tuskar_ui/api/flavor.py | 2 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/flavors/tests.py | 2 | ||||
| -rw-r--r-- | tuskar_ui/test/api_tests/heat_tests.py | 2 | ||||
| -rw-r--r-- | tuskar_ui/test/api_tests/node_tests.py | 2 | ||||
| -rw-r--r-- | tuskar_ui/test/test_data/flavor_data.py | 2 | ||||
| -rw-r--r-- | tuskar_ui/test/test_data/heat_data.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tuskar_ui/api/flavor.py b/tuskar_ui/api/flavor.py index 91e8cf48..fc25e7e0 100644 --- a/tuskar_ui/api/flavor.py +++ b/tuskar_ui/api/flavor.py @@ -30,7 +30,7 @@ class Flavor(object): """Construct by wrapping Nova flavor :param flavor: Nova flavor - :type flavor: novaclient.v1_1.flavors.Flavor + :type flavor: novaclient.v2.flavors.Flavor """ self._flavor = flavor diff --git a/tuskar_ui/infrastructure/flavors/tests.py b/tuskar_ui/infrastructure/flavors/tests.py index 02072697..4b7d5d12 100644 --- a/tuskar_ui/infrastructure/flavors/tests.py +++ b/tuskar_ui/infrastructure/flavors/tests.py @@ -17,7 +17,7 @@ import contextlib from django.core import urlresolvers from mock import patch, call # noqa from novaclient import exceptions as nova_exceptions -from novaclient.v1_1 import servers +from novaclient.v2 import servers from openstack_dashboard.test.test_data import utils from tuskar_ui import api diff --git a/tuskar_ui/test/api_tests/heat_tests.py b/tuskar_ui/test/api_tests/heat_tests.py index b8554b26..235ba8f1 100644 --- a/tuskar_ui/test/api_tests/heat_tests.py +++ b/tuskar_ui/test/api_tests/heat_tests.py @@ -92,7 +92,7 @@ class HeatAPITests(test.APITestCase): return_value=resources): with patch('openstack_dashboard.api.nova.server_list', return_value=(instances, None)): - with patch('novaclient.v1_1.contrib.baremetal.' + with patch('novaclient.v2.contrib.baremetal.' 'BareMetalNodeManager.list', return_value=nodes): ret_val = stack.resources() diff --git a/tuskar_ui/test/api_tests/node_tests.py b/tuskar_ui/test/api_tests/node_tests.py index 48fcef22..ea92b6a7 100644 --- a/tuskar_ui/test/api_tests/node_tests.py +++ b/tuskar_ui/test/api_tests/node_tests.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import mock -from novaclient.v1_1 import servers +from novaclient.v2 import servers from tuskar_ui import api import tuskar_ui.api.node diff --git a/tuskar_ui/test/test_data/flavor_data.py b/tuskar_ui/test/test_data/flavor_data.py index 506450db..290a11e6 100644 --- a/tuskar_ui/test/test_data/flavor_data.py +++ b/tuskar_ui/test/test_data/flavor_data.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from novaclient.v1_1 import flavors +from novaclient.v2 import flavors from openstack_dashboard.test.test_data import utils as test_data_utils diff --git a/tuskar_ui/test/test_data/heat_data.py b/tuskar_ui/test/test_data/heat_data.py index 6af939b0..d99908fc 100644 --- a/tuskar_ui/test/test_data/heat_data.py +++ b/tuskar_ui/test/test_data/heat_data.py @@ -14,7 +14,7 @@ from glanceclient.v1 import images from heatclient.v1 import events from heatclient.v1 import resources from heatclient.v1 import stacks -from novaclient.v1_1 import servers +from novaclient.v2 import servers from openstack_dashboard.test.test_data import utils as test_data_utils |