openstack/nova
Code Issues Proposed changes

Change v3 flavor_rxtx to v2.1

Browse Source 
This patch changes v3 flavor_rxtx API to v2.1 and makes v2
unit tests share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: I0b79be078ff2b2ca682f1f061f40c81d4487c7de
This commit is contained in:
jichenjc
2014-07-25 05:50:35 +08:00
parent 445b5509ab
commit 38b86b185d
14 changed files with 55 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
View File

@@ -17,8 +17,8 @@
],
"name": "m1.tiny",
"ram": 512,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
}
}
}

12
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
View File

@@ -18,7 +18,7 @@
],
"name": "m1.tiny",
"ram": 512,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
},
@@ -40,7 +40,7 @@
],
"name": "m1.small",
"ram": 2048,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
},
@@ -62,7 +62,7 @@
],
"name": "m1.medium",
"ram": 4096,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 2
},
@@ -84,7 +84,7 @@
],
"name": "m1.large",
"ram": 8192,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 4
},
@@ -106,9 +106,9 @@
],
"name": "m1.xlarge",
"ram": 16384,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 8
}
]
}
}

4
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json
View File

@@ -5,6 +5,6 @@
"vcpus": 2,
"disk": 10,
"id": "100",
"os-flavor-rxtx:rxtx_factor": 2.0
"rxtx_factor": 2.0
}
}
}

4
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
View File

@@ -17,8 +17,8 @@
],
"name": "flavortest",
"ram": 1024,
"os-flavor-rxtx:rxtx_factor": 2.0,
"rxtx_factor": 2.0,
"swap": 0,
"vcpus": 2
}
}
}

2
nova/api/openstack/compute/plugins/v3/flavor_manage.py
View File

@@ -65,7 +65,7 @@ class FlavorManageController(wsgi.Controller):
root_gb = vals['disk']
ephemeral_gb = vals.get('ephemeral', 0)
swap = vals.get('swap', 0)
rxtx_factor = vals.get('os-flavor-rxtx:rxtx_factor', 1.0)
rxtx_factor = vals.get('rxtx_factor', 1.0)
is_public = vals.get('flavor-access:is_public', True)
try:

2
nova/api/openstack/compute/plugins/v3/flavor_rxtx.py
View File

@@ -25,7 +25,7 @@ class FlavorRxtxController(wsgi.Controller):
def _extend_flavors(self, req, flavors):
for flavor in flavors:
db_flavor = req.get_db_flavor(flavor['id'])
key = '%s:rxtx_factor' % FlavorRxtx.alias
key = 'rxtx_factor'
flavor[key] = db_flavor['rxtx_factor'] or ""
def _show(self, req, resp_obj):

3
nova/api/openstack/compute/schemas/v3/flavor_manage.py
View File

@@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from nova.api.openstack.compute.plugins.v3 import flavor_rxtx
from nova.api.validation import parameter_types
create = {
@@ -55,7 +54,7 @@ create = {
'pattern': '^[0-9]*$', 'minimum': 0
},
# positive ( > 0) float
'%s:rxtx_factor' % flavor_rxtx.ALIAS: {
'rxtx_factor': {
'type': ['number', 'string'],
'pattern': '^[0-9]+(\.[0-9]+)?$',
'minimum': 0, 'exclusiveMinimum': True

35
nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py
View File

@@ -26,14 +26,22 @@ FAKE_FLAVORS = {
"name": 'flavor 1',
"memory_mb": '256',
"root_gb": '10',
"swap": '5',
"disabled": False,
"ephemeral_gb": '20',
"rxtx_factor": '1.0',
"vcpus": 1,
},
'flavor 2': {
"flavorid": '2',
"name": 'flavor 2',
"memory_mb": '512',
"root_gb": '10',
"swap": '10',
"ephemeral_gb": '25',
"rxtx_factor": None,
"disabled": False,
"vcpus": 1,
},
}
@@ -51,12 +59,12 @@ def fake_get_all_flavors_sorted_list(context=None, inactive=False,
]
class FlavorRxtxTest(test.NoDBTestCase):
class FlavorRxtxTestV21(test.NoDBTestCase):
content_type = 'application/json'
prefix = ''
_prefix = '/v3'
def setUp(self):
super(FlavorRxtxTest, self).setUp()
super(FlavorRxtxTestV21, self).setUp()
ext = ('nova.api.openstack.compute.contrib'
'.flavor_rxtx.Flavor_rxtx')
self.flags(osapi_compute_extension=[ext])
@@ -70,9 +78,13 @@ class FlavorRxtxTest(test.NoDBTestCase):
def _make_request(self, url):
req = webob.Request.blank(url)
req.headers['Accept'] = self.content_type
res = req.get_response(fakes.wsgi_app())
res = req.get_response(self._get_app())
return res
def _get_app(self):
return fakes.wsgi_app_v3(init_only=('servers',
'flavors', 'os-flavor-rxtx'))
def _get_flavor(self, body):
return jsonutils.loads(body).get('flavor')
@@ -80,17 +92,17 @@ class FlavorRxtxTest(test.NoDBTestCase):
return jsonutils.loads(body).get('flavors')
def assertFlavorRxtx(self, flavor, rxtx):
self.assertEqual(str(flavor.get('%srxtx_factor' % self.prefix)), rxtx)
self.assertEqual(str(flavor.get('rxtx_factor')), rxtx)
def test_show(self):
url = '/v2/fake/flavors/1'
url = self._prefix + '/flavors/1'
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertFlavorRxtx(self._get_flavor(res.body), '1.0')
def test_detail(self):
url = '/v2/fake/flavors/detail'
url = self._prefix + '/flavors/detail'
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
@@ -99,7 +111,14 @@ class FlavorRxtxTest(test.NoDBTestCase):
self.assertFlavorRxtx(flavors[1], '')
class FlavorRxtxXmlTest(FlavorRxtxTest):
class FlavorRxtxTestV20(FlavorRxtxTestV21):
_prefix = "/v2/fake"
def _get_app(self):
return fakes.wsgi_app()
class FlavorRxtxXmlTest(FlavorRxtxTestV20):
content_type = 'application/xml'
def _get_flavor(self, body):

12
nova/tests/api/openstack/compute/plugins/v3/test_flavor_manage.py
View File

@@ -21,7 +21,6 @@ import webob
from nova.api.openstack.compute.plugins.v3 import flavor_access
from nova.api.openstack.compute.plugins.v3 import flavor_manage
from nova.api.openstack.compute.plugins.v3 import flavor_rxtx
from nova.compute import flavors
from nova import context
from nova import db
@@ -106,7 +105,7 @@ class FlavorManageTest(test.NoDBTestCase):
"ephemeral": 1,
"id": unicode('1234'),
"swap": 512,
"%s:rxtx_factor" % flavor_rxtx.ALIAS: 1,
"rxtx_factor": 1,
"flavor-access:is_public": True,
}
}
@@ -120,7 +119,7 @@ class FlavorManageTest(test.NoDBTestCase):
"ephemeral": 1,
"id": unicode('1234'),
"swap": 512,
"%s:rxtx_factor" % flavor_rxtx.ALIAS: 1,
"rxtx_factor": 1,
"flavor-access:is_public": True,
}
}
@@ -232,7 +231,7 @@ class FlavorManageTest(test.NoDBTestCase):
"ephemeral": 1,
"id": unicode('1234'),
"swap": 512,
"%s:rxtx_factor" % flavor_rxtx.ALIAS: 1,
"rxtx_factor": 1,
"flavor-access:is_public": True,
}
}
@@ -304,8 +303,7 @@ class FlavorManageTest(test.NoDBTestCase):
def test_create_with_minus_rxtx_factor(self):
rxtx_factor = -1
self.base_request_dict['flavor'][('%s:rxtx_factor'
% flavor_rxtx.ALIAS)] = rxtx_factor
self.base_request_dict['flavor']['rxtx_factor'] = rxtx_factor
self._test_create_bad_request(self.base_request_dict)
def test_create_with_non_boolean_is_public(self):
@@ -340,7 +338,7 @@ class PrivateFlavorManageTest(test.TestCase):
"ephemeral": 1,
"id": unicode('1234'),
"swap": 512,
"%s:rxtx_factor" % flavor_rxtx.ALIAS: 1,
"rxtx_factor": 1,
"flavor-access:is_public": False
}
}

107
nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py
View File

@@ -1,107 +0,0 @@
# Copyright 2012 Nebula, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import webob
from nova.api.openstack.compute.plugins.v3 import flavor_rxtx
from nova.compute import flavors
from nova.openstack.common import jsonutils
from nova import test
from nova.tests.api.openstack import fakes
FAKE_FLAVORS = {
'flavor 1': {
"flavorid": '1',
"name": 'flavor 1',
"memory_mb": '256',
"root_gb": '10',
"rxtx_factor": '1.0',
"swap": 0,
"ephemeral_gb": 0,
"vcpus": 1,
"disabled": False,
},
'flavor 2': {
"flavorid": '2',
"name": 'flavor 2',
"memory_mb": '512',
"root_gb": '10',
"rxtx_factor": None,
"swap": 0,
"vcpus": 1,
"ephemeral_gb": 0,
"disabled": False,
},
}
def fake_flavor_get_by_flavor_id(flavorid, ctxt=None):
return FAKE_FLAVORS['flavor %s' % flavorid]
def fake_get_all_flavors_sorted_list(context=None, inactive=False,
filters=None, sort_key='flavorid',
sort_dir='asc', limit=None, marker=None):
return [
fake_flavor_get_by_flavor_id(1),
fake_flavor_get_by_flavor_id(2)
]
class FlavorRxtxTest(test.NoDBTestCase):
content_type = 'application/json'
prefix = '%s:' % flavor_rxtx.ALIAS
def setUp(self):
super(FlavorRxtxTest, self).setUp()
fakes.stub_out_nw_api(self.stubs)
self.stubs.Set(flavors, "get_all_flavors_sorted_list",
fake_get_all_flavors_sorted_list)
self.stubs.Set(flavors,
"get_flavor_by_flavor_id",
fake_flavor_get_by_flavor_id)
def _make_request(self, url):
req = webob.Request.blank(url)
req.headers['Accept'] = self.content_type
app = fakes.wsgi_app_v3(init_only=('servers', 'flavors',
'os-flavor-rxtx'))
res = req.get_response(app)
return res
def _get_flavor(self, body):
return jsonutils.loads(body).get('flavor')
def _get_flavors(self, body):
return jsonutils.loads(body).get('flavors')
def assertFlavorRxtx(self, flavor, rxtx):
self.assertEqual(
flavor.get('%srxtx_factor' % self.prefix), rxtx)
def test_show(self):
url = '/v3/flavors/1'
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertFlavorRxtx(self._get_flavor(res.body), '1.0')
def test_detail(self):
url = '/v3/flavors/detail'
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
flavors = self._get_flavors(res.body)
self.assertFlavorRxtx(flavors[0], '1.0')
self.assertFlavorRxtx(flavors[1], '')

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"name": "m1.tiny",
"flavor-access:is_public": true,
"ram": 512,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
}

10
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"name": "m1.tiny",
"flavor-access:is_public": true,
"ram": 512,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
},
@@ -40,7 +40,7 @@
"name": "m1.small",
"flavor-access:is_public": true,
"ram": 2048,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 1
},
@@ -62,7 +62,7 @@
"name": "m1.medium",
"flavor-access:is_public": true,
"ram": 4096,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 2
},
@@ -84,7 +84,7 @@
"name": "m1.large",
"flavor-access:is_public": true,
"ram": 8192,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 4
},
@@ -106,7 +106,7 @@
"name": "m1.xlarge",
"flavor-access:is_public": true,
"ram": 16384,
"os-flavor-rxtx:rxtx_factor": 1.0,
"rxtx_factor": 1.0,
"swap": 0,
"vcpus": 8
}

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl
View File

@@ -5,6 +5,6 @@
"vcpus": 2,
"disk": 10,
"id": "%(flavor_id)s",
"os-flavor-rxtx:rxtx_factor": 2.0
"rxtx_factor": 2.0
}
}

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
View File

@@ -15,7 +15,7 @@
"name": "%(flavor_name)s",
"flavor-access:is_public": true,
"ram": 1024,
"os-flavor-rxtx:rxtx_factor": 2.0,
"rxtx_factor": 2.0,
"vcpus": 2,
"disabled": false,
"ephemeral": 0,