diff --git a/doc/api_samples/all_extensions/extensions-list-resp.json b/doc/api_samples/all_extensions/extensions-list-resp.json index b7d8872b9360..9bfd5b0884c0 100644 --- a/doc/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/api_samples/all_extensions/extensions-list-resp.json @@ -546,7 +546,7 @@ }, { "alias": "os-multiple-create", - "description": "Allow multiple create in the Create Server v3 API.", + "description": "Allow multiple create in the Create Server v2.1 API.", "links": [], "name": "MultipleCreate", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", diff --git a/nova/api/compute_req_id.py b/nova/api/compute_req_id.py index 777446ff2fed..21985807c338 100644 --- a/nova/api/compute_req_id.py +++ b/nova/api/compute_req_id.py @@ -19,7 +19,7 @@ Using this middleware provides a convenient way to attach the x-compute-request-id to only v2 responses. Previously, this header was set in api/openstack/wsgi.py -Responses for APIv3 are taken care of by the request_id middleware provided +Responses for v2.1 API are taken care of by the request_id middleware provided in oslo. """ diff --git a/nova/api/openstack/compute/admin_actions.py b/nova/api/openstack/compute/admin_actions.py index 82f223009dc2..941678ee5eaa 100644 --- a/nova/api/openstack/compute/admin_actions.py +++ b/nova/api/openstack/compute/admin_actions.py @@ -27,7 +27,7 @@ ALIAS = "os-admin-actions" # States usable in resetState action # NOTE: It is necessary to update the schema of nova/api/openstack/compute/ -# schemas/v3/reset_server_state.py, when updating this state_map. +# schemas/reset_server_state.py, when updating this state_map. state_map = dict(active=vm_states.ACTIVE, error=vm_states.ERROR) authorize = extensions.os_compute_authorizer(ALIAS) diff --git a/nova/api/openstack/compute/agents.py b/nova/api/openstack/compute/agents.py index 9e7782b348dd..ab01b29c619e 100644 --- a/nova/api/openstack/compute/agents.py +++ b/nova/api/openstack/compute/agents.py @@ -107,8 +107,8 @@ class AgentController(wsgi.Controller): # TODO(alex_xu): The agent_id should be integer that consistent with # create/index actions. But parameter 'id' is string type that parsed # from url. This is a bug, but because back-compatibility, it can't be - # fixed for v2 API. This will be fixed after v3 API feature exposed by - # v2.1+microversions in the future. lp bug #1333494 + # fixed for v2 API. This will be fixed in v2.1 API by Microversions in + # the future. lp bug #1333494 return {"agent": {'agent_id': id, 'version': version, 'url': url, 'md5hash': md5hash}} diff --git a/nova/api/openstack/compute/cells.py b/nova/api/openstack/compute/cells.py index 5b9d1e430826..c6228d81dfbf 100644 --- a/nova/api/openstack/compute/cells.py +++ b/nova/api/openstack/compute/cells.py @@ -145,7 +145,7 @@ class CellsController(wsgi.Controller): def capacities(self, req, id=None): """Return capacities for a given cell or all cells.""" # TODO(kaushikc): return capacities as a part of cell info and - # cells detail calls in v3, along with capabilities + # cells detail calls in v2.1, along with capabilities context = req.environ['nova.context'] authorize(context) try: diff --git a/nova/api/openstack/compute/legacy_v2/contrib/agents.py b/nova/api/openstack/compute/legacy_v2/contrib/agents.py index 7e8fda2295ca..881926944fb1 100644 --- a/nova/api/openstack/compute/legacy_v2/contrib/agents.py +++ b/nova/api/openstack/compute/legacy_v2/contrib/agents.py @@ -109,8 +109,8 @@ class AgentController(object): # NOTE(alex_xu): The agent_id should be integer that consistent with # create/index actions. But parameter 'id' is string type that parsed # from url. This is a bug, but because back-compatibility, it can't be - # fixed for v2 API. This will be fixed after v3 API feature exposed by - # micro-version in the future. lp bug #1333494 + # fixed for v2 API. This will be fixed in v2.1 API by Microversions in + # the future. lp bug #1333494 return {"agent": {'agent_id': id, 'version': version, 'url': url, 'md5hash': md5hash}} diff --git a/nova/api/openstack/compute/legacy_v2/contrib/cells.py b/nova/api/openstack/compute/legacy_v2/contrib/cells.py index 8e2c5e969235..199753f33a22 100644 --- a/nova/api/openstack/compute/legacy_v2/contrib/cells.py +++ b/nova/api/openstack/compute/legacy_v2/contrib/cells.py @@ -141,7 +141,7 @@ class Controller(object): def capacities(self, req, id=None): """Return capacities for a given cell or all cells.""" # TODO(kaushikc): return capacities as a part of cell info and - # cells detail calls in v3, along with capabilities + # cells detail calls in v2.1, along with capabilities if not self.ext_mgr.is_loaded('os-cell-capacities'): raise exc.HTTPNotFound() diff --git a/nova/api/openstack/compute/multiple_create.py b/nova/api/openstack/compute/multiple_create.py index 60733497a390..45fc7f9f6d89 100644 --- a/nova/api/openstack/compute/multiple_create.py +++ b/nova/api/openstack/compute/multiple_create.py @@ -27,7 +27,7 @@ RRID_ATTRIBUTE_NAME = "return_reservation_id" class MultipleCreate(extensions.V21APIExtensionBase): - """Allow multiple create in the Create Server v3 API.""" + """Allow multiple create in the Create Server v2.1 API.""" name = "MultipleCreate" alias = ALIAS diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 3db813e4419c..4674529cf7b1 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -405,9 +405,9 @@ def os_compute_soft_authorizer(extension_name): @six.add_metaclass(abc.ABCMeta) class V21APIExtensionBase(object): - """Abstract base class for all V3 API extensions. + """Abstract base class for all v2.1 API extensions. - All V3 API extensions must derive from this class and implement + All v2.1 API extensions must derive from this class and implement the abstract methods get_resources and get_controller_extensions even if they just return an empty list. The extensions must also define the abstract properties. @@ -465,7 +465,7 @@ class V21APIExtensionBase(object): def expected_errors(errors): - """Decorator for v3 API methods which specifies expected exceptions. + """Decorator for v2.1 API methods which specifies expected exceptions. Specify which exceptions may occur when an API method is called. If an unexpected exception occurs then return a 500 instead and ask the user diff --git a/nova/api/validation/parameter_types.py b/nova/api/validation/parameter_types.py index 4fbf6477a3d4..4d779ea31ac6 100644 --- a/nova/api/validation/parameter_types.py +++ b/nova/api/validation/parameter_types.py @@ -113,7 +113,7 @@ hostname_or_ip_address = { name = { - # NOTE: Nova v3 API contains some 'name' parameters such + # NOTE: Nova v2.1 API contains some 'name' parameters such # as keypair, server, flavor, aggregate and so on. They are # stored in the DB and Nova specific parameters. # This definition is used for all their parameters. diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl index b7d8872b9360..9bfd5b0884c0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl @@ -546,7 +546,7 @@ }, { "alias": "os-multiple-create", - "description": "Allow multiple create in the Create Server v3 API.", + "description": "Allow multiple create in the Create Server v2.1 API.", "links": [], "name": "MultipleCreate", "namespace": "http://docs.openstack.org/compute/ext/fake_xml",