x/python-ganttclient
Code Issues Proposed changes

merge trunk and fix unit test errors

Browse Source
This commit is contained in:
Ryu Ishimoto
2011-08-18 15:50:50 +09:00
parent dd22da65b2 192dd49f5e
commit b506c7145c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/test_network.py
View File

@@ -108,11 +108,14 @@ floating_ip_fields = {'id': 0,
vifs = [{'id': 0, vifs = [{'id': 0,
'address': 'DE:AD:BE:EF:00:00', 'address': 'DE:AD:BE:EF:00:00',
'uuid': '00000000-0000-0000-0000-0000000000000000',
'network_id': 0, 'network_id': 0,
'network': FakeModel(**networks[0]), 'network': FakeModel(**networks[0]),
'instance_id': 0}, 'instance_id': 0},
{'id': 1, {'id': 1,
'address': 'DE:AD:BE:EF:00:01', 'address': 'DE:AD:BE:EF:00:01',
'uuid': '00000000-0000-0000-0000-0000000000000001',
'network_id': 0,
'network_id': 1, 'network_id': 1,
'network': FakeModel(**networks[1]), 'network': FakeModel(**networks[1]),
'instance_id': 0}] 'instance_id': 0}]
@@ -163,6 +166,8 @@ class FlatNetworkTestCase(test.TestCase):
'ips': 'DONTCARE', 'ips': 'DONTCARE',
'label': 'test%s' % i, 'label': 'test%s' % i,
'mac': 'DE:AD:BE:EF:00:0%s' % i, 'mac': 'DE:AD:BE:EF:00:0%s' % i,
'vif_uuid': ('00000000-0000-0000-0000-000000000000000%s' %
i),
'rxtx_cap': 'DONTCARE', 'rxtx_cap': 'DONTCARE',
'should_create_vlan': False, 'should_create_vlan': False,
'should_create_bridge': False} 'should_create_bridge': False}