knife-xapi 0.1.1 → 0.1.2

data/lib/chef/knife/xapi_base.rb

@@ -19,7 +19,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-XAPI_TEMP_REGEX ||= /^CentOS 5.*\(64-bit\)/
+# ruby 1.8.7 doesn't like ||= with  Constants
+unless defined?(XAPI_TEMP_REGEX)
+  XAPI_TEMP_REGEX = /^CentOS 5.*\(64-bit\)/
+end
 
 require 'chef/knife'
 require 'units/standard'
@@ -27,9 +30,7 @@ require 'units/standard'
 class Chef::Knife
     module XapiBase
 
-
     def self.included(includer)
-
       includer.class_eval do
         deps do
           require 'xenapi'
@@ -183,6 +184,7 @@ class Chef::Knife
     end
 
     # convert 1g/1m/1t to bytes
+    # rounds to whole numbers
     def input_to_bytes(size)
       case size
       when /g|gb/i
@@ -208,12 +210,41 @@ class Chef::Knife
         "read_only" => false,
         "other_config" => {},
       }
-      
-      vdi_ref = xapi.VDI.create( vdi_record ) 
-      ui.msg "VDI: #{h.color( name, :cyan )} #{h.color( vdi_ref, :cyan )} created"
-      vdi_ref
+    
+      # Async create the VDI
+      task = xapi.Async.VDI.create(vdi_record)
+      ui.msg "waiting for VDI Create"
+      vdi_ref = get_task_ref(task)
     end
 
+
+    # sit and wait for taks to exit pending state
+    def wait_on_task(task)
+      while xapi.task.get_status(task) == "pending"
+        progress = xapi.task.get_progress(task)
+        sleep 1
+      end
+    end
+   
+    # return the opaque ref of the task that was run by a task record if it succeded.
+    # else it returns nil 
+    def get_task_ref(task)
+      wait_on_task(task)
+      case xapi.task.get_status(task) 
+      when "success"
+        # xapi task record returns result as  <value>OpaqueRef:....</value>  
+        # we want the ref. this way it will work if they fix it to return jsut the ref
+        ref = xapi.task.get_result(task).match(/OpaqueRef:[^<]+/).to_s
+        #cleanup our task
+        xapi.task.destroy(task)
+        return ref
+      else 
+        ui.msg( "#{h.color 'ERROR:', :red } Task returned: #{xapi.task.get_result(task)}"   )
+        return nil
+      end
+    end
+
+
     # create vbd and return a ref 
     def create_vbd(vm_ref, vdi_ref, position)
       vbd_record = {
@@ -230,9 +261,9 @@ class Chef::Knife
         "type" => "Disk"
       }
 
-      vbd_ref = xapi.VBD.create(vbd_record)
-      ui.msg "VBD: #{h.color vbd_ref, :cyan } created" 
-      vbd_ref
+      task = xapi.Async.VBD.create(vbd_record)
+      ui.msg "Waiting for VBD create"
+      vbd_ref = get_task_ref(task) 
     end
 
   end

data/lib/chef/knife/xapi_guest_create.rb

@@ -105,9 +105,8 @@ class Chef
           xapi.VM.set_other_config(vm_ref, { "install-repository" => repo } )
     
           cpus = Chef::Config[:knife][:xapi_cpus] || 2
-          ui.msg "Setting up CPUS #{ h.color cpus, :cyan }"
-          xapi.VM.set_VCPUs_max( vm_ref, cpus.to_s )
-          xapi.VM.set_VCPUs_at_startup( vm_ref, cpus.to_s )
+          xapi.VM.set_VCPUs_max( vm_ref, cpus )
+          xapi.VM.set_VCPUs_at_startup( vm_ref, cpus )
 
           memory_size = input_to_bytes( Chef::Config[:knife][:xapi_mem] || "1g" ).to_s
           ui.msg "Mem size: #{ h.color( memory_size, :cyan)}" 
@@ -144,19 +143,27 @@ class Chef
           # Create the VDI
           disk_size = Chef::Config[:knife][:xapi_disk_size] || "8g" 
           vdi_ref = create_vdi("#{server_name}-root", sr_ref, disk_size )
+          # if vdi_ref is nill we need to bail/cleanup
+          cleanup(vm_ref) unless vdi_ref
+          ui.msg( "#{ h.color "OK", :green}" )
 
           # Attach the VDI to the VM
           vbd_ref = create_vbd(vm_ref, vdi_ref, 0)
-          
+          cleanup(vm_ref) unless vbd_ref 
+          ui.msg( "#{ h.color "OK", :green}" )
+ 
           ui.msg "Provisioning new Guest: #{h.color(vm_ref, :bold, :cyan )}" 
           provisioned = xapi.VM.provision(vm_ref)
 
           ui.msg "Starting new Guest: #{h.color( provisioned, :cyan)} "
-          xapi.Async.VM.start(vm_ref, false, true)
+          
+          task = xapi.Async.VM.start(vm_ref, false, true)
+          wait_on_task(task) 
+          ui.msg( "#{ h.color "Done!", :green}" )
 
         rescue Exception => e
           ui.msg "#{h.color 'ERROR:'} #{h.color( e.message, :red )}"
-          ui.error "#{h.color( e.backtrace, :yellow)}"
+          ui.msg "#{h.color( e.backtrace, :yellow)}"
           
           cleanup(vm_ref)
         end

data/lib/knife-xapi/version.rb

@@ -1,3 +1,3 @@
 module KnifeXenserver
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-xapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef