knife-xapi 0.4.1 → 0.4.2

data/lib/chef/knife/xapi_base.rb

@@ -64,6 +64,12 @@ class Chef::Knife
           :long => "--domain Name",
           :description => "the domain name for the guest",
           :proc => Proc.new { |key| Chef::Config[:knife][:domain] = key }
+
+        option :no_color,
+          :long => "--no-color",
+          :default => false,
+          :description => "Don't colorize the output"
+
       end
     end
 
@@ -344,7 +350,6 @@ class Chef::Knife
       end
     end
 
-
     # create vbd and return a ref
     # defaults to bootable
     def create_vbd(vm_ref, vdi_ref, position, boot=true)
@@ -365,8 +370,42 @@ class Chef::Knife
       task = xapi.Async.VBD.create(vbd_record)
       ui.msg "Waiting for VBD create"
       vbd_ref = get_task_ref(task)
-    end
+	 end
+
+	  #detach_vdi
+	  def detach_vdi(vdi_ref)
+	    vbd_refs = xapi.VDI.get_VBDs(vdi_ref)
+     
+      # more than one VBD, so we ned to find the vbd with the vdi
+      ref = nil
+      Chef::Log.debug "VBD Refs: #{vbd_refs.inspect}"
+      if vbd_refs.length > 1 
+        vbd_refs.each do |vbd|
+          record = xapi.VBD.get_record vbd
+          Chef::Log.debug "Checking VBD: #{vbd}, #{record["device"]}, #{record["VDI"]}==#{vdi_ref}"
+          if record["VDI"] == vdi_ref
+            ref = vbd
+            break
+          end
+        end
+      else 
+        # if only vbd use it
+        ref = vbd_refs.first
+      end
+
+      unless ref
+        raise ArgumentError, "We weren't able to find a VBD for that VDI: #{vdi_ref}"
+      end
+      
+      task = xapi.Async.VBD.destroy(ref)
+      ui.msg "Waiting for VDI detach"
+      task_ref = get_task_ref(task)
+	  end
 
+	  def get_vbd_by_uuid(id)
+	    xapi.VBD.get_by_uuid(id)
+	  end
+     
     # try to get a guest ip and return it
     def get_guest_ip(vm_ref)
       guest_ip = "unknown"
@@ -396,33 +435,62 @@ class Chef::Knife
       return xapi.VDI.get_by_name_label(name)
     end
 
-    def print_vdi_info(vdi_ref)
-      puts "#{h.color "VDI name: " + xapi.VDI.get_name_label(vdi_ref), :green}"
-      puts "  -Description: " + xapi.VDI.get_name_description(vdi_ref)
-      puts "  -Type: " + xapi.VDI.get_type(vdi_ref)
-    end
+    def color_kv(key, value, color=[:green, :cyan])
+      if config[:no_color]
+        color = [ :clear, :clear ]
+      end
+      ui.msg "#{h.color( key, color[0])} #{ h.color( value, color[1])}"
+    end 
+
+    def print_vdi_info(vdi)
+      record = xapi.VDI.get_record vdi
+      color_kv "VDI Name: ", record['name_label']
+      color_kv "  UUID: ",  record['uuid'], [:magenta, :cyan]
+      color_kv "  Description: ", record['name_description'], [:magenta, :cyan]
+      color_kv "  Type: ", record['type'], [:magenta, :cyan]
+      color_kv "  Size (gb): ", record['virtual_size'].to_i.bytes.to_gb.to_s, [:magenta, :cyan]
+      color_kv "  Utilized (gb): ", record['physical_utilisation'].to_i.bytes.to_gb.to_s, [:magenta, :cyan]
+      record["VBDs"].each do |vbd|
+        vm = xapi.VBD.get_VM(vbd)
+        color_kv "    VM name: ",  xapi.VM.get_name_label(vm)
+        color_kv "    VM state: ",   "#{xapi.VM.get_power_state(vm) } \n"
+      end
 
-    def yes_no_prompt(str)
-      print str
-      choice = STDIN.gets
+      if record["VBDs"].length == 0 
+        ui.msg h.color "  No VM Attached", :red
+      end
+      
+      ui.msg ""
+    end
 
-      while !(choice.match(/^yes$|^no$/))
-        puts "Invalid input! Type \'yes\' or \'no\':"
-        choice = STDIN.gets
+    # return true (yes) false (no) 
+    # to the asked question
+    def yes_no?(msg)
+      answer = ui.ask( "#{msg} yes/no ? " ) do |res|
+        res.case = :down
+        res.validate = /y|n|yes|no/ 
+        res.responses[:not_valid] = "Use 'yes', 'no', 'y', 'n':"
       end
 
-      if choice.match('yes')
-        return true
-      else
-        return false
+      case answer
+      when  "y", "yes"
+       true
+      when "n", "no"
+       false
       end
     end
 
     def destroy_vdi(vdi_ref)
+      vbds = get_vbds_from_vdi(vdi_ref)
+      unless vbds.empty? 
+        detach_vdi(vdi_ref)
+      end
       task = xapi.Async.VDI.destroy(vdi_ref)
       print "Destroying volume "
       puts "#{h.color xapi.VDI.get_name_label(vdi_ref), :cyan}"
       task_ref = get_task_ref(task)
     end
+
+
   end
 end

data/lib/chef/knife/xapi_guest_create.rb

@@ -213,7 +213,7 @@ class Chef
         # get the template vm we are going to build from
         template_ref = find_template( locate_config_value(:xapi_vm_template) )
 
-        Chef::Log.debug "Cloning Guest from Template: #{h.color(template_ref, :bold, :cyan )}"
+		Chef::Log.debug "Cloning Guest from Template: #{h.color(template_ref, :bold, :cyan )}"
         task = xapi.Async.VM.clone(template_ref, fqdn)
         ui.msg "Waiting on Template Clone"
         vm_ref = get_task_ref(task)
@@ -283,7 +283,7 @@ class Chef
             # Attach the VDI to the VM
             # if its position is 0 set it bootable
             vbd_ref = create_vbd(vm_ref, vdi_ref, position, position == 0)
-            fail(vm_ref) unless vbd_ref
+	          fail(vm_ref) unless vbd_ref
           end
 
 

data/lib/chef/knife/xapi_vdi_attach.rb

@@ -0,0 +1,100 @@
+#
+# Author:: Jesse Nelson (<spheromak@gmail.com>)
+#
+# Copyright:: Copyright (c) 2012 Jesse Nelson
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+require 'chef/knife/xapi_base'
+
+class Chef
+  class Knife
+    class XapiVdiAttach < Knife
+      include Chef::Knife::XapiBase
+
+      banner "knife xapi vdi attach VM_name VDI_name (options)"
+
+      option :uuid,
+        :short => "-U",
+        :long => "--uuid",
+        :description => "Treat the label as a UUID not a name label"
+
+      option :boot,
+        :long => "--boot",
+        :default => false,
+        :description => "Set the new disk as bootable (default: false)"
+	  
+      def run
+	      vm_name = @name_args[0]
+        vdi_name = @name_args[1]
+        
+        # There is no matchs with VM and VDI's name label 
+		    if vm_name.nil? or vdi_name.nil?
+	  	    ui.msg "Error: No VM Name or VDI Name specified..."
+	        ui.msg "Usage: " + banner
+	  	    exit 1
+		    end
+
+        # Get VM's ref from its name label 
+        vm_ref = xapi.VM.get_by_name_label(vm_name)
+        if vm_ref.empty?
+          ui.msg ui.color "Could not find a vm named #{vm_name}", :red
+          exit 1
+        end
+        vm_ref = vm_ref.shift
+
+
+	      # Get VDI's ref from its name label or UUID
+	      vdis = [] 
+        if config[:uuid]
+          vdis << xapi.VDI.get_by_uuid(vdi_name)
+	      else
+          vdis = xapi.VDI.get_by_name_label(vdi_name)
+        end
+
+	      if vdis.empty?
+          ui.msg "VDI not found: #{h.color vdi_name, :red}"
+          exit 1  
+        # When multiple VDI matches
+        Chef::Log.debug "VDI Length: #{vdis.inspect}\nType:#{vdi.class}" 
+        elsif vdis.length > 1
+	        ui.msg "Multiple VDI matches found use guest list if you are unsure"
+		      vdi_ref = user_select(vdis)
+	      else
+			    vdi_ref = vdis.first
+	      end
+	     
+
+        position = xapi.VM.get_VBDs(vm_ref).length
+
+        # Attach intended VDI to specific VM
+        if vdi_ref == :all
+          vdis.each do |vdi_ref|
+            create_vbd(vm_ref, vdi_ref, position, config[:boot] )
+            position += 1
+          end
+        else 
+          create_vbd(vm_ref, vdi_ref, position, config[:boot])
+        end
+
+	    end	
+	  end
+  end
+end
+
+
+

data/lib/chef/knife/xapi_vdi_delete.rb

@@ -43,88 +43,84 @@ class Chef
         :long => "--interactive",
         :description => "Interactive clean-up of orphaned volumes"
 
-      def run 
-        if config[:interactive]
-          # Get all VDIs known to the system
-          vdis = get_all_vdis()
-          first = true
-
-          for vdi_ in vdis do
-            vbds = get_vbds_from_vdi(vdi_)
-            if vbds.empty? and xapi.VDI.get_type(vdi_).match('system')
-              if first
-                puts "================================================"
-                first = false
-              end
-
-              print_vdi_info(vdi_)
-              ret = yes_no_prompt("  No VM attached! Do you want to destroy this volume? (Type \'yes\' or \'no\'): ")
-
-              if ret
-                destroy_vdi(vdi_)
-              end
-              puts "================================================"
-            end
-          end
 
-        elsif config[:cleanup]
-          orphaned_vdis = []
-          vdis = get_all_vdis()
+      def interactive
+        # Get all VDIs known to the system
+        vdis = get_all_vdis()
+        first = true
 
-          for vdi_ in vdis do
-            vbds = get_vbds_from_vdi(vdi_)
-            if vbds.empty? and xapi.VDI.get_type(vdi_).match('system')
-              orphaned_vdis << vdi_
+        for vdi_ in vdis do
+          vbds = get_vbds_from_vdi(vdi_)
+          if vbds.empty? and xapi.VDI.get_type(vdi_).match('system')
+            if first
+              first = false
             end
-          end
 
-          for item in orphaned_vdis do
-            print_vdi_info(item)
+            prinlt_vdi_info(vdi_)
+            destroy_vdi(vdi_) if yes_no?("Destroy this volume? ")
           end
+        end
+      end
 
-          unless orphaned_vdis.empty?
-            ret = yes_no_prompt("Do you want to destroy all these volumes? (Type \'yes\' or \'no\'): ")
-            if ret
-              for item in orphaned_vdis do
-                destroy_vdi(item)
-              end
-            end
-          end
+      def vdi_cleanup
+        orphaned_vdis = []
+        vdis = get_all_vdis()
 
-        else
-          vdi_name = @name_args[0]
-          if vdi_name.nil?
-            puts "Error: No VDI Name specified..."
-            puts "Usage: " + banner
-            exit 1
+        for vdi_ in vdis do
+          vbds = get_vbds_from_vdi(vdi_)
+          if vbds.empty? and xapi.VDI.get_type(vdi_).match('system')
+            orphaned_vdis << vdi_
           end
+        end
 
-          vdis = [] 
-          if config[:uuid]
-            vdis << get_vdi_by_uuid(vdi_name)
-          else
-            vdis << get_vdi_by_name_label(vdi_name)
-          end
-          vdis.flatten! 
-
-          if vdis.empty? 
-            puts "VDI not found: #{h.color vdi_name, :red}" 
-            exit 1
-          elsif vdis.length > 1
-            puts "Multiple VDI matches found. Use vdi list if you are unsure"
-            vdi = user_select(vdis)
-          else 
-            vdi = vdis.first
+        orphaned_vdis.each { |item| print_vdi_info(item) }
+        unless orphaned_vdis.empty?
+          if yes_no?("Destroy all these volumes? ")
+            orphaned_vdis.each { |item| destroy_vdi(item) }
           end
+        end
+      end
 
-          vbds = get_vbds_from_vdi(vdi)
+      def run 
+        if config[:interactive]
+          interactive
+          return
+        elsif config[:cleanup]
+          vdi_cleanup
+          return
+        end
 
-          if vbds.empty? 
-            destroy_vdi(vdi)
-          else
-            puts "ERROR! The VDI is still in use."
-          end
+        vdi_name = @name_args[0]
+        if vdi_name.nil?
+          puts "Error: No VDI Name specified..."
+          puts "Usage: " + banner
+          exit 1
         end
+
+        vdis = [] 
+        if config[:uuid]
+          vdis << get_vdi_by_uuid(vdi_name)
+        else
+          vdis << get_vdi_by_name_label(vdi_name)
+        end
+        vdis.flatten! 
+
+        if vdis.empty? 
+          ui.msg "VDI not found: #{h.color vdi_name, :red}" 
+          exit 1
+        elsif vdis.length > 1
+          ui.msg "Multiple VDI matches found. Use vdi list if you are unsure"
+          vdi = user_select(vdis)
+        else 
+          vdi = vdis.first
+        end
+
+        if vdi == :all 
+          vdis.each {|vdi|  destroy_vdi(vdi)}
+        else 
+          destroy_vdi(vdi)
+        end
+
       end
     end
   end

data/lib/chef/knife/xapi_vdi_detach.rb

@@ -0,0 +1,80 @@
+#
+# Author:: Jesse Nelson (<spheromak@gmail.com>)
+#
+# Copyright:: Copyright (c) 2012 Jesse Nelson
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+require 'chef/knife/xapi_base'
+
+class Chef
+  class Knife
+	  class XapiVdiDetach < Knife
+	    include Chef::Knife::XapiBase
+
+	    banner "knife xapi vdi detach NAME_LABEL (options)"
+
+	    option :uuid,
+	      :short => "-U",
+	      :long => "--uuid",
+		    :description => "Treat the label as a UUID not a name label"
+	  
+	    def run
+	      vbd_name = @name_args[0]
+
+		    if vbd_name.nil?
+		      ui.msg "Error: No VDI Name specified..."
+		      ui.msg "Usage: " +banner
+		      exit 1
+		    end
+		
+        vdis = []  
+        # detach vdi with VDI's UUID
+	      if config[:uuid]
+          vdis << xapi.VDI.get_by_uuid(vbd_name)
+        else
+        # detach with VDI's Name 
+          vdis = xapi.VDI.get_by_name_label(vbd_name)
+	      end
+
+        if vdis.empty?
+	        ui.msg "VDI not found: #{h.color vbd_name, :red}"
+	    	  exit 1
+		    # When multiple VDI matches
+	      elsif vdis.length > 1
+			    ui.msg "Multiple VDI matches found use guest list if you are unsure"
+			    vdi_ref = user_select(vdis)
+	      else
+			    vdi_ref = vdis.first
+		    end
+			  
+        # Detach VDI	
+        if vdi_ref == :all
+          vdis.each{|vdi_ref| detach_vdi(vdi_ref)}
+        else
+          detach_vdi(vdi_ref)
+        end
+        
+     end
+	  end
+  end
+end
+
+	  
+
+
+

data/lib/chef/knife/xapi_vdi_list.rb

@@ -28,31 +28,39 @@ class Chef
 
       banner "knife xapi vdi list"
 
+      option :vdi_name,
+        :short => "-N",
+        :long => "--vdi-name",
+        :default => false,
+        :description => "Indicates this is a vdi name not a guest name"
+
+
       def run 
-          # Get all VDIs known to the system
-          vdis = xapi.VDI.get_all()
-
-          puts "================================================"
-          for vdi_ in vdis do
-            puts "#{h.color "VDI name: " + xapi.VDI.get_name_label(vdi_), :green}"
-            puts "  -UUID: " + xapi.VDI.get_uuid(vdi_)
-            puts "  -Description: " + xapi.VDI.get_name_description(vdi_)
-            puts "  -Type: " + xapi.VDI.get_type(vdi_)
-
-            vbds = xapi.VDI.get_VBDs(vdi_)
-            for vbd in vbds do
-              vm = xapi.VBD.get_VM(vbd)
-              state = xapi.VM.get_power_state(vm)
-              puts "    -VM name: " + xapi.VM.get_name_label(vm)
-              puts "    -VM state: " + state + "\n"
-            end
-
-            if vbds.empty? and xapi.VDI.get_type(vdi_).match('system')
-                puts "  No VM attached!"
-                #puts "  No VM attached! Use vdi delete --cleanup to delete this volume."
-            end
-            puts "================================================"
+        # Get all VDIs known to the system
+        name = @name_args[0]
+
+        # if we were passed a guest name find its vdi's 
+        # otherwise do it for everything
+        vdis = Array.new
+        if name.nil? or name.empty?
+          vdis = xapi.VDI.get_all
+
+        elsif config[:vdi_name]
+          vdis = xapi.VDI.get_by_name_label( name )
+
+        else
+          ref = xapi.VM.get_by_name_label( name ) 
+          vm = xapi.VM.get_record( ref.first )
+
+          vm["VBDs"].each do |vbd|
+            vdis << xapi.VBD.get_record( vbd )["VDI"]
           end
+        end
+
+        vdis.each do |vdi| 
+          print_vdi_info vdi
+        end
+
       end
     end
   end

data/lib/knife-xapi/version.rb

@@ -1,3 +1,3 @@
 module KnifeXenserver
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-xapi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -87,8 +87,10 @@ files:
 - lib/chef/knife/xapi_guest_create.rb
 - lib/chef/knife/xapi_guest_delete.rb
 - lib/chef/knife/xapi_guest_list.rb
+- lib/chef/knife/xapi_vdi_attach.rb
 - lib/chef/knife/xapi_vdi_create.rb
 - lib/chef/knife/xapi_vdi_delete.rb
+- lib/chef/knife/xapi_vdi_detach.rb
 - lib/chef/knife/xapi_vdi_list.rb
 - lib/knife-xapi/version.rb
 homepage: https://github.com/spheromak/knife-xapi