x/python-ganttclient
Code Issues Proposed changes

split rxtx_factor into network and instance_type

Browse Source 
This includes a migration and a change to the
flavors extension.

update1: removing tabs from the sql files & a
         quick refactoring
update2: Fixing whitespace problem in the
         sqlite upgrayedd

Change-Id: I665f402fe0ab1b301ab6761e80b11b101656065e
This commit is contained in:
Aaron Lee
2011-11-16 13:41:42 -06:00
parent 73efce46b4
commit 23e945ecfd
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/tests/test_instance_types.py
View File

@@ -77,8 +77,7 @@ class InstanceTypeTestCase(test.TestCase):
self.assertEqual(inst_type['vcpus'], 1)
self.assertEqual(inst_type['local_gb'], 120)
self.assertEqual(inst_type['swap'], 0)
self.assertEqual(inst_type['rxtx_quota'], 0)
self.assertEqual(inst_type['rxtx_cap'], 0)
self.assertEqual(inst_type['rxtx_factor'], 1)
# make sure new type shows up in list
new_list = instance_types.get_all_types()
@@ -124,11 +123,9 @@ class InstanceTypeTestCase(test.TestCase):
(('Negative swap', 256, 1, 10, 'flavor1'), {'swap': -1}),
(('Non-integer swap', 256, 1, 10, 'flavor1'), {'swap': -1}),
(('Negative rxtx_quota', 256, 1, 10, 'f1'), {'rxtx_quota': -1}),
(('Non-integer rxtx_quota', 256, 1, 10, 'f1'), {'rxtx_quota': -1}),
(('Negative rxtx_cap', 256, 1, 10, 'f1'), {'rxtx_cap': -1}),
(('Non-integer rxtx_cap', 256, 1, 10, 'f1'), {'rxtx_cap': 'a'}),
(('Negative rxtx_factor', 256, 1, 10, 'f1'), {'rxtx_factor': -1}),
(('Non-integer rxtx_factor', 256, 1, 10, 'f1'),
{'rxtx_factor': "d"}),
]
for (args, kwargs) in invalid_sigs:

1
nova/tests/test_network.py
View File

@@ -164,6 +164,7 @@ class FlatNetworkTestCase(test.TestCase):
'ips': 'DONTCARE',
'label': 'test%d' % i,
'mac': 'DE:AD:BE:EF:00:%02x' % i,
'rxtx_cap': "%d" % i * 3,
'vif_uuid':
'00000000-0000-0000-0000-00000000000000%02d' % i,
'rxtx_cap': 3,