x
/
nova-lxd
Code Issues Proposed changes

Manual backport of attach/detach interface patch 

Change-Id: I4359cac0e3e10960d4c6d85f5a191dc7b75fcb44
This commit is contained in:
Paul Hummer 2017-02-21 21:24:27 -07:00
parent c6ae6a7040
commit 2338b77875
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/virt/lxd/test_driver.py
View File

@ -650,7 +650,7 @@ class LXDDriverTest(test.NoDBTestCase):
lxd_driver.init_host(None)
lxd_driver.firewall_driver = mock.Mock()
lxd_driver.attach_interface(instance, image_meta, vif)
lxd_driver.attach_interface(ctx, instance, image_meta, vif)
self.assertTrue('eth1' in profile.devices)
self.assertEqual(expected, profile.devices['eth1'])
@ -686,7 +686,7 @@ class LXDDriverTest(test.NoDBTestCase):
lxd_driver = driver.LXDDriver(None)
lxd_driver.init_host(None)
lxd_driver.detach_interface(instance, vif)
lxd_driver.detach_interface(ctx, instance, vif)
self.vif_driver.unplug.assert_called_once_with(
instance, vif)

4
nova/virt/lxd/driver.py
View File

@ -586,7 +586,7 @@ class LXDDriver(driver.ComputeDriver):
self.storage_driver.disconnect_volume(connection_info['data'], None)
def attach_interface(self, instance, image_meta, vif):
def attach_interface(self, context, instance, image_meta, vif):
self.vif_driver.plug(instance, vif)
self.firewall_driver.setup_basic_filtering(instance, vif)
@ -620,7 +620,7 @@ class LXDDriver(driver.ComputeDriver):
profile.devices.update(config_update)
profile.save(wait=True)
def detach_interface(self, instance, vif):
def detach_interface(self, context, instance, vif):
self.vif_driver.unplug(instance, vif)
profile = self.client.profiles.get(instance.name)