cloudstack-cli 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.3.5)
+    cloudstack-cli (0.3.8)
       thor (~> 0.18.1)
 
 GEM

data/lib/cloudstack-cli/base.rb

@@ -26,7 +26,7 @@ module CloudstackCli
           @config[:url],
           @config[:api_key],
           @config[:secret_key],
-          opts
+          opts.merge({debug: options[:debug]})
         )
       end
 

data/lib/cloudstack-cli/cli.rb

@@ -14,6 +14,10 @@ module CloudstackCli
       aliases: '-e',
       desc: 'environment to load from the configuration file'
 
+    class_option :debug,
+      desc: 'enable debug output',
+      type: :boolean
+
     desc "version", "outputs the cloudstack-cli version"
     def version
       say "cloudstack-cli v#{CloudstackCli::VERSION}"
@@ -78,6 +82,9 @@ module CloudstackCli
     desc "cluster SUBCOMMAND ...ARGS", "List clusters"
     subcommand "cluster", Cluster
 
+    desc "host SUBCOMMAND ...ARGS", "List hosts"
+    subcommand "host", Host
+
     desc "project SUBCOMMAND ...ARGS", "Manage servers"
     subcommand "project", Project
 

data/lib/cloudstack-cli/commands/host.rb

@@ -0,0 +1,20 @@
+class Host < CloudstackCli::Base
+
+  desc 'list', 'list hosts'
+  option :zone
+  def list
+    hosts = client.list_hosts(options)
+    if hosts.size < 1
+      say "No hosts found."
+    else
+      table = [["Zone", "Type", "Cluster", "Name"]]
+      hosts.each do |host|
+        table << [
+        	host['zonename'], host['type'], host['clustername'], host['name']
+        ]
+      end
+      print_table table
+    end
+  end
+
+end

data/lib/cloudstack-cli/commands/iso.rb

@@ -1,19 +1,19 @@
 class Iso < CloudstackCli::Base
 
-  desc 'list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community]"
+  desc 'list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community], default is featured"
   option :project
   option :zone
   option :account
   option :listall
   def list(type='featured')
     project = find_project if options[:project]
-    unless %w(featured self self-executable executable community).include? type
+    unless %w(featured self self-executable executable community).include?(type)
       say "unsupported iso type '#{type}'", :red
       exit 1
     end
     zone = client.get_zone(options[:zone]) if options[:zone]
     isos = client.list_isos(
-      type: type,
+      filter: type,
       project_id: project ? project['id'] : nil,
       zone_id: zone ? zone['id'] : nil
     )

data/lib/cloudstack-cli/commands/network.rb

@@ -20,6 +20,27 @@ class Network < CloudstackCli::Base
     end
   end
 
+  desc "show NAME", "show detailed infos about a network"
+  option :project
+  def show(name)
+    if options[:project]
+      if options[:project].downcase == "all"
+        options[:project_id] = -1
+      else
+        project = find_project
+        options[:project_id] = project['id']
+      end
+    end
+    unless server = client.get_network(name, options[:project_id])
+      puts "No network found."
+    else
+      server.each do |key, value|
+        say "#{key}: ", :yellow
+        say "#{value}"
+      end
+    end
+  end
+
   desc "list", "list networks"
   option :project
   option :account
@@ -58,14 +79,29 @@ class Network < CloudstackCli::Base
     end
   end
 
+  desc "restart NAME", "restart network"
+  option :cleanup, type: :boolean, default: true
+  def restart(name)
+    network = client.get_network(name)
+    network = client.get_network(name, -1) unless network
+    unless network
+      say "Network #{name} not found."
+      exit 1
+    end
+    if yes? "Restart network \"#{network['name']}\" (cleanup=#{options[:cleanup]})?"
+      p client.restart_network(network['id'], options[:cleanup])
+    end
+  end
+
   desc "delete NAME", "delete network"
   def delete(name)
-    network = client.get_network(name, -1)
+    network = client.get_network(name)
+    network = client.get_network(name, -1) unless network
     unless network
-      say "Network #{name} not found."
+      say "Network \"#{name}\" not found."
       exit 1
     end
-    if yes? "Destroy network #{network['name']} - #{network['name']}?"
+    if yes? "Destroy network \"#{network['name']}\"?"
       p client.delete_network(network['id'])
     end
   end

data/lib/cloudstack-cli/commands/project.rb

@@ -1,5 +1,18 @@
 class Project < CloudstackCli::Base
 
+  desc "show NAME", "show detailed infos about a project"
+  option :project
+  def show(name)
+    unless project = client.get_project(name)
+      puts "No project with name #{name} found."
+    else
+      project.each do |key, value|
+        say "#{key}: ", :yellow
+        say "#{value}"
+      end
+    end
+  end
+
   desc "list", "list projects"
   def list
     projects = client.list_projects

data/lib/cloudstack-cli/commands/server.rb

@@ -31,9 +31,9 @@ class Server < CloudstackCli::Base
     end
   end
 
-  desc "info NAME", "show detailed infos about a server"
+  desc "show NAME", "show detailed infos about a server"
   option :project
-  def info(name)
+  def show(name)
     if options[:project]
       if options[:project].downcase == "all"
         options[:project_id] = -1

data/lib/cloudstack-cli/commands/template.rb

@@ -1,6 +1,6 @@
 class Template < CloudstackCli::Base
 
-  desc 'list [TYPE]', 'list templates by type [featured|self|self-executable|executable|community]' 
+  desc 'list [TYPE]', 'list templates by type [featured|self|self-executable|executable|community], default is featured' 
   option :project
   option :zone
   def list(type='featured')
@@ -11,7 +11,7 @@ class Template < CloudstackCli::Base
     end
     zone = client.get_zone(options[:zone]) if options[:zone]
     templates = client.list_templates(
-      type: type,
+      filter: type,
       project_id: project ? project['id'] : nil,
       zone_id: zone ? zone['id'] : nil
     )

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/lib/cloudstack-client/client.rb

@@ -28,6 +28,7 @@ module CloudstackClient
       @secret_key = secret_key
       @use_ssl = api_url.start_with? "https"
       @verbose = opts[:quiet] ? false : true
+      @debug = opts[:debug] ? true : false
     end
 
     ##
@@ -44,6 +45,9 @@ module CloudstackClient
       params.sort.each { |elem|
         params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s).gsub('+', '%20').gsub(' ','%20')
       }
+
+      debug_output JSON.pretty_generate(params) if @debug
+
       data = params_arr.join('&')
       signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
       signature = Base64.encode64(signature).chomp
@@ -118,5 +122,15 @@ module CloudstackClient
       exit 1
     end
 
+    private
+
+    def debug_output(output, seperator = '-' * 80)
+      puts
+      puts seperator 
+      puts output
+      puts seperator
+      puts
+    end
+
   end # class
 end

data/lib/cloudstack-client/commands/host.rb

@@ -0,0 +1,28 @@
+module CloudstackClient
+
+	module Host
+
+		##
+    # Lists hosts.
+
+    def list_hosts(args = {})
+      params = {
+        'command' => 'listHosts'
+      }
+
+      if args[:zone]
+        zone = get_zone(args[:zone])
+        unless zone
+          puts "Error: zone #{args[:project]} not found."
+          exit 1
+        end
+        params['zoneid'] = zone['id']
+      end
+
+      json = send_request(params)
+      json['host'] || []
+    end
+
+	end
+
+end

data/lib/cloudstack-client/commands/iso.rb

@@ -17,7 +17,7 @@ module CloudstackClient
       filter = args[:filter] || 'featured'
       params = {
           'command' => 'listIsos',
-          'isoFilter' => filter
+          'isofilter' => filter
       }
       params['projectid'] = args[:project_id] if args[:project_id]
       params['zoneid'] = args[:zone_id] if args[:zone_id]

data/lib/cloudstack-client/commands/network.rb

@@ -99,6 +99,19 @@ module CloudstackClient
       json['network']
     end
 
+    ##
+    # Restart network.
+
+    def restart_network(id, cleanup = false)
+      params = {
+        'command' => 'restartNetwork',
+        'id' => id,
+        'cleanup' => cleanup,
+      }
+      p json = send_async_request(params)
+      json['network']
+    end
+
     ##
     # Lists all physical networks.
 

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -81,6 +81,7 @@ files:
 - lib/cloudstack-cli/commands/cluster.rb
 - lib/cloudstack-cli/commands/disk_offering.rb
 - lib/cloudstack-cli/commands/domain.rb
+- lib/cloudstack-cli/commands/host.rb
 - lib/cloudstack-cli/commands/ip_address.rb
 - lib/cloudstack-cli/commands/iso.rb
 - lib/cloudstack-cli/commands/job.rb
@@ -108,6 +109,7 @@ files:
 - lib/cloudstack-client/commands/cluster.rb
 - lib/cloudstack-client/commands/disk_offering.rb
 - lib/cloudstack-client/commands/domain.rb
+- lib/cloudstack-client/commands/host.rb
 - lib/cloudstack-client/commands/ip_address.rb
 - lib/cloudstack-client/commands/iso.rb
 - lib/cloudstack-client/commands/job.rb