Merge lp:~jordanrinke/nova/hypervupdate2 into lp:~hudson-openstack/nova/trunk

[Jordan Rinke]

I had to create a new branch on the local filesystem to fix the execute bit issue.

[Dan Prince (dan-prince)]

+ image_id=instance['image_id'],

Should this be instance['image_ref']?

review: Needs Fixing

[Jordan Rinke (jordanrinke)]

> + image_id=instance['image_id'],
>
> Should this be instance['image_ref']?

Fixed.

[Dan Prince (dan-prince)]

Okay. One more thing (sorry I didn't catch this the first time)

The images.fetch call you are using is a bit outdated. Can you merge with nova trunk and update the call so that it passes the nova context as the first argument? We need this to support the ability to download images when using keystone w/ Glance.

review: Needs Fixing

[Todd Willey (xtoddx)]

There are a couple of spacing issues in hyperv.py

line 91, pass is space over one too far
98, Caption= should be in line with other arg, or 8 spaces indented
same for args to cache_image on 117-122
blank line at end of multiline docstrings
period for single line docstrings

review: Needs Fixing

Unmerged revisions

1533. By Jordan Rinke on 2011-09-12

image_id to image_ref changes per Dan

1532. By Jordan Rinke on 2011-09-07

comment typo fix

1531. By Jordan Rinke on 2011-09-07

new branch to fix execute bit issues and resulting merge problems

=== modified file 'bin/nova-compute'
--- bin/nova-compute	2011-08-19 20:25:49 +0000
+++ bin/nova-compute	2011-09-12 20:07:27 +0000
@@ -24,7 +24,14 @@
 
 import os
 import sys
+import platform
+import time
 
+# check for windows before loading service modules
+if platform.system() == "Windows":
+    import win32service
+    import win32serviceutil
+    
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -39,11 +46,54 @@
 from nova import service
 from nova import utils
 
+class ComputeWin32Service(win32serviceutil.ServiceFramework):
+    _svc_name_ = "openstack-compute"
+    _svc_display_name_ = "OpenStack Compute Service"
+    _svc_description_ = "OpenStack Compute Service Node"
+
+    def __init__(self,args):
+        win32serviceutil.ServiceFramework.__init__(self,args)
+        # moved the addition of the default flags location and init
+        # of the flags to inside the class so the service wrapper
+        # doesnt conflict with the command line variables
+        utils.default_flagfile()
+        flags.FLAGS(sys.argv)
+        logging.setup()
+        self.isAlive = True
+    
+    def SvcDoRun(self):
+        import servicemanager
+
+        servicemanager.LogInfoMsg("OpenStack Compute: Starting")
+
+        server = service.Service.create(binary='nova-compute')
+        service.serve(server)
+
+        while self.isAlive :
+            # instead of calling service.wait here we just sleep 
+            # giving us an active loop to exit out of on a stop command
+            time.sleep(5)
+    
+        servicemanager.LogInfoMsg("OpenStack Compute: Stopped")
+    
+    def SvcStop(self):
+        import servicemanager
+    
+        servicemanager.LogInfoMsg("OpenStack Compute: Recieved stop signal")
+        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
+        self.isAlive = False
+
+
 if __name__ == '__main__':
-    utils.default_flagfile()
-    flags.FLAGS(sys.argv)
-    logging.setup()
-    utils.monkey_patch()
-    server = service.Service.create(binary='nova-compute')
-    service.serve(server)
-    service.wait()
+    # If the platform is any windows platform expect to be run as a service
+    if platform.system() == "Windows":
+        win32serviceutil.HandleCommandLine(ComputeWin32Service)
+    else:
+        # moved default flags and flag init after handling of
+        # the command line for the Win32 service wrapper
+        utils.default_flagfile()
+        flags.FLAGS(sys.argv)
+        logging.setup()
+        server = service.Service.create(binary='nova-compute')
+        service.serve(server)
+        service.wait()

=== modified file 'nova/virt/hyperv.py'
--- nova/virt/hyperv.py	2011-09-08 21:10:03 +0000
+++ nova/virt/hyperv.py	2011-09-12 20:07:27 +0000
@@ -116,13 +116,13 @@
 
     def init_host(self, host):
         #FIXME(chiradeep): implement this
-        LOG.debug(_('In init host'))
-        pass
+         pass
 
     def list_instances(self):
         """ Return the names of all the instances known to Hyper-V. """
         vms = [v.ElementName \
-                for v in self._conn.Msvm_ComputerSystem(['ElementName'])]
+                for v in self._conn.Msvm_ComputerSystem(['ElementName'], \
+                Caption="Virtual Machine")]
         return vms
 
     def list_instances_detail(self):
@@ -146,11 +146,18 @@
             raise exception.InstanceExists(name=instance.name)
 
         #Fetch the file, assume it is a VHD file.
-        base_vhd_filename = os.path.join(FLAGS.instances_path,
-                                         instance.name)
-        vhdfile = "%s.vhd" % (base_vhd_filename)
-        images.fetch(instance['image_ref'], vhdfile,
-                     instance['user_id'], instance['project_id'])
+        base_vhd_folder = os.path.join(FLAGS.instances_path, instance.name)
+        if not os.path.exists(base_vhd_folder):
+                LOG.debug(_('Creating folder %s '), base_vhd_folder)
+                os.mkdir(base_vhd_folder)
+        vhdfile = os.path.join(base_vhd_folder, instance.name + ".vhd")
+        self._cache_image(fn=self._fetch_image,
+              target=vhdfile,
+              fname=instance['image_ref'],
+              cow=FLAGS.use_cow_images,
+              image_id=instance['image_ref'],
+              user=instance['user_id'],
+              project=instance['project_id'])
 
         try:
             self._create_vm(instance)
@@ -506,3 +513,68 @@
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         pass
+    
+    def _cache_image(self, fn, target, fname, cow=False, *args, **kwargs):
+        """Wrapper for a method that creates an image that caches the image.
+
+        This wrapper will save the image into a common store and create a
+        copy for use by the hypervisor.
+
+        The underlying method should specify a kwarg of target representing
+        where the image will be saved.
+
+        fname is used as the filename of the base image.  The filename needs
+        to be unique to a given image.
+
+        If cow is True, it will make a CoW image instead of a copy.
+        """
+        if not os.path.exists(target):
+            base_dir = os.path.join(FLAGS.instances_path, '_base')
+            if not os.path.exists(base_dir):
+                os.mkdir(base_dir)
+            base = os.path.join(base_dir, fname + ".vhd")
+            if not os.path.exists(base):
+                fn(target=base, *args, **kwargs)
+            
+            LOG.debug("use_cow_image:%s", cow)
+            if cow:
+                
+                image_service = self._conn.query("Select * from Msvm_ImageManagementService")[0]
+                (job, ret_val) = image_service.CreateDifferencingVirtualHardDisk(Path=target, ParentPath=base)
+                LOG.debug("Creating difference disk: JobID=%s, Source=%s, Target=%s", job, base, target)
+
+                if ret_val == WMI_JOB_STATUS_STARTED:
+                    success = self._check_job_status(job)
+                else:
+                    success = (ret_val == 0)
+
+                if not success:
+                    raise Exception(_('Failed to create Difference Disk from %s to '), base, target)
+                
+                """ Testing out the built in job watch method but holding this code incase.
+                job_wmi_path = "%s" % str(job_id)
+                job_wmi_path = job_wmi_path.replace('\\\\','\\')
+                job_wmi_path = job_wmi_path.replace('\\','/')
+                job_wmi_path = job_wmi_path[3:-8]
+                storage_job = wmi.WMI(moniker=job_wmi_path)
+                while storage_job.JobState == WMI_JOB_STATE_RUNNING or storage_job.JobState == WMI_JOB_STATE_STARTING:
+                    LOG.debug("Difference disk progress(%s): %s ", storage_job.JobState, storage_job.PercentComplete)
+                    time.sleep(5)
+                    storage_job = wmi.WMI(moniker=job_wmi_path)
+        
+                if storage_job.JobState != WMI_JOB_STATE_COMPLETED:
+                    LOG.error(_("Failed to create difference disk: %s %s"), storage_job.ErrorDescription, storage_job.ErrorCode)
+                    raise Exception(_("Failed to create difference disk: %s %s"), storage_job.ErrorDescription, storage_job.ErrorCode)
+                """
+            else:
+                fn(target, *args, **kwargs)
+                
+    # Trying to use code directly from vish/libvirt for familiarity/compatability           
+    def _fetch_image(self, target, image_id, user, project, size=None):
+        """Grab image and optionally attempt to resize it"""
+        images.fetch(image_id, target, user, project)
+        if size:
+            LOG.debug("Sizing is unsupported currently")
+            #TODO add this - this is the funadmental start
+            # image_service = self._conn.query("Select * from Msvm_ImageManagementService")[0]
+            # return_value = ExpandVirtualHardDisk(Path=target, MaxInternalSize=)