cloudstack-cli 0.3.10 → 0.3.11

data/Gemfile.lock

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

data/lib/cloudstack-cli/cli.rb

@@ -3,7 +3,7 @@ module CloudstackCli
     include Thor::Actions
 
     package_name "cloudstack-cli" 
-    map %w(-v --version) => :version 
+    map %w(-v --version) => :version
 
     class_option :config,
       default: File.join(Dir.home, '.cloudstack-cli.yml'),
@@ -68,10 +68,15 @@ module CloudstackCli
           error "Can't load configuration from file #{config_file}."
           exit 1
         end
-        say "cloudstack-cli environments besides the default:", :yellow
-        config.each_key {|key| puts key unless key.class == Symbol }
+        table = [%w(Name URL)]
+        table << ["default", config[:url]]
+        config.each_key do |key|
+          table << [key, config[key][:url]] unless key.class == Symbol
+        end
+        print_table table
       end
-    end    
+    end
+    map :envs => :environments
 
     desc "command COMMAND [arg1=val1 arg2=val2...]", "run a custom api command"
     def command(command, *args)
@@ -89,78 +94,79 @@ module CloudstackCli
     end
     
     desc "zone SUBCOMMAND ...ARGS", "Manage zones"
-    subcommand "zone", Zone
+    subcommand :zone, Zone
 
     desc "pod SUBCOMMAND ...ARGS", "List pods"
-    subcommand "pod", Pod
+    subcommand :pod, Pod
 
     desc "cluster SUBCOMMAND ...ARGS", "List clusters"
-    subcommand "cluster", Cluster
+    subcommand :cluster, Cluster
 
     desc "host SUBCOMMAND ...ARGS", "List hosts"
-    subcommand "host", Host
+    subcommand :host, Host
 
     desc "project SUBCOMMAND ...ARGS", "Manage servers"
-    subcommand "project", Project
+    subcommand :project, Project
 
     desc "server SUBCOMMAND ...ARGS", "Manage servers"
-    subcommand "server", Server
+    subcommand :server, Server
 
     desc "offering SUBCOMMAND ...ARGS", "Manage offerings"
-    subcommand "offering", Offering
+    subcommand :offering, Offering
 
     desc "disk_offering SUBCOMMAND ...ARGS", "Manage disk offerings"
-    subcommand "disk_offering", DiskOffering
+    subcommand :disk_offering, DiskOffering
 
     desc "network SUBCOMMAND ...ARGS", "Manage networks"
-    subcommand "network", Network
+    subcommand :network, Network
+    map 'networks' => 'network'
 
     desc "physical_network SUBCOMMAND ...ARGS", "Manage physical networks"
-    subcommand "physical_network", PhysicalNetwork
+    subcommand :physical_network, PhysicalNetwork
 
     desc "load_balancer SUBCOMMAND ...ARGS", "Manage load balancing rules"
-    subcommand "load_balancer", LoadBalancer
+    subcommand :load_balancer, LoadBalancer
 
     desc "template SUBCOMMAND ...ARGS", "Manage templates"
-    subcommand "template", Template
+    subcommand :template, Template
 
     desc "iso SUBCOMMAND ...ARGS", "Manage iso's"
-    subcommand "iso", Iso
+    subcommand :iso, Iso
 
     desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
-    subcommand "router", Router
+    subcommand :router, Router
 
     desc "volume SUBCOMMAND ...ARGS", "Manage volumes"
-    subcommand "volume", Volume
+    subcommand :volume, Volume
 
     desc "snapshot SUBCOMMAND ...ARGS", "Manage snapshots"
-    subcommand "snapshot", Snapshot
+    subcommand :snapshot, Snapshot
 
     desc "stack SUBCOMMAND ...ARGS", "Manage stacks"
-    subcommand "stack", Stack
+    subcommand :stack, Stack
 
     desc "account SUBCOMMAND ...ARGS", "Manage accounts"
-    subcommand "account", Account
+    subcommand :account, Account
 
     desc "user SUBCOMMAND ...ARGS", "Manage users"
-    subcommand "user", User
+    subcommand :user, User
 
     desc "domain SUBCOMMAND ...ARGS", "Manage domains"
-    subcommand "domain", Domain
+    subcommand :domain, Domain
 
     desc "ip_address SUBCOMMAND ...ARGS", "Manage ip addresses"
-    subcommand "ip_address", IpAddress
+    subcommand :ip_address, IpAddress
 
     desc "capacity SUBCOMMAND ...ARGS", "Lists all the system wide capacities"
-    subcommand "capacity", Capacity
+    subcommand :capacity, Capacity
 
     desc "port_rule SUBCOMMAND ...ARGS", "Manage portforwarding rules"
-    subcommand "port_rule", PortRule
+    subcommand :port_rule, PortRule
 
     desc "job SUBCOMMAND ...ARGS", "Display async jobs"
-    subcommand "job", Job
+    subcommand :job, Job
 
     desc "ssh_key_pair SUBCOMMAND ...ARGS", "Manage ssh key pairs"
-    subcommand "ssh_key_pair", SshKeyPair
+    subcommand :ssh_key_pair, SshKeyPair
   end
 end

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

@@ -6,7 +6,7 @@ class Account < CloudstackCli::Base
     2 => 'admin'
   }
 
-  desc 'list [NAME]', 'list accounts'
+  desc 'account list [NAME]', 'list accounts (by name)'
   def list(name = nil)
     accounts = client.list_accounts({name: name})
     if accounts.size < 1

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

@@ -12,7 +12,7 @@ class Capacity < CloudstackCli::Base
 		9 => {name: "Local Storage", unit: "TB", divider: 1024.0**4}
 	}
 
-  desc "list", "list system capacity"
+  desc "capacity list", "list system capacity"
   option :zone
   def list
   	capacities = client.list_capacity

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

@@ -1,6 +1,6 @@
 class Cluster < CloudstackCli::Base
 
-  desc 'list', 'list clusters'
+  desc 'cluster list', 'list clusters'
   def list
     clusters = client.list_clusters(options)
     if clusters.size < 1

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

@@ -1,6 +1,6 @@
 class DiskOffering < CloudstackCli::Base
 
-  desc 'list', 'list disk offerings'
+  desc 'disk_offering list', 'list disk offerings'
   option :domain
   def list
     offerings = client.list_disk_offerings(options[:domain])

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

@@ -1,6 +1,6 @@
 class Domain < CloudstackCli::Base
 
-  desc 'list [NAME]', 'list domains'
+  desc 'domain list [NAME]', 'list domains'
   def list(name = nil)
     domains = client.list_domains(name)
     if domains.size < 1

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

@@ -1,6 +1,6 @@
 class Host < CloudstackCli::Base
 
-  desc 'list', 'list hosts'
+  desc 'host list', 'list hosts'
   option :zone
   def list
     hosts = client.list_hosts(options)

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

@@ -1,11 +1,11 @@
 class IpAddress < CloudstackCli::Base
 
-  desc "release ID", "release public IP address"
+  desc "ip_address release ID", "release public IP address"
   def release(id)
     say("OK", :green) if client.disassociate_ip_address(id)
   end
 
-  desc "assign NETWORK", "assign a public IP address"
+  desc "ip_address assign NETWORK", "assign a public IP address"
   option :project
   def assign(network)
   	project = find_project if options[:project]
@@ -18,7 +18,7 @@ class IpAddress < CloudstackCli::Base
   	say ip['ipaddress']
   end
 
-  desc "list", "list public IP address"
+  desc "ip_address list", "list public IP address"
   option :project
   option :account
   option :listall

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

@@ -1,6 +1,6 @@
 class Iso < CloudstackCli::Base
 
-  desc 'list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community], default is featured"
+  desc 'iso list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community], default is featured"
   option :project
   option :zone
   option :account

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

@@ -1,6 +1,6 @@
 class Job < CloudstackCli::Base
 
-  desc 'list', 'list async jobs'
+  desc 'job list', 'list async jobs'
   def list
     jobs = client.list_jobs()
     if jobs.size < 1
@@ -14,7 +14,7 @@ class Job < CloudstackCli::Base
     end
   end
 
-  desc 'query ID', 'query async job'
+  desc 'job query ID', 'query async job'
   def query(id)
     job = client.query_job(id)
     job.each do |key, value| 

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

@@ -1,6 +1,6 @@
 class LoadBalancer < CloudstackCli::Base
   
-  desc "list", "list load balancer rules"
+  desc "load_balancer list", "list load balancer rules"
   option :project
   def list
     project = find_project if options[:project]
@@ -18,7 +18,7 @@ class LoadBalancer < CloudstackCli::Base
     end
   end
 
-  desc "create NAME", "create load balancer rule"
+  desc "load_balancer create NAME", "create load balancer rule"
   option :project
   option :ip, required: true
   option :public_port, required: true
@@ -36,7 +36,7 @@ class LoadBalancer < CloudstackCli::Base
     say "OK!", :green
   end
 
-  desc "add NAME", "assign servers to balancer rule"
+  desc "load_balancer add NAME", "assign servers to balancer rule"
   option :servers, required: true, type: :array, description: 'server names'
   def add(name)
     say "Add #{names.join(', ')} to rule #{id}...", :yellow

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

@@ -1,6 +1,44 @@
 class Network < CloudstackCli::Base
 
-  desc "default", "get the default network"
+  desc "network list", "list networks"
+  option :project
+  option :account
+  option :showid, type: :boolean
+  option :isdefault, type: :boolean
+  def list
+    project = find_project if options[:project]
+    networks = []
+    if project
+      networks = client.list_networks(project_id: project['id'])
+    elsif options[:account]
+      networks = client.list_networks(account: options[:account])
+    else
+      networks = client.list_networks(isdefault: options[:isdefault])
+      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault])
+    end
+
+    if networks.size < 1
+      puts "No networks found."
+    else
+      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State", "Type"]]
+      table[0] << "ID" if options[:showid]
+      networks.each do |network|
+        table << [
+          network["name"],
+          network["displaytext"],
+          network["account"],
+          network["project"],
+          network["domain"],
+          network["state"],
+          network["type"]
+        ]
+        table[-1] << network["id"] if options[:showid]
+      end
+      print_table table
+    end
+  end
+
+  desc "network default", "get the default network"
   option :zone
   def default
     network = client.get_default_network(options[:zone])
@@ -20,7 +58,7 @@ class Network < CloudstackCli::Base
     end
   end
 
-  desc "show NAME", "show detailed infos about a network"
+  desc "network show NAME", "show detailed infos about a network"
   option :project
   def show(name)
     if options[:project]
@@ -41,45 +79,7 @@ class Network < CloudstackCli::Base
     end
   end
 
-  desc "list", "list networks"
-  option :project
-  option :account
-  option :showid, type: :boolean
-  option :isdefault, type: :boolean
-  def list
-    project = find_project if options[:project]
-    networks = []
-    if project
-      networks = client.list_networks(project_id: project['id'])
-    elsif options[:account]
-      networks = client.list_networks(account: options[:account])
-    else
-      networks = client.list_networks(isdefault: options[:isdefault])
-      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault])
-    end
-
-    if networks.size < 1
-      puts "No networks found."
-    else
-      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State", "Type"]]
-      table[0] << "ID" if options[:showid]
-      networks.each do |network|
-        table << [
-          network["name"],
-          network["displaytext"],
-          network["account"],
-          network["project"],
-          network["domain"],
-          network["state"],
-          network["type"]
-        ]
-        table[-1] << network["id"] if options[:showid]
-      end
-      print_table table
-    end
-  end
-
-  desc "restart NAME", "restart network"
+  desc "network restart NAME", "restart network"
   option :cleanup, type: :boolean, default: true
   def restart(name)
     network = client.get_network(name)
@@ -93,7 +93,7 @@ class Network < CloudstackCli::Base
     end
   end
 
-  desc "delete NAME", "delete network"
+  desc "network delete NAME", "delete network"
   def delete(name)
     network = client.get_network(name)
     network = client.get_network(name, -1) unless network

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

@@ -1,6 +1,6 @@
 class Offering < CloudstackCli::Base
 
-  desc 'list', 'list compute offerings'
+  desc 'offering list', 'list compute offerings'
   option :domain
   def list
     offerings = client.list_service_offerings(options[:domain])
@@ -20,7 +20,7 @@ class Offering < CloudstackCli::Base
     end
   end
 
-  desc 'create NAME', 'create offering'
+  desc 'offering create NAME', 'create offering'
   option :cpunumber, required: true
   option :cpuspeed, required: true
   option :displaytext, required: true
@@ -39,7 +39,7 @@ class Offering < CloudstackCli::Base
   end
 
 
-  desc 'sort', 'sort by cpu and memory grouped by domain'
+  desc 'offering sort', 'sort by cpu and memory grouped by domain'
   def sort
     offerings = client.list_service_offerings(options[:domain])
     sortkey = -1

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

@@ -1,6 +1,6 @@
 class PhysicalNetwork < CloudstackCli::Base
 
-  desc "list", "list physical networks"
+  desc "physical_network list", "list physical networks"
   option :project
   def list
     project = find_project if options[:project]

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

@@ -1,6 +1,6 @@
 class Pod < CloudstackCli::Base
 
-  desc 'list', 'list pods'
+  desc 'pod list', 'list pods'
   def list
     pods = client.list_pods(options)
     if pods.size < 1

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

@@ -1,6 +1,6 @@
 class PortRule < CloudstackCli::Base
 
-  desc "create SERVER", "create portforwarding rules"
+  desc "port_rule create SERVER", "create portforwarding rules"
   option :rules, type: :array,
     required: true,
     desc: "Port Forwarding Rules [public_ip]:port ...",
@@ -35,7 +35,7 @@ class PortRule < CloudstackCli::Base
     end
   end
 
-  desc "list", "list portforwarding rules"
+  desc "port_rule list", "list portforwarding rules"
   option :project
   def list
     project_id = find_project['id'] if options[:project]

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

@@ -1,6 +1,6 @@
 class Project < CloudstackCli::Base
 
-  desc "show NAME", "show detailed infos about a project"
+  desc "project show NAME", "show detailed infos about a project"
   option :project
   def show(name)
     unless project = client.get_project(name)
@@ -13,7 +13,7 @@ class Project < CloudstackCli::Base
     end
   end
 
-  desc "list", "list projects"
+  desc "project list", "list projects"
   def list
     projects = client.list_projects
     if projects.size < 1

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

@@ -1,6 +1,6 @@
 class Router < CloudstackCli::Base
 
-	desc "list", "list virtual routers"
+	desc "router list", "list virtual routers"
   option :project
   option :account
   option :zone
@@ -64,7 +64,7 @@ class Router < CloudstackCli::Base
 	  end
   end
 
-  desc "stop NAME [NAME2 ..]", "stop virtual router(s)"
+  desc "router stop NAME [NAME2 ..]", "stop virtual router(s)"
   option :force, description: "stop without asking", type: :boolean, aliases: '-f'
   def stop(*names)
     routers = names.map {|name| get_router(name)}
@@ -77,7 +77,7 @@ class Router < CloudstackCli::Base
     watch_jobs(jobs)
   end
 
-  desc "start NAME [NAME2 ..]", "start virtual router(s)"
+  desc "router start NAME [NAME2 ..]", "start virtual router(s)"
   option :force, description: "start without asking", type: :boolean, aliases: '-f'
   def start(*names)
     routers = names.map {|name| get_router(name)}
@@ -90,7 +90,7 @@ class Router < CloudstackCli::Base
     watch_jobs(jobs)
   end
 
-  desc "start NAME [NAME2 ..]", "restart virtual router(s) (stop and start)"
+  desc "router start NAME [NAME2 ..]", "restart virtual router(s) (stop and start)"
   option :force, description: "restart without asking", type: :boolean, aliases: '-f'
   def restart(*names)
     routers = names.map {|name| get_router(name)}
@@ -111,7 +111,7 @@ class Router < CloudstackCli::Base
     say "Finished.", :green
   end
 
-  desc "destroy NAME [NAME2 ..]", "destroy virtual router(s)"
+  desc "router destroy NAME [NAME2 ..]", "destroy virtual router(s)"
   option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
   def destroy(*names)
     routers = names.map {|name| get_router(name)}

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

@@ -1,8 +1,9 @@
 class Server < CloudstackCli::Base
 
-  desc "list", "list servers"
+  desc "server list", "list servers"
   option :project
   option :account
+  option :zone
   def list
     if options[:project]
       if options[:project].downcase == "all"
@@ -31,7 +32,7 @@ class Server < CloudstackCli::Base
     end
   end
 
-  desc "show NAME", "show detailed infos about a server"
+  desc "server show NAME", "show detailed infos about a server"
   option :project
   def show(name)
     if options[:project]
@@ -52,7 +53,7 @@ class Server < CloudstackCli::Base
     end
   end
 
-  desc "create NAME [NAME2 ...]", "create server(s)"
+  desc "server 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"
@@ -106,7 +107,7 @@ class Server < CloudstackCli::Base
     say "Finished.", :green
   end
 
-  desc "destroy NAME [NAME2 ..]", "destroy server(s)"
+  desc "server destroy NAME [NAME2 ..]", "destroy server(s)"
   option :project
   option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
   def destroy(*names)
@@ -126,24 +127,24 @@ class Server < CloudstackCli::Base
     end
   end
 
-  desc "bootstrap", "interactive creation of a server with network access"
+  desc "server bootstrap", "interactive creation of a server with network access"
   def bootstrap
     bootstrap_server_interactive
   end
 
-  desc "stop NAME", "stop a server"
+  desc "server stop NAME", "stop a server"
   def stop(name)
     client.stop_server(name)
     puts
   end
 
-  desc "start NAME", "start a server"
+  desc "server start NAME", "start a server"
   def start(name)
     client.start_server(name)
     puts
   end
 
-  desc "reboot NAME", "reboot a server"
+  desc "server reboot NAME", "reboot a server"
   def restart(name)
     client.reboot_server(name)
     puts

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

@@ -1,6 +1,6 @@
 class Snapshot < CloudstackCli::Base
 
-  desc 'list', 'list snapshots'
+  desc 'snapshot list', 'list snapshots'
   option :account
   option :project
   option :domain

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

@@ -1,10 +1,11 @@
 class SshKeyPair < CloudstackCli::Base
 
-  desc 'list', 'list ssh key pairs'
+  desc "ssh_key_pair list", 'list ssh key pairs'
   option :listall
   option :account
   option :project
   def list
+    puts self.methods
     pairs = client.list_ssh_key_pairs(options)
     if pairs.size < 1
       say "No ssh key pairs found."
@@ -17,7 +18,7 @@ class SshKeyPair < CloudstackCli::Base
     end
   end
 
-  desc 'create NAME', 'create ssh key pair'
+  desc 'ssh_key_pair create NAME', 'create ssh key pair'
   option :account
   option :project
   option :public_key
@@ -29,7 +30,7 @@ class SshKeyPair < CloudstackCli::Base
     say pair['privatekey']
   end
 
-  desc 'delete NAME', 'delete ssh key pair'
+  desc 'ssh_key_pair delete NAME', 'delete ssh key pair'
   option :account
   option :project
   option :force, aliases: '-f', desc: "delete without asking"

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

@@ -1,6 +1,6 @@
 class Stack < CloudstackCli::Base
 
-	desc "create STACKFILE", "create a stack of servers"
+	desc "stack create STACKFILE", "create a stack of servers"
   def create(stackfile)
   	stack = parse_stackfile(stackfile)
     say "Create stack #{stack["name"]}...", :green

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], default is featured' 
+  desc 'template list [TYPE]', 'list templates by type [featured|self|self-executable|executable|community], default is featured' 
   option :project
   option :zone
   def list(type='featured')

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

@@ -6,7 +6,7 @@ class User < CloudstackCli::Base
     2 => 'admin'
   }
 
-  desc 'list', 'list async jobs'
+  desc 'user list', 'list users'
   option :listall
   option :account
   def list

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

@@ -1,6 +1,6 @@
 class Volume < CloudstackCli::Base
 
-  desc "list", "list networks"
+  desc "volume list", "list volumes"
   option :project
   def list
     projectid = find_project['id'] if options[:project]

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

@@ -1,6 +1,6 @@
 class Zone < CloudstackCli::Base
 
-  desc "list", "list zones"
+  desc "zone list", "list zones"
   def list
     zones = client.list_zones
     if zones.size < 1

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

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

@@ -93,6 +93,16 @@ module CloudstackClient
         'listAll' => true
       }
       params['projectid'] = options[:project_id] if options[:project_id]
+
+      if options[:zone]
+        zone = get_zone(options[:zone])
+        unless zone 
+          puts "Error: Zone #{options[:zone]} not found"
+          exit 1
+        end
+        params['zoneid'] = zone['id']  
+      end
+
       if options[:account]
         if account = list_accounts({name: options[:account]}).first
           params['domainid'] = account["domainid"]

data/lib/cloudstack-client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors: