cloudstack-cli 0.15.1 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7345dcbef6139ac587c38fb98f9225e19e0e63df
-  data.tar.gz: 56740cf452feeb2e9a823b9b0ad0db6397973c35
+  metadata.gz: abbccb8fdb7cb7d93fb79f33f58f53469e0763fd
+  data.tar.gz: 6e4e7df9e6d4f4cbe5e6d79ffa0497426801d0c5
 SHA512:
-  metadata.gz: e5259be78f9c2b6d3ebf34fe5c3cfa79f87d9c430d8a024c245130e33c744058725e11fb2e681b622fc34c889c9f26c08cdbeda2d138c3b7b01940c19e25902c
-  data.tar.gz: cab48f91652b1e8b6ef8d5345b735a41c1d5f300b49511ff3ff47f4fa27ad6c337bf3b0f11825a9ffcc7e8ee3939bca5febdc5be5354dadc83de79dbbb37ba15
+  metadata.gz: 48faa2904edaeb89a5dc81c7068b851ab1b99e241bdc2c836f30ac1dfaccdce608212cd6cc258fe3675dd8bb5fa58a3e3159b34d7649cfc2fd082423af724b22
+  data.tar.gz: 3ee41e41a2ab280d2dce91ad2f57eeeb16b362428729b98e47522f514cf743eb72fdbe5e2bd82d2d1c7b5999cfca0b3e9f5fb6807e79d72575b737d936bd3f5e

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git', branch: 'master'
+gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git'
 
 # Specify your gem's dependencies in cloudstack-cli.gemspec
 gemspec

data/Gemfile.lock

@@ -1,15 +1,14 @@
 GIT
   remote: git@github.com:niwo/cloudstack_client.git
-  revision: cc23ab7c336f0933d41ae3976fcac71e357b8b0d
-  branch: master
+  revision: b388af01e7403f65fc1ad5cd4c905a1f005afea3
   specs:
-    cloudstack_client (0.9.7)
+    cloudstack_client (1.0.0.rc1)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.14.1)
-      cloudstack_client (~> 0.9.7)
+    cloudstack-cli (1.0.0.rc1)
+      cloudstack_client (~> 1.0.0.rc1)
       thor (~> 0.19.1)
 
 GEM

data/cloudstack-cli.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{cloudstack-cli is a CloudStack API command line client written in Ruby.}
   gem.summary       = %q{cloudstack-cli CloudStack API client}
   gem.date          = Time.now.utc.strftime("%Y-%m-%d")
-  gem.homepage      = 'http://niwo.github.io/cloudstack-cli/'
+  gem.homepage      = 'http://github.com/niwo/cloudstack-cli'
   gem.license       = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'
@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.4')
 
   gem.add_dependency('thor', '~> 0.19.1')
-  gem.add_dependency('cloudstack_client', '~> 0.9.7')
+  gem.add_dependency('cloudstack_client', '~> 1.0.0.rc1')
 end

data/lib/cloudstack-cli/base.rb

@@ -6,6 +6,7 @@ module CloudstackCli
   class Base < Thor
     include Thor::Actions
     include CloudstackCli::Helper
+    include CloudstackCli::OptionResolver
 
     attr_reader :config
 
@@ -21,14 +22,15 @@ module CloudstackCli
     end
 
     no_commands do
-      def client(opts = {})
+      def client
         @config ||= load_configuration
-        @client ||= CloudstackClient::Connection.new(
+        @client ||= CloudstackClient::Client.new(
           @config[:url],
           @config[:api_key],
-          @config[:secret_key],
-          opts.merge({debug: options[:debug]})
+          @config[:secret_key]
         )
+        @client.debug = true if options[:debug]
+        @client
       end
 
       def load_configuration(config_file = options[:config_file], env = options[:env])
@@ -61,18 +63,6 @@ module CloudstackCli
         config
       end
 
-      def find_project(name = options[:project], allow_all = true)
-        return nil unless name
-        if allow_all && %w(ALL -1).include?(name)
-          return {'id' => '-1'}
-        end
-        unless project = client.get_project(name)
-          say "Project '#{name}' not found", :red
-          exit 1
-        end
-        project
-      end
-
       def filter_by(objects, key, value)
         objects.select {|r| r[key].downcase == value.downcase}
       end

data/lib/cloudstack-cli/cli.rb

@@ -15,7 +15,8 @@ module CloudstackCli
 
     class_option :debug,
       desc: 'Enable debug output',
-      type: :boolean
+      type: :boolean,
+      default: false
 
     desc "version", "Print cloudstack-cli version number"
     def version
@@ -45,6 +46,10 @@ module CloudstackCli
     end
 
     desc "command COMMAND [arg1=val1 arg2=val2...]", "Run a custom api command"
+    option :format, default: 'json',
+      enum: %w(json yaml), desc: "output format"
+    option :pretty_print, default: true, type: :boolean,
+      desc: "pretty print json output"
     def command(command, *args)
       params = {'command' => command}
       args.each do |arg|
@@ -52,7 +57,12 @@ module CloudstackCli
         params[arg[0]] = arg[1]
       end
       data = client.send_request(params)
-      puts JSON.pretty_generate(data)
+      output = if options[:format] == 'json'
+        options[:pretty_print] ? JSON.pretty_generate(data) : data.to_json
+      else
+        data.to_yaml
+      end
+      puts output
     end
 
     # require subcommands
@@ -79,8 +89,10 @@ module CloudstackCli
     desc "project SUBCOMMAND ...ARGS", "Manage servers"
     subcommand :project, Project
 
-    desc "server SUBCOMMAND ...ARGS", "Manage servers"
-    subcommand :server, Server
+    desc "virtual_machine SUBCOMMAND ...ARGS", "Manage virtual machines"
+    subcommand :virtual_machine, VirtualMachine
+    map 'vm' => :virtual_machine
+    map 'server' => :virtual_machine
 
     desc "compute_offer SUBCOMMAND ...ARGS", "Manage offerings"
     subcommand :compute_offer, ComputeOffer

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

@@ -8,11 +8,9 @@ class Account < CloudstackCli::Base
 
   desc "show NAME", "show detailed infos about an account"
   def show(name)
-    accounts = client.list_accounts(name: name)
-    if accounts.size < 1
+    unless account = client.list_accounts(name: name).first
       say "No account named \"#{name}\" found.", :red
     else
-      account = accounts.first
       account.delete 'user'
       account['accounttype'] = "#{account['accounttype']} (#{TYPES[account['accounttype']]})"
       table = account.map do |key, value|
@@ -24,7 +22,7 @@ class Account < CloudstackCli::Base
 
   desc 'list', 'list accounts'
   def list
-    accounts = client.list_accounts
+    accounts = client.list_accounts(listall: true)
     if accounts.size < 1
       puts "No accounts found."
     else

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

@@ -7,6 +7,7 @@ class AffinityGroup < CloudstackCli::Base
   option :listall
   option :keyword
   def list
+    resolve_account
     affinity_groups = client.list_affinity_groups(options)
     if affinity_groups.size < 1
       say "No affinity groups found."
@@ -24,4 +25,4 @@ class AffinityGroup < CloudstackCli::Base
     end
   end
 
-end
+end

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

@@ -1,32 +1,33 @@
 class Capacity < CloudstackCli::Base
-	CAPACITY_TYPES = {
-		0 => {name: "Memory", unit: "GB", divider: 1024.0**3},
-		1 => {name: "CPU", unit: "GHz", divider: 1000.0},
-		2 => {name: "Storage", unit: "TB", divider: 1024.0**4},
-		3 => {name: "Primary Storage", unit: "TB", divider: 1024.0**4},
-		4 => {name: "Public IP's"},
-		5 => {name: "Private IP's"},
-		6 => {name: "Secondary Storage", unit: "TB", divider: 1024.0**4},
-		7 => {name: "VLAN"},
-		8 => {name: "Direct Attached Public IP's"},
-		9 => {name: "Local Storage", unit: "TB", divider: 1024.0**4}
-	}
+  CAPACITY_TYPES = {
+    0 => {name: "Memory", unit: "GB", divider: 1024.0**3},
+    1 => {name: "CPU", unit: "GHz", divider: 1000.0},
+    2 => {name: "Storage", unit: "TB", divider: 1024.0**4},
+    3 => {name: "Primary Storage", unit: "TB", divider: 1024.0**4},
+    4 => {name: "Public IP's"},
+    5 => {name: "Private IP's"},
+    6 => {name: "Secondary Storage", unit: "TB", divider: 1024.0**4},
+    7 => {name: "VLAN"},
+    8 => {name: "Direct Attached Public IP's"},
+    9 => {name: "Local Storage", unit: "TB", divider: 1024.0**4}
+  }
 
   desc "list", "list system capacity"
-  option :zone
+  option :zone, desc: "lists clusters by zone"
   option :type, desc: "specify type, see types for a list of types"
   def list
-  	capacities = client.list_capacity(options)
-  	table = []
+    resolve_zone if options[:zone]
+    capacities = client.list_capacity(options)
+    table = []
     header = ["Zone", "Type", "Capacity Used", "Capacity Total", "Used"]
     capacities.each do |c|
-    	table << [
-    		c['zonename'],
-    	 	CAPACITY_TYPES[c['type']][:name],
-    	 	capacity_to_s(c, 'capacityused'),
-    	 	capacity_to_s(c, 'capacitytotal'),
-    	 	"#{c['percentused']}%"
-    	]
+      table << [
+        c['zonename'],
+         CAPACITY_TYPES[c['type']][:name],
+         capacity_to_s(c, 'capacityused'),
+         capacity_to_s(c, 'capacitytotal'),
+         "#{c['percentused']}%"
+      ]
     end
     table = table.sort {|a, b|  [a[0], a[1]] <=> [b[0], b[1]]}.insert(0, header)
     print_table table
@@ -44,14 +45,14 @@ class Capacity < CloudstackCli::Base
   no_commands do
 
     def capacity_to_s(capacity, entity)
-      value = CAPACITY_TYPES[capacity['type']][:divider] ? 
-        (capacity[entity] / CAPACITY_TYPES[capacity['type']][:divider]).round(1) : 
+      value = CAPACITY_TYPES[capacity['type']][:divider] ?
+        (capacity[entity] / CAPACITY_TYPES[capacity['type']][:divider]).round(1) :
         capacity[entity]
-      CAPACITY_TYPES[capacity['type']][:unit] ? 
+      CAPACITY_TYPES[capacity['type']][:unit] ?
         "#{value} #{CAPACITY_TYPES[capacity['type']][:unit]}" :
         value.to_s
     end
 
   end
 
-end
+end

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

@@ -1,16 +1,19 @@
 class Cluster < CloudstackCli::Base
 
   desc 'list', 'list clusters'
+  option :zone, desc: "lists clusters by zone"
   def list
+    resolve_zone if options[:zone]
     clusters = client.list_clusters(options)
     if clusters.size < 1
       say "No clusters found."
     else
-      table = [%w(Name Pod_Name Type Zone)]
+      table = [%w(Name Pod_Name Type Zone State)]
       clusters.each do |cluster|
         table << [
         	cluster['name'], cluster['podname'],
-          cluster['hypervisortype'], cluster['zonename']
+          cluster['hypervisortype'], cluster['zonename'],
+          cluster['managedstate']
         ]
       end
       print_table table
@@ -18,4 +21,4 @@ class Cluster < CloudstackCli::Base
     end
   end
 
-end
+end

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

@@ -1,9 +1,10 @@
 class ComputeOffer < CloudstackCli::Base
 
   desc 'list', 'list compute offerings'
-  option :domain
+  option :domain, desc: "the domain associated with the compute offering"
   def list
-    offerings = client.list_service_offerings(options[:domain])
+    resolve_domain
+    offerings = client.list_service_offerings(options)
     if offerings.size < 1
       puts "No offerings found."
     else
@@ -21,7 +22,7 @@ class ComputeOffer < CloudstackCli::Base
     end
   end
 
-  desc 'create NAME', 'create offering'
+  desc 'create NAME', 'create compute offering'
   option :cpunumber, required: true
   option :cpuspeed, required: true
   option :displaytext, required: true
@@ -30,31 +31,32 @@ class ComputeOffer < CloudstackCli::Base
   option :ha, type: :boolean
   option :tags
   def create(name)
+    resolve_domain
     options[:name] = name
     puts "OK" if client.create_offering(options)
   end
 
-  desc 'delete ID', 'delete offering'
+  desc 'delete ID', 'delete compute offering'
   def delete(id)
-    puts "OK" if client.delete_offering(id)
+    puts "OK" if client.delete_service_offering(id: id)
   end
 
   desc 'sort', 'sort by cpu and memory grouped by domain'
   def sort
-    offerings = client.list_service_offerings(options[:domain])
+    offerings = client.list_service_offerings
     sortkey = -1
     offerings.group_by{|o| o["domain"]}.each_value do |offers|
       offers.sort {
         |oa, ob| [oa["cpunumber"], oa["memory"]] <=> [ob["cpunumber"], ob["memory"]]
       }.each do |offer|
         puts "#{sortkey.abs} #{offer['domain']} - #{offer["displaytext"]}"
-        client.update_offering({
-          "id" => offer['id'],
-          'sortkey' => sortkey
-        })
+        client.update_service_offering(
+          id: offer['id'],
+          sortkey: sortkey
+        )
         sortkey -= 1
       end
     end
   end
 
-end
+end

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

@@ -1,19 +1,18 @@
 class Configuration < CloudstackCli::Base
 
   desc 'list', 'list configurations'
-  option :name
-  option :category
-  option :keyword
+  option :name, desc: "lists configuration by name"
+  option :category, desc: "lists configurations by category"
+  option :keyword, desc: "lists configuration by keyword"
   def list
     configs = client.list_configurations(options)
     if configs.size < 1
       say "No configuration found."
     else
-      table = [%w(Name Scope Category Value)]
+      table = [%w(Name Category Value)]
       configs.each do |config|
         table << [
           config['name'],
-          config['scope'],
           config['category'],
           config['value']
         ]
@@ -23,4 +22,4 @@ class Configuration < CloudstackCli::Base
     end
   end
 
-end
+end

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

@@ -1,9 +1,10 @@
 class DiskOffer < CloudstackCli::Base
 
   desc 'list', 'list disk offerings'
-  option :domain
+  option :domain, desc: "the domain of the disk offering"
   def list
-    offerings = client.list_disk_offerings(options[:domain])
+    resolve_domain
+    offerings = client.list_disk_offerings(options)
     if offerings.size < 1
       puts "No offerings found."
     else
@@ -20,4 +21,4 @@ class DiskOffer < CloudstackCli::Base
       say "Total number of offerings: #{offerings.size}"
     end
   end
-end
+end

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

@@ -1,12 +1,12 @@
 class Domain < CloudstackCli::Base
 
-  desc 'list [NAME]', 'list domains'
-  def list(name = nil)
-    domains = client.list_domains(name)
+  desc 'list', 'list domains'
+  def list
+    domains = client.list_domains
     if domains.size < 1
       puts "No domains found."
     else
-      table = [["Name", "Path"]]
+      table = [%w(Name Path)]
       domains.each do |domain|
         table << [domain['name'], domain['path']]
       end
@@ -14,5 +14,5 @@ class Domain < CloudstackCli::Base
       say "Total number of domains: #{domains.size}"
     end
   end
-  
-end
+
+end

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

@@ -1,8 +1,10 @@
 class Host < CloudstackCli::Base
 
   desc 'list', 'list hosts'
-  option :zone
+  option :zone, desc: "lists hosts by zone"
+  option :type, desc: "the host type"
   def list
+    resolve_zone if options[:zone]
     hosts = client.list_hosts(options)
     if hosts.size < 1
       say "No hosts found."
@@ -18,4 +20,16 @@ class Host < CloudstackCli::Base
     end
   end
 
-end
+  desc 'show', 'show host details'
+  def show(name)
+    unless host = client.list_hosts(name: name).first
+      say "No host with name '#{name}' found."
+    else
+      table = host.map do |key, value|
+        [ set_color("#{key}:", :yellow), "#{value}" ]
+      end
+      print_table table
+    end
+  end
+
+end

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

@@ -1,21 +1,28 @@
 class IpAddress < CloudstackCli::Base
 
-  desc "release ID", "release public IP address"
-  def release(id)
-    say("OK", :green) if client.disassociate_ip_address(id)
+  desc "release ID [ID2 ID3]", "release public IP address by ID"
+  def release(*ids)
+    ids.each do |id|
+      say(" OK, released address with ID #{id}", :green) if client.disassociate_ip_address(id: id)
+    end
   end
 
   desc "ip_address assign NETWORK", "assign a public IP address"
   option :project
   def assign(network)
-  	project = find_project if options[:project]
-  	unless network = client.get_network(network, project ? project["id"] : nil)
-  		error "Network #{network} not found."
-  		exit 1
-  	end
-  	ip = client.associate_ip_address(network["id"])
-  	puts
-  	say ip['ipaddress']
+    resolve_project
+    options[:name] = network
+    unless network = client.list_networks(options).first
+      error "Network #{network} not found."
+      exit 1
+    end
+
+    if address = client.associate_ip_address(networkid: network["id"])
+      say " OK. Assigned IP address:", :green
+      table = [%w(ID Address Account Zone)]
+      table << [address["id"], address["ipaddress"], address["account"], address["zonename"]]
+      print_table table
+    end
   end
 
   desc "list", "list public IP address"
@@ -23,17 +30,19 @@ class IpAddress < CloudstackCli::Base
   option :account
   option :listall
   def list
-  	table = [["Address", "Account", "Zone"]]
+    resolve_account
+    resolve_project
     addresses = client.list_public_ip_addresses(options)
     if addresses.size < 1
       say "No ip addresses found."
     else
+      table = [%w(ID Address Account Zone)]
       addresses.each do |address|
-        table << [address["ipaddress"], address["account"], address["zonename"]]
+        table << [address["id"], address["ipaddress"], address["account"], address["zonename"]]
       end
       print_table table
       say "Total number of addresses: #{addresses.size}"
     end
   end
 
-end
+end

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

@@ -1,38 +1,40 @@
 class Iso < CloudstackCli::Base
 
-  desc 'list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community], default is featured"
+  desc 'list', "list iso's"
   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)
-      say "unsupported iso type '#{type}'", :red
-      exit 1
-    end
-    zone = client.get_zone(options[:zone]) if options[:zone]
-    isos = client.list_isos(
-      filter: type,
-      project_id: project ? project['id'] : nil,
-      zone_id: zone ? zone['id'] : nil
-    )
+  option :type,
+    enum: %w(featured self self-executable executable community all)
+  def list
+    resolve_project
+    resolve_zone
+    resolve_account
+    options[:isofilter] = options[:type]
+    options.delete :type
+    isos = client.list_isos(options)
     if isos.size < 1
-      puts "No iso's found"
+      puts "No iso's found."
     else
-      table = [["Name", "Zone", "Bootable"]]
+      table = [%w(Name Zone Bootable Public Featured)]
       isos.each do |iso|
-        table <<  [iso['name'], iso['zonename'], iso['bootable']]
+        table <<  [
+          iso['name'],
+          iso['zonename'],
+          iso['bootable'],
+          iso['ispublic'],
+          iso['isfeatured']
+        ]
       end
       print_table(table)
       say "Total number of isos: #{isos.size}"
     end
   end
 
-  desc 'detach <vm-id>', "detaches any ISO file (if any) currently attached to a virtual machine"
+  desc 'detach VM_ID', "detaches any ISO file (if any) currently attached to a virtual machine"
   def detach(vm_id)
-    client.detach_iso(vm_id, {async: true})
-    say "OK", :green
+    client.detach_iso({virtualmachine_id: vm_id}, {sync: true})
+    say " OK", :green
   end
 
-end
+end

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

@@ -2,13 +2,19 @@ class Job < CloudstackCli::Base
 
   desc 'list', 'list async jobs'
   def list
-    jobs = client.list_jobs()
+    jobs = client.list_async_jobs
     if jobs.size < 1
       say "No jobs found."
     else
-      table = [["Command", "Created", "Status", "ID", "User ID"]]
+      table = [%w(Command Created Status ID User-ID)]
       jobs.each do |job|
-        table << [job['cmd'].split('.')[-1], job['created'], job['jobstatus'], job['jobid'], job['userid']]
+        table << [
+          job['cmd'].split('.')[-1],
+          job['created'],
+          job['jobstatus'],
+          job['jobid'],
+          job['userid']
+        ]
       end
       print_table table
     end
@@ -16,15 +22,11 @@ class Job < CloudstackCli::Base
 
   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
+    job = client.query_async_job_result(jobid: id)
+    table = job.map do |key, value|
+      [ set_color("#{key}:", :yellow), "#{value}" ]
     end
+    print_table table
   end
-  
-end
+
+end