Merge "Adjust long list handling for Flavor"
This commit is contained in:
commit
308960e20d
|
@ -33,11 +33,6 @@ class Flavor(resource.Resource):
|
||||||
links = resource.prop('links')
|
links = resource.prop('links')
|
||||||
#: The name of this flavor.
|
#: The name of this flavor.
|
||||||
name = resource.prop('name')
|
name = resource.prop('name')
|
||||||
|
|
||||||
|
|
||||||
class FlavorDetail(Flavor):
|
|
||||||
base_path = '/flavors/detail'
|
|
||||||
|
|
||||||
#: Size of the disk this flavor offers. *Type: int*
|
#: Size of the disk this flavor offers. *Type: int*
|
||||||
disk = resource.prop('disk', type=int)
|
disk = resource.prop('disk', type=int)
|
||||||
#: ``True`` if this is a publicly visible flavor. ``False`` if this is
|
#: ``True`` if this is a publicly visible flavor. ``False`` if this is
|
||||||
|
@ -55,3 +50,13 @@ class FlavorDetail(Flavor):
|
||||||
disabled = resource.prop('OS-FLV-DISABLED:disabled')
|
disabled = resource.prop('OS-FLV-DISABLED:disabled')
|
||||||
#: The bandwidth scaling factor this flavor receives on the network.
|
#: The bandwidth scaling factor this flavor receives on the network.
|
||||||
rxtx_factor = resource.prop('rxtx_factor', type=float)
|
rxtx_factor = resource.prop('rxtx_factor', type=float)
|
||||||
|
|
||||||
|
|
||||||
|
class FlavorDetail(Flavor):
|
||||||
|
base_path = '/flavors/detail'
|
||||||
|
|
||||||
|
allow_create = False
|
||||||
|
allow_retrieve = False
|
||||||
|
allow_update = False
|
||||||
|
allow_delete = False
|
||||||
|
allow_list = True
|
||||||
|
|
|
@ -17,24 +17,18 @@ from openstack.compute.v2 import flavor
|
||||||
IDENTIFIER = 'IDENTIFIER'
|
IDENTIFIER = 'IDENTIFIER'
|
||||||
BASIC_EXAMPLE = {
|
BASIC_EXAMPLE = {
|
||||||
'id': IDENTIFIER,
|
'id': IDENTIFIER,
|
||||||
'links': '4',
|
'links': '2',
|
||||||
'name': '5',
|
'name': '3',
|
||||||
}
|
'disk': 4,
|
||||||
|
|
||||||
DETAILS = {
|
|
||||||
'disk': 1,
|
|
||||||
'os-flavor-access:is_public': True,
|
'os-flavor-access:is_public': True,
|
||||||
'ram': 3,
|
'ram': 6,
|
||||||
'vcpus': 4,
|
'vcpus': 7,
|
||||||
'swap': 5,
|
'swap': 8,
|
||||||
'OS-FLV-EXT-DATA:ephemeral': 6,
|
'OS-FLV-EXT-DATA:ephemeral': 9,
|
||||||
'OS-FLV-DISABLED:disabled': False,
|
'OS-FLV-DISABLED:disabled': False,
|
||||||
'rxtx_factor': 8.0
|
'rxtx_factor': 11.0
|
||||||
}
|
}
|
||||||
|
|
||||||
DETAIL_EXAMPLE = BASIC_EXAMPLE.copy()
|
|
||||||
DETAIL_EXAMPLE.update(DETAILS)
|
|
||||||
|
|
||||||
|
|
||||||
class TestFlavor(testtools.TestCase):
|
class TestFlavor(testtools.TestCase):
|
||||||
|
|
||||||
|
@ -55,6 +49,17 @@ class TestFlavor(testtools.TestCase):
|
||||||
self.assertEqual(BASIC_EXAMPLE['id'], sot.id)
|
self.assertEqual(BASIC_EXAMPLE['id'], sot.id)
|
||||||
self.assertEqual(BASIC_EXAMPLE['links'], sot.links)
|
self.assertEqual(BASIC_EXAMPLE['links'], sot.links)
|
||||||
self.assertEqual(BASIC_EXAMPLE['name'], sot.name)
|
self.assertEqual(BASIC_EXAMPLE['name'], sot.name)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['disk'], sot.disk)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['os-flavor-access:is_public'],
|
||||||
|
sot.is_public)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['ram'], sot.ram)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['vcpus'], sot.vcpus)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['swap'], sot.swap)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['OS-FLV-EXT-DATA:ephemeral'],
|
||||||
|
sot.ephemeral)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['OS-FLV-DISABLED:disabled'],
|
||||||
|
sot.disabled)
|
||||||
|
self.assertEqual(BASIC_EXAMPLE['rxtx_factor'], sot.rxtx_factor)
|
||||||
|
|
||||||
def test_detail(self):
|
def test_detail(self):
|
||||||
sot = flavor.FlavorDetail()
|
sot = flavor.FlavorDetail()
|
||||||
|
@ -62,25 +67,8 @@ class TestFlavor(testtools.TestCase):
|
||||||
self.assertEqual('flavors', sot.resources_key)
|
self.assertEqual('flavors', sot.resources_key)
|
||||||
self.assertEqual('/flavors/detail', sot.base_path)
|
self.assertEqual('/flavors/detail', sot.base_path)
|
||||||
self.assertEqual('compute', sot.service.service_type)
|
self.assertEqual('compute', sot.service.service_type)
|
||||||
self.assertTrue(sot.allow_create)
|
self.assertFalse(sot.allow_create)
|
||||||
self.assertTrue(sot.allow_retrieve)
|
self.assertFalse(sot.allow_retrieve)
|
||||||
self.assertTrue(sot.allow_update)
|
self.assertFalse(sot.allow_update)
|
||||||
self.assertTrue(sot.allow_delete)
|
self.assertFalse(sot.allow_delete)
|
||||||
self.assertTrue(sot.allow_list)
|
self.assertTrue(sot.allow_list)
|
||||||
|
|
||||||
def test_make_detail(self):
|
|
||||||
sot = flavor.FlavorDetail(DETAIL_EXAMPLE)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['id'], sot.id)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['links'], sot.links)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['name'], sot.name)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['disk'], sot.disk)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['os-flavor-access:is_public'],
|
|
||||||
sot.is_public)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['ram'], sot.ram)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['vcpus'], sot.vcpus)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['swap'], sot.swap)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['OS-FLV-EXT-DATA:ephemeral'],
|
|
||||||
sot.ephemeral)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['OS-FLV-DISABLED:disabled'],
|
|
||||||
sot.disabled)
|
|
||||||
self.assertEqual(DETAIL_EXAMPLE['rxtx_factor'], sot.rxtx_factor)
|
|
||||||
|
|
Loading…
Reference in New Issue