Convert multiple-create v3 plugin to v2.1

Changes required to have the multiple create v3 plugin natively
support the v2.1 API. The following Server creation parameters
are reverted:

os-multiple-create:min_count -> min_count
os-multiple-create:max_count -> max_count
os-multiple-create:return_reservation_id -> return_reservation_id

Removes min_count parameter for a test which should never have
been included but due to a gap in input validation was ignored.

Partially implements blueprint v2-on-v3-api

Change-Id: Ie435c357958066e9fde40eab54826261ee9d4226
This commit is contained in:
Chris Yeoh 2014-08-20 15:50:02 +09:30
parent 921e01cd21
commit 06adb3a5e3
4 changed files with 3 additions and 7 deletions

View File

@ -22,9 +22,9 @@ from nova.openstack.common import strutils
from nova import utils
ALIAS = "os-multiple-create"
MIN_ATTRIBUTE_NAME = "%s:min_count" % ALIAS
MAX_ATTRIBUTE_NAME = "%s:max_count" % ALIAS
RRID_ATTRIBUTE_NAME = "%s:return_reservation_id" % ALIAS
MIN_ATTRIBUTE_NAME = "min_count"
MAX_ATTRIBUTE_NAME = "max_count"
RRID_ATTRIBUTE_NAME = "return_reservation_id"
class MultipleCreate(extensions.V3APIExtensionBase):

View File

@ -64,7 +64,6 @@ class BlockDeviceMappingTestV21(test.TestCase):
def _get_servers_body(self, no_image=False):
body = {
'server': {
'min_count': 2,
'name': 'server_test',
'imageRef': '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
'flavorRef': 'http://localhost/123/flavors/3',

View File

@ -70,7 +70,6 @@ class BlockDeviceMappingTestV21(test.TestCase):
def _get_servers_body(self, no_image=False):
body = {
'server': {
'min_count': 2,
'name': 'server_test',
'imageRef': '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
'flavorRef': 'http://localhost/123/flavors/3',

View File

@ -514,8 +514,6 @@ class ServersTestV3(client.TestOpenStackClientV3Mixin, ServersTest):
_api_version = 'v3'
_image_ref_parameter = 'imageRef'
_flavor_ref_parameter = 'flavorRef'
_return_resv_id_parameter = 'os-multiple-create:return_reservation_id'
_min_count_parameter = 'os-multiple-create:min_count'
_access_ipv4_parameter = None
_access_ipv6_parameter = None