knife-cloudstack 0.0.13 → 0.0.14

data/lib/chef/knife/cs_server_start.rb

@@ -1,7 +1,9 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
 # Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
+# Copyright:: Copyright (c) 2013 Sander Botman.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,37 +19,24 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
 
 module KnifeCloudstack
   class CsServerStart < Chef::Knife
 
+    include Chef::Knife::KnifeCloudstackBase
+
     deps do
+      require 'chef/knife'
       require 'knife-cloudstack/connection'
       require 'chef/api_client'
+      Chef::Knife.load_deps
     end
 
     banner "knife cs server start SERVER_NAME [SERVER_NAME ...] (options)"
 
-    option :cloudstack_url,
-           :short => "-U URL",
-           :long => "--cloudstack-url URL",
-           :description => "The CloudStack endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:cloudstack_url] = url }
-
-    option :cloudstack_api_key,
-           :short => "-A KEY",
-           :long => "--cloudstack-api-key KEY",
-           :description => "Your CloudStack API key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_api_key] = key }
-
-    option :cloudstack_secret_key,
-           :short => "-K SECRET",
-           :long => "--cloudstack-secret-key SECRET",
-           :description => "Your CloudStack secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
-
     def run
+    validate_base_options
 
       @name_args.each do |hostname|
         server = connection.get_server(hostname)
@@ -57,47 +46,54 @@ module KnifeCloudstack
           next
         end
 
-        puts "\n"
-        msg("Name", server['name'])
-        msg("Public IP", connection.get_server_public_ip(server) || '?')
-        msg("Service", server['serviceofferingname'])
-        msg("Template", server['templatename'])
-        msg("Domain", server['domain'])
-        msg("Zone", server['zonename'])
-        msg("State", server['state'])
-
-        puts "\n"
-        ui.confirm("Do you really want to start this server")
-
-        print "#{ui.color("Waiting for startup", :magenta)}"
-        connection.start_server(hostname)
-        puts "\n"
-        ui.msg("Started server #{hostname}")
+        rules = connection.list_port_forwarding_rules
+       
+        show_object_details(server, connection, rules)
+
+        result = confirm_action("Do you really want to start this server")
+        if result
+          print "#{ui.color("Waiting for startup", :magenta)}"
+          connection.start_server(hostname)
+          puts "\n"
+          ui.msg("Started server #{hostname}")
+        end
       end
 
     end
 
-    def connection
-      unless @connection
-        @connection = CloudstackClient::Connection.new(
-            locate_config_value(:cloudstack_url),
-            locate_config_value(:cloudstack_api_key),
-            locate_config_value(:cloudstack_secret_key)
-        )
-      end
-      @connection
+    def show_object_details(s, connection, rules)
+      return if locate_config_value(:yes)
+
+      object_fields = []
+      object_fields << ui.color("Name:", :cyan)
+      object_fields << s['name'].to_s
+      object_fields << ui.color("Public IP:", :cyan)
+      object_fields << (connection.get_server_public_ip(s, rules) || '')
+      object_fields << ui.color("Service:", :cyan)
+      object_fields << s['serviceofferingname'].to_s
+      object_fields << ui.color("Template:", :cyan)
+      object_fields << s['templatename']
+      object_fields << ui.color("Domain:", :cyan)
+      object_fields << s['domain']
+      object_fields << ui.color("Zone:", :cyan)
+      object_fields << s['zonename']
+      object_fields << ui.color("State:", :cyan)
+      object_fields << s['state']
+
+      puts "\n"
+      puts ui.list(object_fields, :uneven_columns_across, 2)
+      puts "\n"
     end
 
-    def msg(label, value)
-      if value && !value.empty?
-        puts "#{ui.color(label, :cyan)}: #{value}"
+    def confirm_action(question)
+      return true if locate_config_value(:yes)
+      result = ui.ask_question(question, :default => "Y" )
+      if result == "Y" || result == "y" then
+        return true
+      else
+        return false
       end
     end
 
-    def locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
-    end
-
   end
 end

data/lib/chef/knife/cs_server_stop.rb

@@ -1,7 +1,9 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
 # Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
+# Copyright:: Copyright (c) 2013 Sander Botman.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,42 +19,29 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
 
 module KnifeCloudstack
   class CsServerStop < Chef::Knife
 
+    include Chef::Knife::KnifeCloudstackBase
+
     deps do
       require 'knife-cloudstack/connection'
       require 'chef/api_client'
+      require 'chef/knife'
+      Chef::Knife.load_deps
     end
 
     banner "knife cs server stop SERVER_NAME [SERVER_NAME ...] (options)"
 
-    option :cloudstack_url,
-           :short => "-U URL",
-           :long => "--cloudstack-url URL",
-           :description => "The CloudStack endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:cloudstack_url] = url }
-
-    option :cloudstack_api_key,
-           :short => "-A KEY",
-           :long => "--cloudstack-api-key KEY",
-           :description => "Your CloudStack API key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_api_key] = key }
-
-    option :cloudstack_secret_key,
-           :short => "-K SECRET",
-           :long => "--cloudstack-secret-key SECRET",
-           :description => "Your CloudStack secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
-
     option :cloudstack_force_stop,
            :long => "--force",
            :description => "Force stop the VM. The caller knows the VM is stopped.",
            :boolean => true
 
     def run
+      validate_base_options
 
       @name_args.each do |hostname|
         server = connection.get_server(hostname)
@@ -62,53 +51,63 @@ module KnifeCloudstack
           next
         end
 
-        puts "\n"
-        msg("Name", server['name'])
-        msg("Public IP", connection.get_server_public_ip(server) || '?')
-        msg("Service", server['serviceofferingname'])
-        msg("Template", server['templatename'])
-        msg("Domain", server['domain'])
-        msg("Zone", server['zonename'])
-        msg("State", server['state'])
+        rules = connection.list_port_forwarding_rules
+       
+        show_object_details(server, connection, rules) 
 
-        puts "\n"
         if config[:cloudstack_force_stop]
-          ui.confirm("Do you really want to force stop this server")
-          print "#{ui.color("Forcefully stopping", :magenta)}"
-          connection.stop_server(hostname,config[:cloudstack_force_stop])
+          result = confirm_action("Do you really want to force stop this server")
+          if result 
+            print "#{ui.color("Forcefully stopping", :magenta)}"
+            connection.stop_server(hostname,config[:cloudstack_force_stop])
+            puts "\n"
+            ui.msg("Stopped server #{hostname}")
+          end
         else
-          ui.confirm("Do you really want to stop this server")
-          print "#{ui.color("Stopping", :magenta)}"
-          connection.stop_server(hostname)
+          result = confirm_action("Do you really want to stop this server")
+          if result
+            print "#{ui.color("Stopping", :magenta)}"
+            connection.stop_server(hostname)
+            puts "\n"
+            ui.msg("Stopped server #{hostname}")
+          end 
         end
-
-        puts "\n"
-        ui.msg("Stopped server #{hostname}")
       end
-
     end
 
-    def connection
-      unless @connection
-        @connection = CloudstackClient::Connection.new(
-            locate_config_value(:cloudstack_url),
-            locate_config_value(:cloudstack_api_key),
-            locate_config_value(:cloudstack_secret_key)
-        )
-      end
-      @connection
+    def show_object_details(s, connection, rules)
+      return if locate_config_value(:yes)
+      
+      object_fields = []
+      object_fields << ui.color("Name:", :cyan)
+      object_fields << s['name'].to_s
+      object_fields << ui.color("Public IP:", :cyan)
+      object_fields << (connection.get_server_public_ip(s, rules) || '')
+      object_fields << ui.color("Service:", :cyan)
+      object_fields << s['serviceofferingname'].to_s
+      object_fields << ui.color("Template:", :cyan)
+      object_fields << s['templatename']
+      object_fields << ui.color("Domain:", :cyan)
+      object_fields << s['domain']
+      object_fields << ui.color("Zone:", :cyan)
+      object_fields << s['zonename']
+      object_fields << ui.color("State:", :cyan)
+      object_fields << s['state']
+
+      puts "\n"
+      puts ui.list(object_fields, :uneven_columns_across, 2)
+      puts "\n"
     end
 
-    def msg(label, value)
-      if value && !value.empty?
-        puts "#{ui.color(label, :cyan)}: #{value}"
+    def confirm_action(question)
+      return true if locate_config_value(:yes)
+      result = ui.ask_question(question, :default => "Y" )
+      if result == "Y" || result == "y" then
+        return true
+      else
+        return false
       end
     end
 
-    def locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
-    end
-
   end
 end

data/lib/chef/knife/cs_service_list.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
+# Copyright:: Copyright (c) 2013 Sander Botman.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,63 +18,87 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
+require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsServiceList < Chef::Knife
 
-    MEGABYTES = 1024 * 1024
+    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 service list (options)"
 
-    option :cloudstack_url,
-           :short => "-U URL",
-           :long => "--cloudstack-url URL",
-           :description => "The CloudStack endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:cloudstack_url] = url }
+    option :name,
+           :long => "--name NAME",
+           :description => "Specify servicename to list"
 
-    option :cloudstack_api_key,
-           :short => "-A KEY",
-           :long => "--cloudstack-api-key KEY",
-           :description => "Your CloudStack API key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_api_key] = key }
+    option :keyword,
+           :long => "--keyword NAME",
+           :description => "Specify part of servicename to list"
 
-    option :cloudstack_secret_key,
-           :short => "-K SECRET",
-           :long => "--cloudstack-secret-key SECRET",
-           :description => "Your CloudStack secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
+    option :index,
+           :long => "--index",
+           :description => "Add index numbers to the output",
+           :boolean => true
 
     def run
-
-      connection = CloudstackClient::Connection.new(
-          locate_config_value(:cloudstack_url),
-          locate_config_value(:cloudstack_api_key),
-          locate_config_value(:cloudstack_secret_key)
-      )
-
-      service_list = [
+      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('Memory', :bold),
           ui.color('CPUs', :bold),
           ui.color('CPU Speed', :bold),
           ui.color('Created', :bold)
-      ]
-
-      services = connection.list_service_offerings
-      services.each do |s|
-        service_list << s['name']
-        service_list << (human_memory(s['memory']) || 'Unknown')
-        service_list << s['cpunumber'].to_s
-        service_list << s['cpuspeed'].to_s + ' Mhz'
-        service_list << s['created']
+        ].each { |field| object_list << field }
       end
-      puts ui.list(service_list, :columns_across, 5)
 
+      columns = object_list.count
+      object_list = [] if locate_config_value(:noheader)
+
+      connection_result = connection.list_object(
+        "listServiceOfferings",
+        "serviceoffering",
+        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['memory'] ? human_memory(r['memory']) : 'Unknown')
+          object_list << r['cpunumber'].to_s
+          object_list << r['cpuspeed'].to_s + ' Mhz'
+          object_list << r['created']
+        end
+      end
+      puts ui.list(object_list, :uneven_columns_across, columns)
+      list_object_fields(connection_result) if locate_config_value(:fieldlist)
     end
 
     def human_memory n
@@ -81,12 +107,7 @@ module KnifeCloudstack
         n /= 1024.0
         count += 1
       end
-      format("%.2f", n) + %w(MB GB TB)[count]
-    end
-
-    def locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
+      format("%.0f", n) + %w(MB GB TB)[count]
     end
 
   end

data/lib/chef/knife/cs_stack_create.rb

@@ -16,8 +16,6 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-
 module KnifeCloudstack
   class CsStackCreate < Chef::Knife
 
@@ -31,6 +29,8 @@ module KnifeCloudstack
       require 'net/ssh'
       require 'net/ssh/multi'
       require 'knife-cloudstack/connection'
+      require 'chef/knife'
+      Chef::Knife.load_deps
       Chef::Knife::Ssh.load_deps
       Chef::Knife::NodeRunListRemove.load_deps
       KnifeCloudstack::CsServerCreate.load_deps