ramielrowe

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 39af093..a2586e9 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -976,10 +976,6 @@ class LibvirtDriver(driver.ComputeDriver):
                 old_domid = virt_dom.ID()
                 virt_dom.destroy()

-                # NOTE(GuanQiang): teardown container to avoid resource leak
-                if CONF.libvirt.virt_type == 'lxc':

ramielrowe

# Sample ``local.conf`` for user-configurable variables in ``stack.sh``

# NOTE: Copy this file to the root ``devstack`` directory for it to
# work properly.

# ``local.conf`` is a user-maintained setings file that is sourced from ``stackrc``.
# This gives it the ability to override any variables set in ``stackrc``.
# Also, most of the settings in ``stack.sh`` are written to only be set if no
# value has already been set; this lets ``local.conf`` effectively override the
# default values.

ramielrowe

setUpClass (tempest.api.network.admin.test_lbaas_agent_scheduler.LBaaSAgentSchedulerTestJSON)
setUpClass (tempest.api.network.admin.test_lbaas_agent_scheduler.LBaaSAgentSchedulerTestXML)
setUpClass (tempest.api.network.admin.test_load_balancer_admin_actions.LoadBalancerAdminTestJSON)
setUpClass (tempest.api.network.admin.test_load_balancer_admin_actions.LoadBalancerAdminTestXML)
tempest.api.network.admin.test_quotas.QuotasTest.test_lbaas_quotas[gate]
setUpClass (tempest.api.network.test_fwaas_extensions.FWaaSExtensionTestJSON)
setUpClass (tempest.api.network.test_fwaas_extensions.FWaaSExtensionTestXML)
setUpClass (tempest.api.network.test_load_balancer.LoadBalancerTestJSON)
setUpClass (tempest.api.network.test_load_balancer.LoadBalancerTestXML)
setUpClass (tempest.api.network.test_metering_extensions.MeteringJSON)

ramielrowe

lbaas
lbaas_agent_scheduler
l3_agent_scheduler
agent
quotas
dhcp_agent_scheduler
fwaas
vpnaas
router
allowed-address-pairs

ramielrowe

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 39af093..a2586e9 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -976,10 +976,6 @@ class LibvirtDriver(driver.ComputeDriver):
                 old_domid = virt_dom.ID()
                 virt_dom.destroy()
 
-                # NOTE(GuanQiang): teardown container to avoid resource leak
-                if CONF.libvirt.virt_type == 'lxc':

ramielrowe

tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_pause_unpause[compute,network]
tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_reboot[compute,network]
tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_rebuild[compute,network]
tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_stop_start[compute,network]
tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_cross_tenant_traffic[compute,gate,network,smoke]
tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_in_tenant_traffic[compute,gate,network,smoke]

ramielrowe

    @mock.patch('nova.utils.get_image_from_system_metadata')
    def test_get_image_meta_cached_uses_system_metadata(self, mock_get_image):
        mock_get_image.return_value = self.image

        instance = self.instance_obj
        instance.image_ref = 'fake-image-1'
        with mock.patch('nova.utils.instance_sys_meta') as mock_inst_sys_meta:
            mock_inst_sys_meta.return_value = mock.sentinel.inst_sys_meta
            image_meta = compute_utils.get_image_metadata(
                self.ctx, self.mock_image_api, 'fake-image-1', instance)

ramielrowe

1) checkout the top most commit of patch set (i.e. isn't needed for any other patches)
   (git fetch https://review.openstack.org/openstack/nova refs/changes/53/123553/3 && git checkout FETCH_HEAD)
2) checkout a new branch
   (git checkout -b "blah")
3) do an interactive rebase down to the commit before our changes. (you can do a 'git log' to find this)
   (git rebase -i fe2d5d2730b1ec798e3d41023eaa1599c9937f58)
4) change 'pick' to 'edit' for commits you want to edit
5) make needed changes to patch, add them (git add), then commit them (git commit --amend)
6) git rebase --continue and repeat 5 until you're done

ramielrowe

./nova/virt/libvirt/config.py:694:1: C901 'LibvirtConfigGuestDisk.format_dom' is too complex (28)
./nova/virt/libvirt/config.py:910:1: C901 'LibvirtConfigGuestSnapshotDisk.format_dom' is too complex (20)
./nova/virt/libvirt/config.py:1093:1: C901 'LibvirtConfigGuestInterface.format_dom' is too complex (22)
./nova/virt/libvirt/driver.py:1087:1: C901 'LibvirtDriver.cleanup' is too complex (20)
./nova/virt/libvirt/driver.py:2038:1: C901 'LibvirtDriver._volume_snapshot_delete' is too complex (24)
./nova/virt/libvirt/driver.py:2926:1: C901 'LibvirtDriver._create_image' is too complex (25)
./nova/virt/libvirt/driver.py:3756:1: C901 'LibvirtDriver._get_guest_config' is too complex (66)
./nova/virt/xenapi/vmops.py:404:1: C901 'VMOps._spawn' is too complex (34)
./nova/virt/vmwareapi/volumeops.py:119:1: C901 'VMwareVolumeOps._iscsi_get_target' is too complex (22)

ramielrowe

>>> class test(object):
...     def __getattr__(self, name):
...         print name
...         return lambda *a, **k: 1
... 
>>> t = test()
>>> t.blah('a')
blah
1