knife-cloudstack-fog 0.2.16 → 0.2.17

data/lib/chef/knife/cloudstack_server_list.rb

@@ -34,6 +34,14 @@ class Chef
              :long => "--state STATE",
              :description => "Limit responses to servers only of a given state. Possible values are 'running,' 'stopped,' 'starting,' 'pending,' 'shutting-down,' 'terminated,' and 'stopping.' Default provides servers in all states.",
              :default => "all"
+=begin
+    #Commented out as sorting of VM list is a work-in-progress             
+      option :sort,
+             :short => "-o TRUE/FALSE",
+             :long => "--sort TRUE/FALSE",
+             :description => "Enable or disable sorting by Zone ID then VM ID. Defaults to sorted.",
+             :default => true
+=end
              
       def print_servers(server_list,servers,options={})
         server = servers
@@ -45,6 +53,17 @@ class Chef
           server.reject!{|t| t['state'].downcase != state}
         end
         
+=begin
+    #Commented out as sorting of VM list is a work-in-progress
+        # Sorting to group by zone ID first, then VM ID
+        if vmsort = options[:sort]
+          sort1 = server.sort_by { |hsh| hsh["zoneid"] }
+          sorted = sort1.sort_by { |hsh| hsh["id"] }
+        else
+          sorted = server
+        end
+=end
+        
         server.each do |instance|
           server_list << instance['name'].to_s
           server_list << instance['displayname'].to_s
@@ -98,7 +117,8 @@ class Chef
         
         zoneid = locate_config_value(:zoneid)
         state = locate_config_value(:state)
-        
+        # vmsort = locate_config_value(:sort)
+                
         response = connection.list_virtual_machines['listvirtualmachinesresponse']
         if virtual_machines = response['virtualmachine']
           filters = {}

data/lib/chef/knife/cloudstack_template_list.rb

@@ -68,7 +68,12 @@ class Chef
           temp.reject!{|t| t['hypervisor'] != hypervisor}
         end
         
-        temp.each do |template|
+        # Sorting to group by zone ID first, then ID
+        
+        sort1 = temp.sort_by { |hsh| hsh["id"] }
+        sorted = sort1.sort_by { |hsh| hsh["zoneid"] }
+
+        sorted.each do |template|
           template_list << template['id'].to_s
           template['hypervisor'] = ' ' if template['hypervisor'].nil?
           template_list << template['hypervisor']
@@ -78,6 +83,7 @@ class Chef
           template_list << template_size.to_s
 
           template_list << template['zonename']
+          template_list << template['zoneid'].to_s
           template_list << template['name']
         end
       end
@@ -89,7 +95,8 @@ class Chef
           ui.color('ID', :bold),
           ui.color('Hypervisor', :bold),
           ui.color('Size (in GB)', :bold),
-          ui.color('Zone Location', :bold),
+          ui.color('Zone Name', :bold),
+          ui.color('Zone ID', :bold),
           ui.color('Name', :bold)          
         ]
         
@@ -110,7 +117,7 @@ class Chef
             
             print_templates(template_list,templates,filters)
           end
-          puts ui.list(template_list, :uneven_columns_across, 5)
+          puts ui.list(template_list, :uneven_columns_across, 6)
         end
         
       end

data/lib/knife-cloudstack-fog/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloudstack
-    VERSION = "0.2.16"
+    VERSION = "0.2.17"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudstack-fog
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement