knife-cloudstack 0.0.15 → 0.0.16

data/lib/chef/knife/cs_volume_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 CsVolumeList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs volume list (options)"
 
     option :listall,
@@ -48,46 +42,23 @@ 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('Account', :bold) unless locate_config_value(:cloudstack_project)
-        object_list << ui.color('Domain', :bold)
-        object_list << ui.color('State', :bold)
-        object_list << ui.color('VMName', :bold)
-        object_list << ui.color('VMState', :bold)
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listVolumes",
-        "volume",
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
+      columns = [
+        'Name    :name',
+        'Account :account',
+        'Domain  :domain',
+        'State   :state',
+        'VMName  :vmname',
+        'VMState :vmstate'
+      ]
 
-      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'].to_s unless locate_config_value(:cloudstack_project)
-          object_list << r['domain'].to_s
-          object_list << r['state'].to_s
-          object_list << r['vmname'].to_s
-          object_list << r['vmstate'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      params = { 'command' => "listVolumes" }
+      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)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
+      result = connection.list_object(params, "volume")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_zone_list.rb

@@ -18,79 +18,35 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsZoneList < 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 zone list (options)"
 
     option :keyword,
            :long => "--keyword KEY",
            :description => "List by keyword"
 
-    option :index,
-           :long => "--index",
-           :description => "Add index numbers to the output",
-           :boolean => true
-
     def run
       validate_base_options
 
-      object_list = []
-      object_list << ui.color('Index', :bold) if locate_config_value(:index)
-
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        [
- 	  ui.color('Name', :bold),
-          ui.color('Network Type', :bold),
-          ui.color('Security Groups', :bold)
-        ].each { |field| object_list << field }
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listZones",
-        "zone", 
-        locate_config_value(:filter),
-	false,
-        locate_config_value(:keyword)
-      )
-
-      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['networktype'].to_s
-          object_list << r['securitygroupsenabled'].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',
+        'Network Type    :networktype',
+        'Security Groups :securitygroupsenabled'
+      ]
+
+      params = { 'command' => "listZones" }
+      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, "zone")
+      list_object(columns, result)
     end
 
   end

data/lib/knife-cloudstack/connection.rb

@@ -147,17 +147,12 @@ module CloudstackClient
     ##
     # List all the objects based on the command that is specified.
 
-    def list_object(command, json_result, filter=nil, listall=nil, keyword=nil, name=nil, params={})
-      params['command'] = command
-      params['listall'] = true if listall || name || keyword unless listall == false
-      params['keyword'] = keyword if keyword
-      params['name'] = name if name
-
+    def list_object(params, json_result)
       json = send_request(params)
       Chef::Log.debug("JSON (list_object) result: #{json}")
 
       result = json["#{json_result}"] || []
-      result = data_filter(result, filter) if filter
+      result = data_filter(result, params['filter']) if params['filter']
       result
     end
 
@@ -191,8 +186,10 @@ module CloudstackClient
       end
 
       template = get_template(template_name, zone_name)
+      template = get_iso(template_name, zone_name) unless template
+
       if !template then
-        puts "Error: Template '#{template_name}' is invalid"
+        puts "Error: Template / ISO name: '#{template_name}' is invalid"
         exit 1
       end
 
@@ -246,7 +243,7 @@ module CloudstackClient
             'networkids' => network_ids.join(',')
         }
 
-      elsif
+      else
 
         params = {
             'command' => 'deployVirtualMachine',
@@ -427,6 +424,34 @@ module CloudstackClient
       nil
     end
 
+    ##
+    # Finds the iso with the specified name.
+
+    def get_iso(name, zone_name=nil)
+      zone = zone_name ? get_zone(zone_name) : get_default_zone
+
+      params = {
+          'command' => 'listIsos',
+          'isoFilter' => 'executable',
+      }
+      params['zoneid'] = zone['id'] if zone
+
+      json = send_request(params)
+      iso = json['iso']
+      return nil unless iso
+
+      iso.each { |i|
+        if name.is_uuid? then
+          return i if i['id'] == name
+        else
+          return i if i['name'] == name
+        end
+      }
+      nil
+    end
+
+
+
     ##
     # Finds the disk offering with the specified name.
 
@@ -587,6 +612,32 @@ module CloudstackClient
       nil
     end
 
+    def add_nic_to_vm(network_id, server_id, ipaddr=nil)
+      params = {
+        'command' => 'addNicToVirtualMachine',
+        'networkid' => network_id,
+        'virtualmachineid' => server_id,
+      }
+
+      unless ipaddr.nil?
+        params['ipaddress'] = ipaddr
+      end
+
+      json = send_async_request(params)
+      json['virtualmachine']
+    end
+
+    def remove_nic_from_vm(nic_id, server_id)
+      params = {
+        'command' => 'removeNicFromVirtualMachine',
+        'nicid' => nic_id,
+        'virtualmachineid' => server_id,
+      }
+
+      json = send_async_request(params)
+      json['virtualmachine']
+    end
+
     ##
     # Finds the default zone for your account.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -83,6 +83,7 @@ files:
 - lib/chef/knife/cs_server_stop.rb
 - lib/chef/knife/cs_publicip_list.rb
 - lib/chef/knife/cs_pod_list.rb
+- lib/chef/knife/cs_aag_list.rb
 - lib/chef/knife/cs_cluster_list.rb
 - lib/chef/knife/cs_server_reboot.rb
 - lib/chef/knife/cs_base.rb
@@ -100,8 +101,10 @@ files:
 - lib/chef/knife/cs_server_list.rb
 - lib/chef/knife/cs_stack_delete.rb
 - lib/chef/knife/cs_account_list.rb
+- lib/chef/knife/cs_server_remove_nic.rb
 - lib/chef/knife/cs_server_delete.rb
 - lib/chef/knife/cs_domain_list.rb
+- lib/chef/knife/cs_server_add_nic.rb
 - lib/chef/knife/cs_keypair_list.rb
 - lib/chef/knife/cs_project_list.rb
 - lib/chef/knife/cs_ostype_list.rb
@@ -131,4 +134,3 @@ signing_key:
 specification_version: 3
 summary: A knife plugin for the CloudStack API
 test_files: []
-has_rdoc: true