cloudstack-cli 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad30d2392877c54e681e2e916aac9ee73078e956
-  data.tar.gz: 8becb1fb0bc315c5f7d450ce6db62b48a14c63ff
+  metadata.gz: 7554f6d7a5dc9ae9a56557edfb3a39b7b63778c1
+  data.tar.gz: db3d8020dc9497700d7a3e65594c5a8a35140a78
 SHA512:
-  metadata.gz: 4bd74f7c795a3edde19e4531b7925c3c8e39025db89639e85ad01bc9fd997ebeed105a3f89b7a5cedb0ce509147165019850b08ea376cbb3ffe9bf83d0690a4a
-  data.tar.gz: 79672ddb07f8e47bfb53c3c6b8d5c4c781d64e64fb513c4249145f18a5ff88d272839a982e5c8a064c240814fb3c91f9ab66c47a92eb114b1708f96e8bdbff33
+  metadata.gz: 15451bfd39437d023cba04e4da98424e1d7b66286647a538b4bb3c7c03335b00d47e16e32593a0e9f3180e76d6313ea460353bd270561af193720e89e4db93a8
+  data.tar.gz: a68d0d706ffa1e7a091eff9c8e540ea7cadaeaf4086042c2555f7bc24c306c9ef80ffbbb264269289cb856036a34787cbf96f1fc20e71060b0ac5da45824e487

data/Gemfile.lock

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

data/lib/cloudstack-cli/base.rb

@@ -4,6 +4,8 @@ require "yaml"
 module CloudstackCli  
   class Base < Thor
     include Thor::Actions
+    include CloudstackCli::Helper
+    
     attr_reader :config
 
     # catch control-c and exit
@@ -29,11 +31,15 @@ module CloudstackCli
       end
 
       def load_configuration(config_file = options[:config], env = options[:environment])
+        unless File.exists?(config_file)
+          say "Configuration file #{config_file} not found.", :red
+          say "Please run \'cs setup\' to create one."
+          exit 1
+        end
         begin
           config = YAML::load(IO.read(config_file))
         rescue
           error "Can't load configuration from file #{config_file}."
-          error "To create a new configuration file run \"cs setup\"."
           exit 1
         end
         if env

data/lib/cloudstack-cli/cli.rb

@@ -45,7 +45,6 @@ module CloudstackCli
           old_config = YAML::load(IO.read(file))
         rescue
           error "Can't load configuration from file #{config_file}."
-          error "To create a new configuration file run \"cs setup\"."
           exit 1
         end
         say "Warning: #{file} already exists.", :red
@@ -73,6 +72,12 @@ module CloudstackCli
     desc "zone SUBCOMMAND ...ARGS", "Manage zones"
     subcommand "zone", Zone
 
+    desc "pod SUBCOMMAND ...ARGS", "List pods"
+    subcommand "pod", Pod
+
+    desc "cluster SUBCOMMAND ...ARGS", "List clusters"
+    subcommand "cluster", Cluster
+
     desc "project SUBCOMMAND ...ARGS", "Manage servers"
     subcommand "project", Project
 
@@ -106,12 +111,18 @@ module CloudstackCli
     desc "volume SUBCOMMAND ...ARGS", "Manage volumes"
     subcommand "volume", Volume
 
+    desc "snapshot SUBCOMMAND ...ARGS", "Manage snapshots"
+    subcommand "snapshot", Snapshot
+
     desc "stack SUBCOMMAND ...ARGS", "Manage stacks"
     subcommand "stack", Stack
 
     desc "account SUBCOMMAND ...ARGS", "Manage accounts"
     subcommand "account", Account
 
+    desc "user SUBCOMMAND ...ARGS", "Manage users"
+    subcommand "user", User
+
     desc "domain SUBCOMMAND ...ARGS", "Manage domains"
     subcommand "domain", Domain
 
@@ -121,7 +132,13 @@ module CloudstackCli
     desc "capacity SUBCOMMAND ...ARGS", "Lists all the system wide capacities"
     subcommand "capacity", Capacity
 
-    desc "port_rules SUBCOMMAND ...ARGS", "Manage portforwarding rules"
+    desc "port_rule SUBCOMMAND ...ARGS", "Manage portforwarding rules"
     subcommand "port_rule", PortRule
+
+    desc "job SUBCOMMAND ...ARGS", "Display async jobs"
+    subcommand "job", Job
+
+    desc "ssh_key_pair SUBCOMMAND ...ARGS", "Manage ssh key pairs"
+    subcommand "ssh_key_pair", SshKeyPair
   end
 end

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

@@ -10,7 +10,7 @@ class Account < CloudstackCli::Base
   def list(name = nil)
     accounts = client.list_accounts({name: name})
     if accounts.size < 1
-      puts "No accounts found"
+      puts "No accounts found."
     else
       table = [["Name", "Type", "Domain"]]
       accounts.each do |account|

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

@@ -1,5 +1,5 @@
 class Capacity < CloudstackCli::Base
-	TYPES = {
+	CAPACITY_TYPES = {
 		0 => "Memory",
 		1 => "CPU",
 		2 => "Storage",
@@ -21,7 +21,7 @@ class Capacity < CloudstackCli::Base
     capacities.each do |c|
     	table << [
     		c['zonename'],
-    	 	TYPES[c['type']],
+    	 	CAPACITY_TYPES[c['type']],
     	 	c['capacityused'],
     	 	c['capacitytotal'],
     	 	"#{c['percentused']}%"

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

@@ -0,0 +1,20 @@
+class Cluster < CloudstackCli::Base
+
+  desc 'list', 'list clusters'
+  def list
+    clusters = client.list_clusters(options)
+    if clusters.size < 1
+      say "No clusters found."
+    else
+      table = [["Name", "Pod-Name", "Type", "Zone"]]
+      clusters.each do |cluster|
+        table << [
+        	cluster['name'], cluster['podname'],
+          cluster['hypervisortype'], cluster['zonename']
+        ]
+      end
+      print_table table
+    end
+  end
+
+end

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

@@ -5,7 +5,7 @@ class DiskOffering < CloudstackCli::Base
   def list
     offerings = client.list_disk_offerings(options[:domain])
     if offerings.size < 1
-      puts "No offerings found"
+      puts "No offerings found."
     else
       table = [["Name", "Displaytext", "Domain", "ID"]]
       offerings.each do |offering|

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

@@ -4,7 +4,7 @@ class Domain < CloudstackCli::Base
   def list(name = nil)
     domains = client.list_domains(name)
     if domains.size < 1
-      puts "No domains found"
+      puts "No domains found."
     else
       table = [["Name", "Path"]]
       domains.each do |domain|

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

@@ -2,7 +2,7 @@ class IpAddress < CloudstackCli::Base
 
   desc "release ID", "release public IP address"
   def release(id)
-    puts "OK" if client.disassociate_ip_address(id)
+    say("OK", :green) if client.disassociate_ip_address(id)
   end
 
   desc "assign NETWORK", "assign a public IP address"
@@ -24,10 +24,15 @@ class IpAddress < CloudstackCli::Base
   option :listall
   def list
   	table = [["Address", "Account", "Zone"]]
-  	client.list_public_ip_addresses(options).each do |address|
-  		table << [address["ipaddress"], address["account"], address["zonename"]]
-  	end
-  	print_table table
+    addresses = client.list_public_ip_addresses(options)
+    if addresses.size < 1
+      say "No ip addresses found."
+    else
+      addresses.each do |address|
+        table << [address["ipaddress"], address["account"], address["zonename"]]
+      end
+      print_table table
+    end
   end
 
 end

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

@@ -0,0 +1,30 @@
+class Job < CloudstackCli::Base
+
+  desc 'list', 'list async jobs'
+  def list
+    jobs = client.list_jobs()
+    if jobs.size < 1
+      say "No jobs found."
+    else
+      table = [["Command", "Created", "Status", "ID", "User ID"]]
+      jobs.each do |job|
+        table << [job['cmd'].split('.')[-1], job['created'], job['jobstatus'], job['jobid'], job['userid']]
+      end
+      print_table table
+    end
+  end
+
+  desc 'query ID', 'query async job'
+  def query(id)
+    job = client.query_job(id)
+    job.each do |key, value| 
+      say "#{key} : "
+      if value.is_a?(Hash)
+        value.each {|subkey, subvalue| say "   #{subkey} : #{subvalue}"}
+      else 
+        say(value)
+      end
+    end
+  end
+  
+end

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

@@ -8,7 +8,7 @@ class LoadBalancer < CloudstackCli::Base
       { project_name: project ? project['name'] : nil }
     )
     if rules.size < 1
-      puts "No load balancer rules found"
+      puts "No load balancer rules found."
     else
       table = [["Name", "Public-IP", "Public-Port"]]
       rules.each do |rule|

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

@@ -1,10 +1,5 @@
 class Network < CloudstackCli::Base
 
-  desc "create NAME", "create network"
-  def create(name)
-    # TODO
-  end
-
   desc "default", "get the default network"
   option :zone
   def default

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

@@ -5,7 +5,7 @@ class Offering < CloudstackCli::Base
   def list
     offerings = client.list_service_offerings(options[:domain])
     if offerings.size < 1
-      puts "No offerings found"
+      puts "No offerings found."
     else
       table = [["Name", "Displaytext", "Domain", "ID"]]
       offerings.each do |offering|

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

@@ -0,0 +1,20 @@
+class Pod < CloudstackCli::Base
+
+  desc 'list', 'list pods'
+  def list
+    pods = client.list_pods(options)
+    if pods.size < 1
+      say "No pods found."
+    else
+      table = [["Name", "Start-IP", "End-IP", "Zone"]]
+      pods.each do |pod|
+        table << [
+        	pod['name'], pod['startip'],
+          pod['endip'], pod['zonename']
+        ]
+      end
+      print_table table
+    end
+  end
+
+end

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

@@ -4,7 +4,7 @@ class Project < CloudstackCli::Base
   def list
     projects = client.list_projects
     if projects.size < 1
-      puts "No projects found"
+      puts "No projects found."
     else
       table = [["Name", "Displaytext", "Domain"]]
       projects.each do |project|

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

@@ -44,7 +44,7 @@ class Router < CloudstackCli::Base
 			say "No routers found."
 		else
 		  table = [[
-		  	'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'Linklocal IP', 'Status', 'ID'
+		  	'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'IP', 'Linklocal IP', 'Status', 'ID'
 		  ]]
 		  table[0].delete('ID') unless options[:showid]
       routers.each do |router|
@@ -54,6 +54,7 @@ class Router < CloudstackCli::Base
           router["account"],
           router["project"],
           router["redundantstate"],
+          router["nic"].first ? router["nic"].first['ipaddress'] : "",
           router["linklocalip"],
           router["state"],
           router["id"]
@@ -71,14 +72,14 @@ class Router < CloudstackCli::Base
 	  		exit unless yes?("Start the routers above? [y/N]:", :magenta)
 	  		routers.each do |router|
 	  			say "Start router #{router['name']}... "
-	  			say "job started ", :green if job = client.start_router(router['id'])
+	  			say "job started ", :green if job = client.start_router(router['id'], async: false)
 	  			say "(jobid: #{job['jobid']})"
 	  		end
 	  	when "stop"
 	  		exit unless yes?("Stop the routers above? [y/N]:", :magenta)
 	  		routers.each do |router|
 	  			say "Stop router #{router['name']}... "
-	  			say "job started ", :green if job = client.stop_router(router['id'])
+	  			say "job started ", :green if job = client.stop_router(router['id'], async: false)
 	  			say "(jobid: #{job['jobid']})"
 	  		end
 	  	else
@@ -88,22 +89,51 @@ class Router < CloudstackCli::Base
 	  end
   end
 
-  desc "stop ID", "stop virtual router"
-  def stop(id)
-  	exit unless yes?("Stop the router with ID #{id}?", :magenta)
-  	client.stop_router id
+  desc "stop NAME [NAME2 ..]", "stop virtual router(s)"
+  option :force, description: "stop without asking", type: :boolean, aliases: '-f'
+  def stop(*names)
+    jobs = []
+  	names.each do |name|
+  		router = get_router(name)
+  		exit unless options[:force] || yes?("Stop router #{router['name']}?", :magenta)
+  		jobs << {id: client.stop_router(router['id'], async: false)['jobid'], name: "Stop router #{name}"}
+  	end
+    puts
+    watch_jobs(jobs)
   end
 
-  desc "start ID", "start virtual router"
-  def start(id)
-  	exit unless yes?("Start the router with ID #{id}?", :magenta)
-  	client.start_router id
+  desc "start NAME [NAME2 ..]", "start virtual router(s)"
+  option :force, description: "start without asking", type: :boolean, aliases: '-f'
+  def start(*names)
+  	jobs = []
+    names.each do |name|
+      router = get_router(name)
+      exit unless options[:force] || yes?("Start router #{router['name']}?", :magenta)
+      jobs << {id: client.start_router(router['id'], async: false)['jobid'], name: "Start router #{name}"}
+    end
+    puts
+    watch_jobs(jobs)
   end
 
-  desc "destroy ID", "destroy virtual router"
-  def destroy(id)
-  	exit unless yes?("Destroy the router with ID #{id}?", :magenta)
-  	say "OK", :green if client.destroy_router(id)
+  desc "destroy NAME [NAME2 ..]", "destroy virtual router(s)"
+  option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
+  def destroy(*names)
+  	names.each do |name|
+  		router = get_router(name)
+  		exit unless options[:force] || yes?("Destroy router #{router['name']}?", :magenta)
+  		say "OK", :green if client.destroy_router(router['id'])
+  		puts
+  	end
+  end
+
+  no_commands do
+  	def get_router(name)
+  		unless router = client.get_router(name)
+  			say "Can't find router with name #{name}.", :red
+  			exit 1
+  		end
+  		router
+  	end
   end
 
 end

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

@@ -1,5 +1,4 @@
 class Server < CloudstackCli::Base
-  include CloudstackCli::Helper
 
   desc "list", "list servers"
   option :project
@@ -32,7 +31,7 @@ class Server < CloudstackCli::Base
     end
   end
 
-  desc "create NAME", "create a server"
+  desc "create NAME [NAME2 ...]", "create server(s)"
   option :template, aliases: '-t', desc: "name of the template"
   option :iso, desc: "name of the iso", desc: "name of the iso template"
   option :offering, aliases: '-o', required: true, desc: "computing offering name"
@@ -51,20 +50,19 @@ class Server < CloudstackCli::Base
     bootstrap_server(options.merge({name: name}))
   end
 
-  desc "destroy NAME [NAME2 ..]", "destroy a server"
+  desc "destroy NAME [NAME2 ..]", "destroy server(s)"
   option :project
   option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
-  def destroy(*name)
+  def destroy(*names)
     projectid = find_project['id'] if options[:project]
-
-    name.each do |server_name|
-      server = client.get_server(server_name, projectid)
+    names.each do |name|
+      server = client.get_server(name, projectid)
       unless server
-        say "Server #{server_name} not found.", :red
+        say "Server #{name} not found.", :red
       else
-        ask = "Destroy #{server_name} (#{server['state']})?"
-        if options[:force] == true || yes?(ask, :yellow)
-          say "destroying #{server_name} "
+        ask = "Destroy #{name} (#{server['state']})?"
+        if options[:force] || yes?(ask, :yellow)
+          say "destroying #{name} "
           client.destroy_server(server["id"])
           puts  
         end

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

@@ -0,0 +1,24 @@
+class Snapshot < CloudstackCli::Base
+
+  desc 'list', 'list snapshots'
+  option :account
+  option :project
+  option :domain
+  option :listall
+  def list
+    snapshots = client.list_snapshots(options)
+    if snapshots.size < 1
+      say "No snapshots found."
+    else
+      table = [["Account", "Name", "Volume", "Created", "Type"]]
+      snapshots.each do |snapshot|
+        table << [
+        	snapshot['account'], snapshot['name'], snapshot['volumename'],
+        	snapshot['created'], snapshot['snapshottype']
+        ]
+      end
+      print_table table
+    end
+  end
+
+end

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

@@ -0,0 +1,46 @@
+class SshKeyPair < CloudstackCli::Base
+
+  desc 'list', 'list ssh key pairs'
+  option :listall
+  option :account
+  option :project
+  def list
+    pairs = client.list_ssh_key_pairs(options)
+    if pairs.size < 1
+      say "No ssh key pairs found."
+    else
+      table = [["Name", "Fingerprint"]]
+      pairs.each do |pair|
+        table << [pair['name'], pair['fingerprint']]
+      end
+      print_table table
+    end
+  end
+
+  desc 'create NAME', 'create ssh key pair'
+  option :account
+  option :project
+  def create(name)
+    pair = client.create_ssh_key_pair(name, options)
+    say "Name : #{pair['name']}"
+    say "Fingerprint : #{pair['fingerprint']}"
+    say "Privatekey:"
+    say pair['privatekey']
+  end
+
+  desc 'delete NAME', 'delete ssh key pair'
+  option :account
+  option :project
+  option :force, aliases: '-f', desc: "delete without asking"
+  def delete(name)
+    if options[:force] || yes?("Delete ssh key pair #{name}?", :yellow)
+      if client.delete_ssh_key_pair(name, options)['success'] == "true"
+        say("OK", :green)
+      else
+        say("Failed", :red)
+        exit 1
+      end
+    end
+  end
+  
+end

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

@@ -1,5 +1,4 @@
 class Stack < CloudstackCli::Base
-	include CloudstackCli::Helper
 
 	desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)

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

@@ -0,0 +1,28 @@
+class User < CloudstackCli::Base
+
+  USER_TYPES = {
+    0 => 'user',
+    1 => 'domain-admin',
+    2 => 'admin'
+  }
+
+  desc 'list', 'list async jobs'
+  option :listall
+  option :account
+  def list
+    users = client.list_users(options)
+    if users.size < 1
+      say "No users found."
+    else
+      table = [["Account", "Type", "Name", "Email", "State", "Domain"]]
+      users.each do |user|
+        table << [
+          user['account'], USER_TYPES[user['accounttype']], "#{user['firstname']} #{user['lastname']}",
+          user['email'], user['state'], user['domain']
+        ]
+      end
+      print_table table
+    end
+  end
+  
+end

data/lib/cloudstack-cli/helper.rb

@@ -11,6 +11,36 @@ module CloudstackCli
       number < 0 ? 0 : number
     end
 
+    def get_async_job_status(ids)
+      ids.map do |id|
+        client.query_job(id)['jobstatus']
+      end
+    end
+
+    def watch_jobs(jobs)
+      chars = %w(| / - \\)
+      async_state = {0 => "running", 1 => "completed", 2 => "error"}
+      status = get_async_job_status(jobs.map {|job| job[:id]})
+      call = 0
+      while status.include?(0) do
+        status = call.modulo(40) == 0 ? get_async_job_status(jobs.map {|job| job[:id]}) : status
+        print ("\r" + "\e[A\e[K" * (status.size)) if call > 0
+
+        status.each_with_index do |job_status, i|
+          puts "#{jobs[i][:name]} : job #{async_state[job_status]}  #{chars[0]}"
+        end
+
+        sleep 0.1
+        chars.push chars.shift
+        call += 1
+      end
+      
+      print ("\r" + "\e[A\e[K" * (status.size))
+      status.each_with_index do |job_status, i|
+        puts "#{jobs[i][:name]} : job #{async_state[job_status]}"
+      end
+    end
+
     def bootstrap_server(args = {})
       if args[:project] && project = client(quiet: true).get_project(args[:project])
         project_id = project["id"]

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/cloudstack-client/client.rb

@@ -11,7 +11,7 @@ module CloudstackClient
   class Connection
 
     @@async_poll_interval = 2.0
-    @@async_timeout = 300
+    @@async_timeout = 400
 
     # include all commands
     Dir.glob(File.dirname(__FILE__) + "/commands/*.rb").each do |file| 
@@ -62,7 +62,7 @@ module CloudstackClient
         exit 1
       end
 
-      if !response.is_a?(Net::HTTPOK) then
+      if !response.is_a?(Net::HTTPOK)
         puts "Error #{response.code}: #{response.message}"
         puts JSON.pretty_generate(JSON.parse(response.body))
         puts "URL: #{url}"
@@ -99,9 +99,9 @@ module CloudstackClient
 
         print "." if @verbose
 
-        if status == 1 then
+        if status == 1
           return json['jobresult']
-        elsif status == 2 then
+        elsif status == 2
           puts
           puts "Request failed (#{json['jobresultcode']}): #{json['jobresult']}"
           exit 1

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

@@ -0,0 +1,19 @@
+module CloudstackClient
+
+	module Cluster
+
+		##
+    # Lists clusters.
+
+    def list_clusters(args = {})
+      params = {
+        'command' => 'listClusters',
+      }
+
+      json = send_request(params)
+      json['cluster'] || []
+    end
+
+	end
+
+end

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

@@ -12,6 +12,10 @@ module CloudstackClient
       }
       if args[:project]
         project = get_project(args[:project])
+        unless project
+          puts "Error: project #{args[:project]} not found."
+          exit 1
+        end
         params['projectid'] = project['id']
       end
       if args[:account]

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

@@ -0,0 +1,29 @@
+module CloudstackClient
+
+	module Job
+
+		##
+    # Retrieves the current status of asynchronous job.
+
+    def query_job(id)
+      params = {
+          'command' => 'queryAsyncJobResult',
+          'jobid' => id,
+      }
+      send_request(params)
+    end
+
+    ##
+    # Lists all pending asynchronous jobs for the account.
+
+    def list_jobs(opts = {})
+      params = {
+          'command' => 'listAsyncJobs'
+      }
+      params['listall'] = true if opts[:listall]
+      send_request(params)['asyncjobs']
+    end
+
+	end
+
+end

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

@@ -0,0 +1,19 @@
+module CloudstackClient
+
+	module Pod
+
+		##
+    # Lists pods.
+
+    def list_pods(args = {})
+      params = {
+        'command' => 'listPods',
+      }
+
+      json = send_request(params)
+      json['pod'] || []
+    end
+
+	end
+
+end

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

@@ -2,6 +2,20 @@ module CloudstackClient
 
 	module Router
 
+    ##
+    # Get a router with a given name.
+
+    def get_router(name)
+      params = {
+          'command' => 'listRouters',
+          'listall' => 'true',
+          'name' => name
+      }
+
+      json = send_request(params)
+      json['router'] ? json['router'].first : nil
+    end
+
 		##
     # Lists all virtual routers.
 
@@ -39,34 +53,34 @@ module CloudstackClient
     ##
     # Destroy virtual router.
 
-    def destroy_router(id, async = false)
+    def destroy_router(id, opts = {async: true})
       params = {
         'command' => 'destroyRouter',
         'id' => id
       }
-      async ? send_async_request(params) : send_request(params)
+      opts[:async] ? send_async_request(params)['router'] : send_request(params)
     end
 
     ##
     # Start virtual router.
 
-    def start_router(id, async = false)
+    def start_router(id, opts = {async: true})
       params = {
         'command' => 'startRouter',
         'id' => id
       }
-      async ? send_async_request(params) : send_request(params)
+      opts[:async] ? send_async_request(params)['router'] : send_request(params)
     end
 
     ##
     # Stop virtual router.
 
-    def stop_router(id, async = false)
+    def stop_router(id, opts = {async: true})
       params = {
         'command' => 'stopRouter',
         'id' => id
       }
-      async ? send_async_request(params) : send_request(params)
+      opts[:async] ? send_async_request(params)['router'] : send_request(params)
     end
 
 	end

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

@@ -0,0 +1,40 @@
+module CloudstackClient
+
+	module Snapshot
+
+		##
+    # Lists snapshots.
+
+    def list_snapshots(args = {})
+      params = {
+        'command' => 'listSnapshots',
+        'isrecursive' => 'true'
+      }
+      params['name'] = args[:name] if args[:name]
+
+      if args[:project]
+        project = get_project(args[:project])
+        unless project
+          puts "Error: project #{args[:project]} not found."
+          exit 1
+        end
+        params['projectid'] = project['id']
+      end
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      params['listall'] = args[:listall] if args[:listall]
+
+      json = send_request(params)
+      json['snapshot'] || []
+    end
+
+	end
+
+end

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

@@ -0,0 +1,105 @@
+module CloudstackClient
+
+	module SshKeyPair
+
+		##
+    # Lists ssh key pairs.
+    #
+
+    def list_ssh_key_pairs(args = {})
+      params = {
+          'command' => 'listSSHKeyPairs',
+          'isrecursive' => true
+      }
+      params['listall'] = true if args[:listall]
+      params['name'] = args[:name] if args[:name]
+      
+      if args[:project]
+        project = get_project(args[:project])
+        unless project
+          puts "Error: project #{args[:project]} not found."
+          exit 1
+        end
+        params['projectid'] = project['id']
+      end
+
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      
+      json = send_request(params)
+      json['sshkeypair'] || []
+    end
+
+    ##
+    # Create ssh key pairs.
+    #
+
+    def create_ssh_key_pair(name, args = {})
+      params = {
+          'command' => 'createSSHKeyPair',
+          'name' => name
+      }
+      if args[:project]
+        project = get_project(args[:project])
+        unless project
+          puts "Error: project #{args[:project]} not found."
+          exit 1
+        end
+        params['projectid'] = project['id']
+      end
+
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      
+      json = send_request(params)['keypair']
+    end
+
+    ##
+    # Delete ssh key pairs.
+    #
+
+    def delete_ssh_key_pair(name, args = {})
+      params = {
+          'command' => 'deleteSSHKeyPair',
+          'name' => name
+      }
+
+      if args[:project]
+        project = get_project(args[:project])
+        unless project
+          puts "Error: project #{args[:project]} not found."
+          exit 1
+        end
+        params['projectid'] = project['id']
+      end
+      
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      
+      json = send_request(params)
+    end
+
+	end
+
+end

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

@@ -0,0 +1,32 @@
+module CloudstackClient
+
+	module User
+
+		##
+    # Lists users.
+    #
+
+    def list_users(args = {})
+      params = {
+          'command' => 'listUsers',
+          'isrecursive' => true
+      }
+      params['listall'] = true if args[:listall]
+      
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      
+      json = send_request(params)
+      json['user'] || []
+    end
+
+	end
+
+end

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

@@ -0,0 +1,20 @@
+module CloudstackClient
+
+	module Volume
+
+		##
+    # Lists all volumes.
+
+    def list_volumes(project_id = nil)
+      params = {
+          'command' => 'listVolumes',
+          'listall' => true,
+      }
+      params['projectid'] = project_id if project_id
+      json = send_request(params)
+      json['network'] || []
+    end
+
+	end
+
+end

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -71,20 +71,26 @@ files:
 - lib/cloudstack-cli/cli.rb
 - lib/cloudstack-cli/commands/account.rb
 - lib/cloudstack-cli/commands/capacity.rb
+- lib/cloudstack-cli/commands/cluster.rb
 - lib/cloudstack-cli/commands/disk_offering.rb
 - lib/cloudstack-cli/commands/domain.rb
 - lib/cloudstack-cli/commands/ip_address.rb
 - lib/cloudstack-cli/commands/iso.rb
+- lib/cloudstack-cli/commands/job.rb
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
 - lib/cloudstack-cli/commands/offering.rb
 - lib/cloudstack-cli/commands/physical_network.rb
+- lib/cloudstack-cli/commands/pod.rb
 - lib/cloudstack-cli/commands/port_rule.rb
 - lib/cloudstack-cli/commands/project.rb
 - lib/cloudstack-cli/commands/router.rb
 - lib/cloudstack-cli/commands/server.rb
+- lib/cloudstack-cli/commands/snapshot.rb
+- lib/cloudstack-cli/commands/ssh_key_pairs.rb
 - lib/cloudstack-cli/commands/stack.rb
 - lib/cloudstack-cli/commands/template.rb
+- lib/cloudstack-cli/commands/user.rb
 - lib/cloudstack-cli/commands/volume.rb
 - lib/cloudstack-cli/commands/zone.rb
 - lib/cloudstack-cli/helper.rb
@@ -92,19 +98,25 @@ files:
 - lib/cloudstack-client/client.rb
 - lib/cloudstack-client/commands/account.rb
 - lib/cloudstack-client/commands/capacity.rb
-- lib/cloudstack-client/commands/command_template
+- lib/cloudstack-client/commands/cluster.rb
 - lib/cloudstack-client/commands/disk_offering.rb
 - lib/cloudstack-client/commands/domain.rb
 - lib/cloudstack-client/commands/ip_address.rb
 - lib/cloudstack-client/commands/iso.rb
+- lib/cloudstack-client/commands/job.rb
 - lib/cloudstack-client/commands/load_balancer_rule.rb
 - lib/cloudstack-client/commands/network.rb
+- lib/cloudstack-client/commands/pod.rb
 - lib/cloudstack-client/commands/port_forwarding_rule.rb
 - lib/cloudstack-client/commands/project.rb
 - lib/cloudstack-client/commands/router.rb
 - lib/cloudstack-client/commands/server.rb
 - lib/cloudstack-client/commands/service_offering.rb
+- lib/cloudstack-client/commands/snapshot.rb
+- lib/cloudstack-client/commands/ssh_key_pair.rb
 - lib/cloudstack-client/commands/template.rb
+- lib/cloudstack-client/commands/user.rb
+- lib/cloudstack-client/commands/volume.rb
 - lib/cloudstack-client/commands/volumes.rb
 - lib/cloudstack-client/commands/zone.rb
 - lib/cloudstack-client/version.rb

data/lib/cloudstack-client/commands/command_template

@@ -1,8 +0,0 @@
-module CloudstackClient
-
-	module Command
-
-
-	end
-
-end