Reverted some superfluous changes to make MP more concise.

1 files changed, 13 insertions, 54 deletions

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 9714773b2..53382a315 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -309,27 +309,6 @@ class LibvirtConnection(driver.ComputeDriver):
         return infos
 
     def destroy(self, instance, cleanup=True):
-<<<<<<< TREE
-        """Delete the VM instance from the hypervisor.
-
-        :param instance: Object representing the instance to destroy
-        :param cleanup: Should we erase all of the VM's associated files?
-        """
-        name = instance['name']
-
-        try:
-            virt_dom = self._conn.lookupByName(name)
-        except libvirt.libvirtError as ex:
-            msg = _("Instance %s not found.") % name
-            raise exception.NotFound(msg)
-
-        try:
-            virt_dom.destroy()
-        except libvirt.libvirtError as ex:
-            # If the instance is already terminated, we're still happy
-            msg = _("Error encountered during `libvirt.destroy`: %s") % ex
-            LOG.debug(msg)
-=======
         instance_name = instance['name']
 
         # TODO(justinsb): Refactor all lookupByName calls for error-handling
@@ -624,38 +603,16 @@ class LibvirtConnection(driver.ComputeDriver):
     # for xenapi(tr3buchet)
     @exception.wrap_exception
     def spawn(self, instance, network_info=None):
-        """Create the given VM instance using the libvirt connection.
-
-        :param instance: Object representing the instance to create
-        :param network_info: Associated network information
-        """
-        _id = instance['id']
-        name = instance['name']
         xml = self.to_xml(instance, network_info)
 
         self.firewall_driver.setup_basic_filtering(instance, network_info)
         self.firewall_driver.prepare_instance_filter(instance, network_info)
 
         self._create_image(instance, xml, network_info)
-<<<<<<< TREE
-
-        try:
-            self._conn.createXML(xml, 0)
-        except libvirt.libvirtError as ex:
-            msg = _("Error encountered creating VM '%(name)s': %(ex)s")
-            LOG.error(msg % locals())
-            return False
-
-        LOG.debug(_("VM %s successfully created.") % name)
-
-=======
         domain = self._create_new_domain(xml)
         LOG.debug(_("instance %s: is running"), instance['name'])
->>>>>>> MERGE-SOURCE
         self.firewall_driver.apply_instance_filter(instance)
 
-<<<<<<< TREE
-=======
         if FLAGS.start_guests_on_host_boot:
             LOG.debug(_("instance %s: setting autostart ON") %
                       instance['name'])
@@ -663,21 +620,23 @@ class LibvirtConnection(driver.ComputeDriver):
 
         timer = utils.LoopingCall(f=None)
 
->>>>>>> MERGE-SOURCE
         def _wait_for_boot():
-            """Check to see if the VM is running."""
             try:
-                state = self.get_info(name)['state']
-            except (exception.NotFound, libvirt.libvirtError) as ex:
-                msg = _("Error while waiting for VM '%(_id)s' to run: %(ex)s")
-                LOG.debug(msg % locals())
-                timer.stop()
-
-            if state == power_state.RUNNING:
-                LOG.debug(_('VM %s is now running.') % name)
+                state = self.get_info(instance['name'])['state']
+                db.instance_set_state(context.get_admin_context(),
+                                      instance['id'], state)
+                if state == power_state.RUNNING:
+                    LOG.debug(_('instance %s: booted'), instance['name'])
+                    timer.stop()
+            except:
+                LOG.exception(_('instance %s: failed to boot'),
+                              instance['name'])
+                db.instance_set_state(context.get_admin_context(),
+                                      instance['id'],
+                                      power_state.SHUTDOWN)
                 timer.stop()
 
-        timer = utils.LoopingCall(f=_wait_for_boot)
+        timer.f = _wait_for_boot
         return timer.start(interval=0.5, now=True)
 
     def _flush_xen_console(self, virsh_output):