knife-xapi 0.5.4 → 0.6.0

data/lib/chef/knife/xapi_guest_delete.rb

@@ -8,9 +8,9 @@
 # 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.
@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-
 require 'chef/knife/xapi_base'
 
 class Chef
@@ -31,29 +30,29 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife xapi guest delete NAME_LABEL (options)"
+      banner 'knife xapi guest delete NAME_LABEL (options)'
 
       option :uuid,
-          :short => "-U",
-          :long => "--uuid",
-          :description => "Treat the label as a UUID not a name label"
+             short: '-U',
+             long: '--uuid',
+             description: 'Treat the label as a UUID not a name label'
 
       option :keep_client,
-        :short => "-C",
-        :long => "--keep-client",
-        :description => "Keep client info on the chef-server"
+             short: '-C',
+             long: '--keep-client',
+             description: 'Keep client info on the chef-server'
 
       option :keep_node,
-        :short => "-N",
-        :long => "--keep-node",
-        :description => "Keep node info on the chef-server"
+             short: '-N',
+             long: '--keep-node',
+             description: 'Keep node info on the chef-server'
 
-      def run 
+      def run
         server_name = @name_args[0]
 
         if server_name.nil?
-          puts "Error: No VM Name specified..."
-          puts "Usage: " + banner
+          puts 'Error: No VM Name specified...'
+          puts 'Usage: ' + banner
           exit 1
         end
 
@@ -62,28 +61,28 @@ class Chef
           name = get_name_label(vm)
         end
 
-        vms = [] 
+        vms = []
         if config[:uuid]
           vms << xapi.VM.get_by_uuid(server_name)
         else
           vms << xapi.VM.get_by_name_label(server_name)
         end
-        vms.flatten! 
+        vms.flatten!
 
-        if vms.empty? 
-          puts "VM not found: #{h.color server_name, :red}" 
+        if vms.empty?
+          puts "VM not found: #{h.color server_name, :red}"
           exit 1
         elsif vms.length > 1
-          puts "Multiple VM matches found use guest list if you are unsure"
+          puts 'Multiple VM matches found use guest list if you are unsure'
           vm = user_select(vms)
-        else 
+        else
           vm = vms.first
         end
-       
+
         # Cleanup the VM
         if vm == :all
-          vms.each {|vm| cleanup(vm) }
-        else 
+          vms.each { |vm| cleanup(vm) }
+        else
           cleanup(vm)
         end
 
@@ -93,26 +92,25 @@ class Chef
         unless config[:keep_client]
           client_list = Chef::ApiClient.list
 
-          if client_list.has_key?(name)	
+          if client_list.key?(name)
             ui.msg "Removing client  #{h.color name, :cyan} from chef"
             delete_object(Chef::ApiClient, name)
           else
-            puts "Client not found on the chef server.. Nothing to delete.."
+            puts 'Client not found on the chef server.. Nothing to delete..'
           end
         end
 
         unless config[:keep_node]
           env = Chef::Config[:environment]
           node_list = env ? Chef::Node.list_by_environment(env) : Chef::Node.list
-          if node_list.has_key?(name)
+          if node_list.key?(name)
             ui.msg "Removing node #{h.color name, :cyan} from chef "
             delete_object(Chef::Node, name)
           else
-            puts "Node not found on the chef server.. Nothing to delete.."
+            puts 'Node not found on the chef server.. Nothing to delete..'
           end
         end
       end
-
     end
   end
 end

data/lib/chef/knife/xapi_guest_list.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Jesse Nelson <spheromak@gmail.com> 
+# Author:: Jesse Nelson <spheromak@gmail.com>
 # Author:: Seung-jin/Sam Kim (<seungjin.kim@me.comm>)
 #
 # Copyright:: Copyright (c) 2012 Jesse Nelson
@@ -9,9 +9,9 @@
 # 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.
@@ -25,36 +25,34 @@ class Chef
     class XapiGuestList < Knife
       include Chef::Knife::XapiBase
 
-      banner "knife xapi guest list"
-
-       option :id,
-         :short => "-i",
-         :long => "--show-id",
-         :description => "Enable printing of UUID and OpaqueRefs for vm"
+      banner 'knife xapi guest list'
 
+      option :id,
+             short: '-i',
+             long: '--show-id',
+             description: 'Enable printing of UUID and OpaqueRefs for vm'
 
       def run
         vms = xapi.VM.get_all
         if locate_config_value(:id)
-           printf "%-25s  %-12s %-16s %-46s  %-36s \n", "Name Label", "State",  "IP Address", "Ref", "UUID"
-        else 
-           printf "%-25s  %-12s %-16s\n", "Name Label", "State", "IP Address"
+          printf "%-25s  %-12s %-16s %-46s  %-36s \n", 'Name Label', 'State',  'IP Address', 'Ref', 'UUID'
+        else
+          printf "%-25s  %-12s %-16s\n", 'Name Label', 'State', 'IP Address'
         end
 
         vms.each do |vm|
           record = xapi.VM.get_record(vm)
           ip_address = get_guest_ip(vm)
           # make  sure you can't do bad things to these VM's
-          next if record['is_a_template'] 
+          next if record['is_a_template']
           next if record['name_label'] =~ /control domain/i
           if locate_config_value(:id)
             printf "%-25s  %-12s %-16s %46s  %36s \n", record['name_label'], record['power_state'], ip_address, vm, record['uuid']
-          else 
+          else
             printf "%-25s  %-12s %-16s\n", record['name_label'], record['power_state'], ip_address
           end
         end
       end
-
     end
   end
 end

data/lib/chef/knife/xapi_guest_start.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Jesse Nelson <spheromak@gmail.com> 
+# Author:: Jesse Nelson <spheromak@gmail.com>
 # Author:: Seung-jin/Sam Kim (<seungjin.kim@me.comm>)
 #
 # Copyright:: Copyright (c) 2012 Jesse Nelson
@@ -9,9 +9,9 @@
 # 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.
@@ -26,8 +26,8 @@ class Chef
     class XapiGuestStart < Knife
       include Chef::Knife::XapiBase
 
-      banner "knife xapi guest start"
-    
+      banner 'knife xapi guest start'
+
       include Chef::Knife::XapiVmSelect
 
       def run
@@ -39,7 +39,6 @@ class Chef
           start(vm)
         end
       end
-
     end
   end
 end

data/lib/chef/knife/xapi_guest_stop.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Jesse Nelson <spheromak@gmail.com> 
+# Author:: Jesse Nelson <spheromak@gmail.com>
 # Author:: Seung-jin/Sam Kim (<seungjin.kim@me.comm>)
 #
 # Copyright:: Copyright (c) 2012 Jesse Nelson
@@ -9,9 +9,9 @@
 # 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.
@@ -26,7 +26,7 @@ class Chef
     class XapiGuestStop < Knife
       include Chef::Knife::XapiBase
 
-      banner "knife xapi guest stop"
+      banner 'knife xapi guest stop'
 
       include Chef::Knife::XapiVmSelect
 
@@ -38,10 +38,7 @@ class Chef
         else
           stop(vm)
         end
-        
-
       end
-
     end
   end
 end

data/lib/chef/knife/xapi_network_list.rb

@@ -8,9 +8,9 @@
 # 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.
@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-
 require 'chef/knife/xapi_base'
 require 'pry'
 class Chef
@@ -26,19 +25,17 @@ class Chef
     class XapiNetList < Knife
       include Chef::Knife::XapiBase
 
-      banner "knife xapi net list"
+      banner 'knife xapi net list'
 
-      def run 
-        xapi.network.get_all_records.each do |k, net|
-          color_kv "Name: ",   net['name_label']
-          color_kv "  Info: ", net['name_description'], [:magenta, :cyan]  unless net['name_description'].empty?
-          color_kv "   MTU: ", net['MTU'], [:magenta, :cyan]
-          color_kv "  UUID: ", net['uuid'], [:magenta, :cyan]
-          ui.msg ""
+      def run
+        xapi.network.get_all_records.each do |_k, net|
+          color_kv 'Name: ',   net['name_label']
+          color_kv '  Info: ', net['name_description'], [:magenta, :cyan]  unless net['name_description'].empty?
+          color_kv '   MTU: ', net['MTU'], [:magenta, :cyan]
+          color_kv '  UUID: ', net['uuid'], [:magenta, :cyan]
+          ui.msg ''
         end
       end
-
     end
   end
 end
-

data/lib/chef/knife/xapi_vdi_attach.rb

@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-
 require 'chef/knife/xapi_base'
 
 class Chef
@@ -26,30 +25,30 @@ class Chef
     class XapiVdiAttach < Knife
       include Chef::Knife::XapiBase
 
-      banner "knife xapi vdi attach VM_name VDI_name (options)"
+      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"
+             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)"
-	  
+             long: '--boot',
+             default: false,
+             description: 'Set the new disk as bootable (default: false)'
+
       def run
-	      vm_name = @name_args[0]
+	       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 
+        # There is no matchs with VM and VDI's name label
+		      if vm_name.nil? || 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
@@ -57,44 +56,38 @@ class Chef
         end
         vm_ref = vm_ref.shift
 
-
-	      # Get VDI's ref from its name label or UUID
-	      vdis = [] 
+	       # Get VDI's ref from its name label or UUID
+	       vdis = []
         if config[:uuid]
           vdis << xapi.VDI.get_by_uuid(vdi_name)
-	      else
+ 	      else
           vdis = xapi.VDI.get_by_name_label(vdi_name)
         end
 
-	      if vdis.empty?
+	       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
-	     
+          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] )
+            create_vbd(vm_ref, vdi_ref, position, config[:boot])
             position += 1
           end
-        else 
+        else
           create_vbd(vm_ref, vdi_ref, position, config[:boot])
         end
-
-	    end	
+	    end
 	  end
   end
 end
-
-
-

data/lib/chef/knife/xapi_vdi_create.rb

@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-
 require 'chef/knife/xapi_base'
 
 class Chef
@@ -27,31 +26,31 @@ class Chef
       require 'timeout'
       include Chef::Knife::XapiBase
 
-      banner "knife xapi vdi create NAME (options)"
+      banner 'knife xapi vdi create NAME (options)'
 
       option :xapi_sr,
-        :short => "-S Storage repo to provision VM from",
-        :long  => "--xapi-sr",
-        :proc => Proc.new { |key| Chef::Config[:knife][:xapi_sr] = key },
-        :description => "The Xen SR to use, If blank will use pool/hypervisor default"
+             short: '-S Storage repo to provision VM from',
+             long: '--xapi-sr',
+             proc: proc { |key| Chef::Config[:knife][:xapi_sr] = key },
+             description: 'The Xen SR to use, If blank will use pool/hypervisor default'
 
       option :xapi_disk_size,
-        :short => "-D Size of disk. 1g 512m etc",
-        :long  =>  "--xapi-disk-size",
-        :description => "The size of the root disk, use 'm' 'g' 't' if no unit specified assumes g",
-        :proc => Proc.new { |key| Chef::Config[:knife][:xapi_disk_size] = key.to_s }
+             short: '-D Size of disk. 1g 512m etc',
+             long: '--xapi-disk-size',
+             description: "The size of the root disk, use 'm' 'g' 't' if no unit specified assumes g",
+             proc: proc { |key| Chef::Config[:knife][:xapi_disk_size] = key.to_s }
 
       def run
         disk_name = @name_args[0]
         if disk_name.nil?
-          puts "Error: No Disk Name specified..."
-          puts "Usage: " + banner
+          puts 'Error: No Disk Name specified...'
+          puts 'Usage: ' + banner
           exit 1
         end
 
         begin
           if locate_config_value(:xapi_sr)
-            sr_ref = get_sr_by_name( locate_config_value(:xapi_sr) )
+            sr_ref = get_sr_by_name(locate_config_value(:xapi_sr))
           else
             sr_ref = find_default_sr
           end
@@ -61,30 +60,29 @@ class Chef
           end
           Chef::Log.debug "SR: #{h.color sr_ref, :cyan}"
 
-	    	  size = locate_config_value(:xapi_disk_size) 
+	    	    size = locate_config_value(:xapi_disk_size)
 
           vdi_record = {
-            "name_label" => disk_name,
-            "name_description" => "#{disk_name} created by #{ENV['USER']}",
-            "SR" => sr_ref,
-            "virtual_size" => input_to_bytes(size).to_s,
-            "type" => "system",
-            "sharable" => false,
-            "read_only" => false,
-            "other_config" => {},
+            'name_label' => disk_name,
+            'name_description' => "#{disk_name} created by #{ENV['USER']}",
+            'SR' => sr_ref,
+            'virtual_size' => input_to_bytes(size).to_s,
+            'type' => 'system',
+            'sharable' => false,
+            'read_only' => false,
+            'other_config' => {}
           }
 
           # Async create the VDI
           task = xapi.Async.VDI.create(vdi_record)
-          ui.msg "waiting for VDI Create.."
+          ui.msg 'waiting for VDI Create..'
           vdi_ref = get_task_ref(task)
 
-          ui.msg "Disk Name:   #{ h.color( disk_name, :bold, :cyan)}"
-          ui.msg "Disk Size:   #{ h.color( size.to_s, :bold, :cyan)}"
+          ui.msg "Disk Name:   #{ h.color(disk_name, :bold, :cyan)}"
+          ui.msg "Disk Size:   #{ h.color(size.to_s, :bold, :cyan)}"
 
         end
       end
     end
   end
 end
-