def _add_networks(nets2add, ovs_info, config, acq):
logging.debug('Adding networks: %s', list(nets2add))
net_add_setup = ovs_switch.NetsAdditionSetup(ovs_info)
net_add_setup.prepare_setup(nets2add)
acq.acquire(net_add_setup.acquired_ifaces)
net_add_setup.commit_setup()
for net, attrs in six.iteritems(nets2add):
config.setNetwork(net, attrs)
def test_dry_run(self):
ovs_info = MockedOvsInfo()
net_rem_setup = ovs_switch.NetsRemovalSetup(self.ovsdb, ovs_info)
net_rem_setup.remove({})
net_add_setup = ovs_switch.NetsAdditionSetup(self.ovsdb, ovs_info)
with net_add_setup.add({}):
pass
def test_dry_run(self):
ovs_info = MockedOvsInfo()
net_rem_setup = ovs_switch.NetsRemovalSetup(ovs_info)
net_rem_setup.prepare_setup({})
net_rem_setup.commit_setup()
net_add_setup = ovs_switch.NetsAdditionSetup(ovs_info)
net_add_setup.prepare_setup({})
net_add_setup.commit_setup()
def _assert_acquired_ifaces_post_switch_setup(self, _ovs_info, nets2add,
expected_ifaces):
with mock.patch('vdsm.network.ovs.driver.vsctl.Transaction.commit',
return_value=None), \
mock.patch('vdsm.network.ovs.switch.link.get_link',
return_value={'address': '01:23:45:67:89:ab'}):
setup = switch.NetsAdditionSetup(_ovs_info)
setup.prepare_setup(nets2add)
setup.commit_setup()
self.assertEqual(setup.acquired_ifaces, expected_ifaces)
def _assert_acquired_ifaces_post_switch_setup(self, _ovs_info, nets2add,
expected_ifaces):
ovsdb = driver.create(driver.Drivers.VSCTL)
with mock.patch('vdsm.network.ovs.driver.vsctl.Transaction.commit',
return_value=None), \
mock.patch('vdsm.network.ovs.switch.link.get_link',
return_value={'address': '01:23:45:67:89:ab'}):
setup = switch.NetsAdditionSetup(ovsdb, _ovs_info)
with setup.add(nets2add):
pass
self.assertEqual(setup.acquired_ifaces, expected_ifaces)
