knife-xapi 0.3.4 → 0.3.5

data/lib/chef/knife/xapi_base.rb

@@ -86,7 +86,7 @@ class Chef::Knife
 
     def locate_config_value(key)
       key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
+      config[key] || Chef::Config[:knife][key] 
     end
 
     # get template by name_label
@@ -295,5 +295,18 @@ class Chef::Knife
       vbd_ref = get_task_ref(task) 
     end
 
+    # try to get a guest ip and return it
+    def get_guest_ip(vm_ref)
+      guest_ip = "unknown"
+      vgm =  xapi.VM.get_guest_metrics(vm_ref)
+      unless "OpaqueRef:NULL" == vgm
+        networks = xapi.VM_guest_metrics.get_networks(vgm)
+        if networks.has_key?("0/ip")
+          guest_ip = networks["0/ip"]
+        end
+      end
+      return guest_ip
+    end 
+
   end
 end

data/lib/chef/knife/xapi_guest_create.rb

@@ -165,7 +165,7 @@ class Chef
         tcp_socket && tcp_socket.close
       end
 
-      def get_guest_ip(vm_ref)
+      def wait_for_guest_ip(vm_ref)
         begin
           timeout(480) do
             ui.msg "Waiting for guest ip address" 
@@ -308,7 +308,7 @@ class Chef
           exit 0 
         end
 
-        guest_addr = get_guest_ip(vm_ref)
+        guest_addr = wait_for_guest_ip(vm_ref)
         if guest_addr.nil? or guest_addr.empty?
           ui.msg("ip seems wrong using host+domain name instead")
           guest_addr = "#{host_name}.#{domainname}"

data/lib/chef/knife/xapi_guest_list.rb

@@ -27,15 +27,31 @@ class Chef
 
       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
-        printf "%-25s  %-12s  %-46s  %-36s \n", "Name Label", "State", "Ref", "UUID"
+        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"
+        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['name_label'] =~ /control domain/i
-          printf "%-25s  %-12s  %46s  %36s \n", record['name_label'], record['power_state'], vm, record['uuid']
+          if locate_config_value(:id)
+            printf "%-25s  %-12s %-16s %46s  %36s \n", record['name_label'], record['power_state'], ip_address, vm, record['uuid']
+          else 
+            printf "%-25s  %-12s %-16s\n", record['name_label'], record['power_state'], ip_address
+          end
         end
       end
 

data/lib/knife-xapi/version.rb

@@ -1,3 +1,3 @@
 module KnifeXenserver
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-xapi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors: