knife-cloudstack 0.0.13 → 0.0.14

data/lib/chef/knife/cs_server_delete.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,50 +18,24 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
 
 module KnifeCloudstack
   class CsServerDelete < 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 delete 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_project,
-           :short => "-P PROJECT_NAME",
-           :long => '--cloudstack-project PROJECT_NAME',
-           :description => "Cloudstack Project in which to create server",
-           :proc => Proc.new { |v| Chef::Config[:knife][:cloudstack_project] = v },
-           :default => nil
-
-    option :use_http_ssl,
-          :long => '--[no-]use-http-ssl',
-          :description => 'Support HTTPS',
-          :boolean => true,
-          :default => true
-
     def run
+      validate_base_options
 
       @name_args.each do |hostname|
         server = connection.get_server(hostname)
@@ -74,31 +50,62 @@ 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 delete this server")
-
-        print "#{ui.color("Waiting for deletion", :magenta)}"
-        disassociate_virtual_ip_address server
-        connection.delete_server hostname
-        puts "\n"
-        ui.msg("Deleted server #{hostname}")
-
-        # delete chef client and node
-        node_name = connection.get_server_fqdn server
-        ui.confirm("Do you want to delete the chef node and client '#{node_name}")
-        delete_node node_name
-        delete_client node_name
+        rules = connection.list_port_forwarding_rules
+
+        show_object_details(server, connection, rules)
+
+        result = confirm_action("Do you really want to delete this server")
+        if result
+          print "#{ui.color("Waiting for deletion", :magenta)}"
+          disassociate_virtual_ip_address server
+          connection.delete_server hostname
+          puts "\n"
+          ui.msg("Deleted server #{hostname}")
+
+          # delete chef client and node
+          node_name = connection.get_server_fqdn server
+          delete_chef = confirm_action("Do you want to delete the chef node and client '#{node_name}")
+          if delete_chef
+            delete_node node_name
+            delete_client node_name
+          end
+
+        end
       end
+    end
 
+    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 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 disassociate_virtual_ip_address(server)
@@ -135,29 +142,5 @@ module KnifeCloudstack
       ui.msg "Deleted node #{name}"
     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),
-            locate_config_value(:cloudstack_project),
-            locate_config_value(:use_http_ssl)
-        )
-      end
-      @connection
-    end
-
-    def msg(label, value)
-      if value && !value.empty?
-        puts "#{ui.color(label, :cyan)}: #{value}"
-      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_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,92 +18,169 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
+require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsServerList < 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 server 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 :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_project,
-           :short => "-P PROJECT_NAME",
-           :long => '--cloudstack-project PROJECT_NAME',
-           :description => "Cloudstack Project in which to create server",
-           :proc => Proc.new { |v| Chef::Config[:knife][:cloudstack_project] = v },
-           :default => nil
-
-    option :use_http_ssl,
-          :long => '--[no-]use-http-ssl',
-          :description => 'Support HTTPS',
-          :boolean => true,
-          :default => true     
-    def run
+    option :listall,
+           :long => "--listall",
+           :description => "List all the accounts",
+           :boolean => true
 
-      $stdout.sync = true
+    option :name,
+           :long => "--name NAME",
+           :description => "Specify hostname to list"
 
-      connection = CloudstackClient::Connection.new(
-          locate_config_value(:cloudstack_url),
-          locate_config_value(:cloudstack_api_key),
-          locate_config_value(:cloudstack_secret_key),
-          locate_config_value(:cloudstack_project),
-          locate_config_value(:use_http_ssl)
-      )
+    option :keyword,
+           :long => "--keyword NAME",
+           :description => "Specify part of instancename to list"
 
-      server_list = [
+    option :action,
+           :short => "-a ACTION",
+           :long => "--action ACTION",
+           :description => "start, stop or destroy the instances in your result"
+
+    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('Public IP', :bold),
           ui.color('Service', :bold),
           ui.color('Template', :bold),
           ui.color('State', :bold),
+          ui.color('Instance', :bold),
           ui.color('Hypervisor', :bold)
-      ]
+        ]
+      end
 
-      servers = connection.list_servers
-      rules = connection.list_port_forwarding_rules
+      columns = object_list.count
+      object_list = [] if locate_config_value(:noheader)
+
+      connection_result = connection.list_object(
+        "listVirtualMachines",
+        "virtualmachine",
+        locate_config_value(:filter),
+        locate_config_value(:listall),
+        locate_config_value(:keyword),
+        locate_config_value(:name)
+      )
+
+      output_format(connection_result)
 
-      servers.each do |server|
+      rules = connection.list_port_forwarding_rules
 
-        name = server['name']
-        display_name = server['displayname']
+      connection_result.each do |r|
+        name = r['name']
+        display_name = r['displayname']
         if display_name && !display_name.empty? && display_name != name
           name << " (#{display_name})"
         end
-        server_list << server['name']
-        server_list << (connection.get_server_public_ip(server, rules) || '')
-        server_list << server['serviceofferingname']
-        server_list << server['templatename']
-        server_list << server['state']
-        server_list << (server['hostname'] || 'N/A')
+
+        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']
+          object_list << (connection.get_server_public_ip(r, rules) || '')
+          object_list << r['serviceofferingname']
+          object_list << r['templatename']
+          object_list << r['state']
+          object_list << (r['instancename'] || 'N/A')
+          object_list << (r['hostname'] || 'N/A')
+        end
       end
-      puts ui.list(server_list, :columns_across, 6)
 
+      puts ui.list(object_list, :uneven_columns_across, columns)
+      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+
+      ## 
+      # Executing actions against the list results that are returned.
+
+      if locate_config_value(:action)
+        connection_result.each do |r|
+          hostname = r['name'] 
+          case locate_config_value(:action).downcase
+          when "start" then
+            show_object_details(r, connection, rules)
+            result = confirm_action("Do you really want to start this server ")
+            if result then 
+              print "#{ui.color("Waiting for startup", :magenta)}"
+	      connection.start_server(hostname)
+              puts "\n"
+              ui.msg("Started server #{hostname}")
+            end 
+          when "stop" then 
+            show_object_details(r, connection, rules)
+            result = confirm_action("Do you really want to stop this server ")
+            if result then 
+              print "#{ui.color("Waiting for shutdown", :magenta)}"
+              connection.stop_server(hostname)
+              puts "\n"
+              ui.msg("Shutdown server #{hostname}")
+            end 
+          when "destroy" then 
+            show_object_details(r, connection, rules)
+            result = confirm_action("Do you really want to destroy this server ")
+            if result then
+              print "#{ui.color("Waiting for demolition", :magenta)}"
+              connection.delete_server(hostname)
+              puts "\n"
+              ui.msg("Destroyed server #{hostname}")
+            end
+          end
+        end
+      end
+    end
+  
+    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 locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
+    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
 
   end

data/lib/chef/knife/cs_server_reboot.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,38 +19,25 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/cs_base'
 
 module KnifeCloudstack
   class CsServerReboot < 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 reboot 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 reboot this server")
-        print "#{ui.color("Rebooting", :magenta)}"
-
-        connection.reboot_server(hostname)
-        puts "\n"
-        ui.msg("Rebooted server #{hostname}")
+        rules = connection.list_port_forwarding_rules
+ 
+        show_object_details(server, connection, rules)
+
+        result = confirm_action("Do you really want to reboot this server")
+ 
+        if result
+          print "#{ui.color("Rebooting", :magenta)}"
+          connection.reboot_server(hostname)
+          puts "\n"
+          ui.msg("Rebooted 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