x/python-ganttclient
Code Issues Proposed changes

Merge "baremetal: VirtualPowerDriver uses mac addresses in bm_interfaces"

Browse Source
This commit is contained in:
Jenkins
2013-04-22 16:50:20 +00:00
committed by Gerrit Code Review
parent fd667c8c66 4ca3556a50
commit b0f7db5a3a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/baremetal/test_virtual_power_driver.py
View File

@@ -71,12 +71,12 @@ class BareMetalVPDTestCase(bm_db_base.BMDBTestCase):
service_host='test_host',
cpus=2,
memory_mb=2048,
prov_mac_address='11:11:11:11:11:11',
prov_mac_address='aa:bb:cc:dd:ee:ff',
)
self.nic_info = [
{'address': '22:22:22:22:22:22', 'datapath_id': '0x1',
{'address': '11:11:11:11:11:11', 'datapath_id': '0x1',
'port_no': 1},
{'address': '33:33:33:33:33:33', 'datapath_id': '0x2',
{'address': '22:22:22:22:22:22', 'datapath_id': '0x2',
'port_no': 2},
]
self.addCleanup(fake_image.FakeImageService_reset)
@@ -200,6 +200,8 @@ class VPDClassMethodsTestCase(BareMetalVPDTestCase):
self.mox.StubOutWithMock(self.pm, '_run_command')
cmd = self.pm._vp_cmd.get_node_macs.replace('{_NodeName_}', 'testNode')
# aa:bb:cc:dd:ee:ff is prov_mac_adress. Check it is not used to
# find the node.
self.pm._run_command(cmd).AndReturn(["aabbccddeeff", "ffeeddccbbaa"])
self.mox.ReplayAll()