openstack/horizon
Code Issues Proposed changes

Use novaclient v2 instead v1_1

Browse Source 
Because v1_1 is deprecated.

Closes-bug: #1435201
Change-Id: I12a8c961d90bc79cc44b7c7f4e1a4bdbfa55f6a2
This commit is contained in:
Radomir Dopieralski 2015-03-23 09:41:20 +01:00
parent 4fdc42cf63
commit 8697a93d18
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack_dashboard/api/nova.py
View File

@ -27,12 +27,12 @@ from django.utils.functional import cached_property # noqa
from django.utils.translation import ugettext_lazy as _
from novaclient import exceptions as nova_exceptions
from novaclient.v1_1 import client as nova_client
from novaclient.v1_1.contrib import instance_action as nova_instance_action
from novaclient.v1_1.contrib import list_extensions as nova_list_extensions
from novaclient.v1_1 import security_group_rules as nova_rules
from novaclient.v1_1 import security_groups as nova_security_groups
from novaclient.v1_1 import servers as nova_servers
from novaclient.v2 import client as nova_client
from novaclient.v2.contrib import instance_action as nova_instance_action
from novaclient.v2.contrib import list_extensions as nova_list_extensions
from novaclient.v2 import security_group_rules as nova_rules
from novaclient.v2 import security_groups as nova_security_groups
from novaclient.v2 import servers as nova_servers
from horizon import conf
from horizon.utils import functions as utils

2
openstack_dashboard/dashboards/admin/flavors/tests.py
View File

@ -19,7 +19,7 @@ from mox import IsA # noqa
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from novaclient.v1_1 import flavors
from novaclient.v2 import flavors
from openstack_dashboard.dashboards.admin.flavors import constants
from openstack_dashboard.dashboards.admin.flavors import workflows

2
openstack_dashboard/test/api_tests/network_tests.py
View File

@ -21,7 +21,7 @@ from django import http
from django.test.utils import override_settings
from mox import IsA # noqa
from novaclient.v1_1 import floating_ip_pools
from novaclient.v2 import floating_ip_pools
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test

2
openstack_dashboard/test/api_tests/nova_tests.py
View File

@ -25,7 +25,7 @@ from django.test.utils import override_settings
from mox import IsA # noqa
from novaclient import exceptions as nova_exceptions
from novaclient.v1_1 import servers
from novaclient.v2 import servers
import six
from openstack_dashboard import api

2
openstack_dashboard/test/helpers.py
View File

@ -40,7 +40,7 @@ from keystoneclient.v2_0 import client as keystone_client
import mock
import mox
from neutronclient.v2_0 import client as neutron_client
from novaclient.v1_1 import client as nova_client
from novaclient.v2 import client as nova_client
from openstack_auth import user
from openstack_auth import utils
from saharaclient import client as sahara_client

36
openstack_dashboard/test/test_data/nova_data.py
View File

@ -15,24 +15,24 @@
import json
import uuid
from novaclient.v1_1 import aggregates
from novaclient.v1_1 import availability_zones
from novaclient.v1_1 import certs
from novaclient.v1_1 import flavor_access
from novaclient.v1_1 import flavors
from novaclient.v1_1 import floating_ips
from novaclient.v1_1 import hosts
from novaclient.v1_1 import hypervisors
from novaclient.v1_1 import keypairs
from novaclient.v1_1 import quotas
from novaclient.v1_1 import security_group_rules as rules
from novaclient.v1_1 import security_groups as sec_groups
from novaclient.v1_1 import servers
from novaclient.v1_1 import services
from novaclient.v1_1 import usage
from novaclient.v1_1 import volume_snapshots as vol_snaps
from novaclient.v1_1 import volume_types
from novaclient.v1_1 import volumes
from novaclient.v2 import aggregates
from novaclient.v2 import availability_zones
from novaclient.v2 import certs
from novaclient.v2 import flavor_access
from novaclient.v2 import flavors
from novaclient.v2 import floating_ips
from novaclient.v2 import hosts
from novaclient.v2 import hypervisors
from novaclient.v2 import keypairs
from novaclient.v2 import quotas
from novaclient.v2 import security_group_rules as rules
from novaclient.v2 import security_groups as sec_groups
from novaclient.v2 import servers
from novaclient.v2 import services
from novaclient.v2 import usage
from novaclient.v2 import volume_snapshots as vol_snaps
from novaclient.v2 import volume_types
from novaclient.v2 import volumes
from openstack_dashboard.api import base
from openstack_dashboard.api import nova