Merge lp:~johannes.erdfelt/nova/lp817265 into lp:~hudson-openstack/nova/trunk

[Johannes Erdfelt]

Make network_info truly optional

[Vish Ishaya (vishvananda)]

is it safe to run a destroy without passing network_info? How will it tear down the networking?

review: Needs Information

[Johannes Erdfelt (johannes.erdfelt)]

The code in _destroy() already treats network_info as optional. Look at like 878 in nova/virt/xenapi/vmops.py

The calls to _destroy() that don't pass any network_info are only "templates" used for snapshots and migrations. As a result, they have no network info to tear down.

This patch is merely to fix an exception where one call to _destroy() doesn't pass anything for network_info. See the linked bug.

[Vish Ishaya (vishvananda)]

Thanks for the explanation. In that case lgtm.

review: Approve

[Jason Kölker (jason-koelker)]

Is bueno. I fixed the same way in the branch I stole from cerberus.

review: Approve

[Thierry Carrez (ttx)]

This branch should have a description and/or commit message

[Johannes Erdfelt (johannes.erdfelt)]

I guess when Launchpad says "optional", it's misleading?

[Jay Pipes (jaypipes)]

It's a dev policy, not a requirement on Launchpad. Just like GitHub.

[Josh Kearney (jk0)]

review: Approve

=== modified file 'nova/virt/xenapi/vmops.py'
--- nova/virt/xenapi/vmops.py	2011-07-27 21:23:01 +0000
+++ nova/virt/xenapi/vmops.py	2011-07-27 23:35:55 +0000
@@ -471,7 +471,7 @@
                     self._session, instance, template_vdi_uuids, image_id)
         finally:
             if template_vm_ref:
-                self._destroy(instance, template_vm_ref, None,
+                self._destroy(instance, template_vm_ref,
                         shutdown=False, destroy_kernel_ramdisk=False)
 
         logging.debug(_("Finished snapshot and upload for VM %s"), instance)
@@ -853,7 +853,7 @@
         vm_ref = VMHelper.lookup(self._session, instance.name)
         return self._destroy(instance, vm_ref, network_info, shutdown=True)
 
-    def _destroy(self, instance, vm_ref, network_info, shutdown=True,
+    def _destroy(self, instance, vm_ref, network_info=None, shutdown=True,
                  destroy_kernel_ramdisk=True):
         """Destroys VM instance by performing: