knife-cloudstack 0.0.15 → 0.0.16

data/lib/chef/knife/cs_domain_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsDomainList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
-
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
+    
     banner "knife cs domain list (options)"
 
     option :listall,
@@ -40,43 +34,19 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold),
-          ui.color('Level', :bold),
-          ui.color('Path', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listDomains",
-        "domain", 
-        locate_config_value(:filter),
-        locate_config_value(:listall)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['id'].to_s
-          object_list << r['level'].to_s
-          object_list << r['path'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name  :name',
+        'ID    :id',
+        'Level :level',
+        'Path  :path'
+      ]
+
+      params = { 'command' => "listDomains" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      
+      result = connection.list_object(params, "domain")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_firewallrule_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsFirewallruleList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs firewallrule list (options)"
 
     option :listall,
@@ -44,51 +38,24 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('ID', :bold),
-          ui.color('Protocol', :bold),
-          ui.color('Start Port', :bold),
-          ui.color('End Port', :bold),
-          ui.color('IP AddressID', :bold),
-          ui.color('IP Address', :bold),
-          ui.color('State', :bold),
-          ui.color('CIDR List', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listFirewallRules",
-        "firewallrule",
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['id'].to_s
-          object_list << r['protocol'].to_s
-          object_list << r['startport'].to_s
-          object_list << r['endport'].to_s
-          object_list << r['ipaddressid'].to_s
-          object_list << r['ipaddress'].to_s
-          object_list << r['state'].to_s
-          object_list << r['cidrlist'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'ID           :id',
+        'Protocol     :protocol',
+        'Start Port   :startport',
+        'End Port     :endport',
+        'IP AddressID :ipaddressid',
+        'IP Address   :ipaddress',
+        'State        :state',
+        'CIDR List    :cidrlist'
+      ]
+
+      params = { 'command' => "listFirewallRules" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      
+      result = connection.list_object(params, "firewallrule")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_host_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsHostList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs host list (options)"
 
     option :name,
@@ -43,52 +37,24 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Name', :bold),
-          ui.color('Address', :bold),
-          ui.color('State', :bold),
-          ui.color('Type', :bold),
-          ui.color('Cluster', :bold),
-          ui.color('Pod', :bold),
-          ui.color('Zone', :bold),
-          ui.color('Resource', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listHosts",
-        "host",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-        if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['ipaddress'].to_s
-          object_list << r['state'].to_s
-          object_list << r['type'].to_s
-          object_list << r['clustername'].to_s
-          object_list << r['podname'].to_s
-          object_list << r['zonename'].to_s
-          object_list << r['resourcestate'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name     :name',
+        'Address  :ipaddress',
+        'State    :state',
+        'Type     :type',
+        'Cluster  :clustername',
+        'Pod      :podname',
+        'Zone     :zonename',
+        'Resource :resourcestate'
+      ]
+
+      params = { 'command' => "listHosts" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
+      result = connection.list_object(params, "host")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_iso_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsIsoList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs iso list (options)"
 
     option :listall,
@@ -45,49 +39,41 @@ module KnifeCloudstack
            :long => "--keyword KEY",
            :description => "List by keyword"
 
+    option :isofilter,
+           :long => "--isofilter FILTER",
+           :description => "Default: 'featured'. Options: 'self','selfexecutable','sharedexecutable','executable','community'",
+           :default => "featured"
+
     def run
       validate_base_options
 
-      object_list = []
-      if locate_config_value(:fields)
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
+      columns = [
+        'Name    :name',
+        'Account :account',
+        'Domain  :domain',
+        'Public  :ispublic',
+        'Size    :size',
+        'OS      :ostypename'
+      ]
+
+      params = { 'command' => "listIsos" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+
+      if ['all','featured','self','selfexecutable','sharedexecutable','executable','community'].include?(locate_config_value(:templatefilter))
+        params['isofilter'] = locate_config_value(:isofilter)
       else
-        object_list << ui.color('Name', :bold)
-        object_list << ui.color('Account', :bold) unless locate_config_value(:cloudstack_project)
-        object_list << ui.color('Domain', :bold)
-        object_list << ui.color('Public', :bold)
-        object_list << ui.color('Size', :bold)
-        object_list << ui.color('OS', :bold)
+        params['isofilter'] = 'featured'
       end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listIsos",
-        "iso",
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << (r['account'] ? r['account'].to_s : 'N/A') unless locate_config_value(:cloudstack_project)
-          object_list << r['domain'].to_s
-          object_list << r['ispublic'].to_s
-          object_list << (r['size'] ? human_file_size(r['size']) : 'Unknown')
-          object_list << (r['ostypename'] ? r['ostypename'].to_s : 'N/A')
-        end
+ 
+      result = connection.list_object(params, "iso")
+      result.each do |r|
+        r['size'] = human_file_size(r['size']) if r['size']
       end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      connection.show_object_fields(connection_result) if locate_config_value(:fieldlist)
+
+      list_object(columns, result)
     end
 
     def human_file_size n

data/lib/chef/knife/cs_keypair_list.rb

@@ -1,3 +1,4 @@
+#
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # Copyright:: Copyright (c) 2013 Sander Botman.
 # License:: Apache License, Version 2.0
@@ -15,68 +16,28 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsKeypairList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'chef/knife'
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs keypair list (options)"
 
     def run
       validate_base_options
-	
-      object_list = []
-      object_list << ui.color('Index', :bold) if locate_config_value(:index)
-
-      if locate_config_value(:fields)
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        [
-          ui.color('Name', :bold),
-          ui.color('Fingerprint', :bold),
-        ].each { |field| object_list << field }
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listSSHKeyPairs",
-        "sshkeypair",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
- 
-      index_num = 0
-      connection_result.each do |r|
-        if locate_config_value(:index)
-          index_num += 1
-          object_list << index_num.to_s
-        end
-
-        if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['fingerprint'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+  
+      columns = [
+        'Name        :name',
+        'Fingerprint :fingerprint'
+      ]
+
+      params = { 'command' => "listSSHKeyPairs" }
+      
+      result = connection.list_object(params, "sshkeypair")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_network_list.rb

@@ -17,21 +17,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/knife/cs_base'
+
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsNetworkList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      require 'chef/knife'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs network list (options)"
 
     option :listall,
@@ -46,49 +40,24 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      object_list = []
-      if locate_config_value(:fields)
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list << ui.color('Name', :bold)
-        object_list << ui.color('Type', :bold)
-        object_list << ui.color('Default', :bold)
-        object_list << ui.color('Shared', :bold)
-        object_list << ui.color('Gateway', :bold)
-        object_list << ui.color('Netmask', :bold)
-        object_list << ui.color('Account', :bold) unless locate_config_value(:cloudstack_project)
-        object_list << ui.color('Domain', :bold)
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listNetworks",
-        "network",
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-        if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['type'].to_s
-          object_list << (r['isdefault'] ? r['isdefault'].to_s : 'false')
-          object_list << (r['isshared'] ? r['isshared'].to_s : 'false')
-          object_list << (r['gateway'] || '')
-          object_list << (r['netmask'] || '')
-          object_list << (r['account'] || '') unless locate_config_value(:cloudstack_project)
-          object_list << (r['domain'] || '')
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name    :name',
+        'Type    :type',
+        'Default :default',
+        'Shared  :shared',
+        'Gateway :gateway',
+        'Netmask :netmask',
+        'Account :account',
+        'Domain  :domain'
+      ]
+
+      params = { 'command' => "listNetworks" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      
+      result = connection.list_object(params, "network")
+      list_object(columns, result)
     end
   end
 end

data/lib/chef/knife/cs_oscategory_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsOscategoryList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs oscategory list (options)"
 
     option :keyword,
@@ -39,39 +33,17 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold),
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listOsCategories",
-        "oscategory",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['id'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name :name',
+        'ID   :id'
+      ]
+
+      params = { 'command' => "listOsCategories" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      
+      result = connection.list_object(params, "oscategory")
+      list_object(columns, result)
     end
 
   end