From 347ebb20e3217c2f8abf261622ba420c9fd077bd Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Mon, 14 Sep 2015 19:59:38 +0800 Subject: [PATCH] Rename all the ViewBuilderV3 to ViewBuilderV21 To get rid of v3, this patch rename all the ViewBuilderV3 to ViewBuilderV21. Change-Id: I84a5cb303b4da4ede6d792f80acd9313756b9f9b Partial-Bug: #1462901 --- nova/api/openstack/compute/flavor_manage.py | 2 +- nova/api/openstack/compute/flavors.py | 2 +- nova/api/openstack/compute/ips.py | 2 +- nova/api/openstack/compute/limits.py | 2 +- nova/api/openstack/compute/servers.py | 2 +- nova/api/openstack/compute/views/addresses.py | 2 +- nova/api/openstack/compute/views/flavors.py | 4 ++-- nova/api/openstack/compute/views/limits.py | 4 ++-- nova/api/openstack/compute/views/servers.py | 8 ++++---- nova/tests/unit/api/openstack/compute/test_serversV21.py | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nova/api/openstack/compute/flavor_manage.py b/nova/api/openstack/compute/flavor_manage.py index 11fac9ba9bb6..1532e37c1313 100644 --- a/nova/api/openstack/compute/flavor_manage.py +++ b/nova/api/openstack/compute/flavor_manage.py @@ -27,7 +27,7 @@ authorize = extensions.os_compute_authorizer(ALIAS) class FlavorManageController(wsgi.Controller): """The Flavor Lifecycle API controller for the OpenStack API.""" - _view_builder_class = flavors_view.V3ViewBuilder + _view_builder_class = flavors_view.ViewBuilderV21 def __init__(self): super(FlavorManageController, self).__init__() diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py index 5518245a2bb6..33a79e9d000b 100644 --- a/nova/api/openstack/compute/flavors.py +++ b/nova/api/openstack/compute/flavors.py @@ -31,7 +31,7 @@ ALIAS = 'flavors' class FlavorsController(wsgi.Controller): """Flavor controller for the OpenStack API.""" - _view_builder_class = flavors_view.V3ViewBuilder + _view_builder_class = flavors_view.ViewBuilderV21 @extensions.expected_errors(400) def index(self, req): diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index 276f74c39179..36ef7f889595 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -31,7 +31,7 @@ class IPsController(wsgi.Controller): # Note(gmann): here using V2 view builder instead of V3 to have V2.1 # server ips response same as V2 which does not include "OS-EXT-IPS:type" # & "OS-EXT-IPS-MAC:mac_addr". If needed those can be added with - # microversion by using V3 view builder. + # microversion by using V2.1 view builder. _view_builder_class = views_addresses.ViewBuilder def __init__(self, **kwargs): diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py index 8012237e533e..9a9569afd271 100644 --- a/nova/api/openstack/compute/limits.py +++ b/nova/api/openstack/compute/limits.py @@ -48,7 +48,7 @@ class LimitsController(wsgi.Controller): return builder.build(rate_limits, abs_limits) def _get_view_builder(self, req): - return limits_views.ViewBuilderV3() + return limits_views.ViewBuilderV21() class Limits(extensions.V21APIExtensionBase): diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 1e945b3e6c82..924b816b4b25 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -75,7 +75,7 @@ class ServersController(wsgi.Controller): EXTENSION_RESIZE_NAMESPACE = 'nova.api.v21.extensions.server.resize' - _view_builder_class = views_servers.ViewBuilderV3 + _view_builder_class = views_servers.ViewBuilderV21 schema_server_create = schema_servers.base_create schema_server_update = schema_servers.base_update diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index 894d4367887d..e12b661f1cd5 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -45,7 +45,7 @@ class ViewBuilder(common.ViewBuilder): return dict(addresses=addresses) -class ViewBuilderV3(ViewBuilder): +class ViewBuilderV21(ViewBuilder): """Models server addresses as a dictionary.""" def basic(self, ip, extend_address=False): """Return a dictionary describing an IP address.""" diff --git a/nova/api/openstack/compute/views/flavors.py b/nova/api/openstack/compute/views/flavors.py index a4c8ce01bc99..2c36fe6a1b59 100644 --- a/nova/api/openstack/compute/views/flavors.py +++ b/nova/api/openstack/compute/views/flavors.py @@ -81,9 +81,9 @@ class ViewBuilder(common.ViewBuilder): return flavors_dict -class V3ViewBuilder(ViewBuilder): +class ViewBuilderV21(ViewBuilder): def show(self, request, flavor): - flavor_dict = super(V3ViewBuilder, self).show(request, flavor) + flavor_dict = super(ViewBuilderV21, self).show(request, flavor) flavor_dict['flavor'].update({ "swap": flavor["swap"] or "", "OS-FLV-EXT-DATA:ephemeral": flavor["ephemeral_gb"], diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py index f5256ec50e93..4b3f87caee4f 100644 --- a/nova/api/openstack/compute/views/limits.py +++ b/nova/api/openstack/compute/views/limits.py @@ -103,10 +103,10 @@ class ViewBuilder(object): } -class ViewBuilderV3(ViewBuilder): +class ViewBuilderV21(ViewBuilder): def __init__(self): - super(ViewBuilderV3, self).__init__() + super(ViewBuilderV21, self).__init__() # NOTE In v2.0 these are added by a specific extension self.limit_names["server_groups"] = ["maxServerGroups"] self.limit_names["server_group_members"] = ["maxServerGroupMembers"] diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index 5eac17c0bb67..96d2cae8ca71 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -262,13 +262,13 @@ class ViewBuilder(common.ViewBuilder): return fault_dict -class ViewBuilderV3(ViewBuilder): - """Model a server V3 API response as a python dictionary.""" +class ViewBuilderV21(ViewBuilder): + """Model a server v2.1 API response as a python dictionary.""" def __init__(self): """Initialize view builder.""" - super(ViewBuilderV3, self).__init__() - self._address_builder = views_addresses.ViewBuilderV3() + super(ViewBuilderV21, self).__init__() + self._address_builder = views_addresses.ViewBuilderV21() # TODO(alex_xu): In V3 API, we correct the image bookmark link to # use glance endpoint. We revert back it to use nova endpoint for v2.1. self._image_builder = views_images.ViewBuilder() diff --git a/nova/tests/unit/api/openstack/compute/test_serversV21.py b/nova/tests/unit/api/openstack/compute/test_serversV21.py index b91adc5b6bf9..3c1c5357e9c9 100644 --- a/nova/tests/unit/api/openstack/compute/test_serversV21.py +++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py @@ -2994,7 +2994,7 @@ class ServersViewBuilderTest(test.TestCase): fakes.stub_out_nw_api_get_instance_nw_info(self.stubs, nw_info) self.uuid = db_inst['uuid'] - self.view_builder = views.servers.ViewBuilderV3() + self.view_builder = views.servers.ViewBuilderV21() self.request = fakes.HTTPRequestV21.blank("/fake") self.request.context = context.RequestContext('fake', 'fake') self.instance = fake_instance.fake_instance_obj(