cloudstack-cli 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca280248642a4b0440722aa5d8e13b74da1c54b
-  data.tar.gz: 58d752847f7147069fd208c80c179d4ccb52b2f2
+  metadata.gz: 0e275c44c299b822462e77ba0d69ea939587ba99
+  data.tar.gz: 16635f34c875017d6c27c4a1ebd9be6a7c915c9a
 SHA512:
-  metadata.gz: e6e1d8707a7e78bb69ec5baa4b3551b4e52f8e749ca32adb7c95bc834c5624c829b52a5c37e90938c1751bd73fb02441f8cdd83ff9b3a98fd5f24d108f8995d5
-  data.tar.gz: 7fd57dd577d8ee3c1df569d957fde135172ee17a1e537b02575f7b9f05de311ded780993d00fd7cde43769cf4e2e8d7986263d3db35df48d8562b9c89e2136ed
+  metadata.gz: 4463ce0856dff7467b679260510438122d4ddc170024341e4c735d34fda447fde6ec70f6445fd144459bda487ef0f19ed50a9bf8f66e23780b87bfa02eb43bdf
+  data.tar.gz: 1a0ea872edcbc76720cd98f510a43452a4fce2ad4598a0a207f449707da7bafd0849b79cc3cbbbb51b625a8d4588c61e96c7189f6830487d41ca0ce71e5ae386

data/Gemfile.lock

@@ -1,24 +1,22 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.0.2)
-      cloudstack_client (~> 1.0.3)
+    cloudstack-cli (1.0.5)
+      cloudstack_client (~> 1.0.4)
       thor (~> 0.19.1)
 
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.0.3)
+    cloudstack_client (1.0.4)
       msgpack (~> 0.5.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    json (1.8.3)
     msgpack (0.5.12)
     rake (10.4.2)
     rdoc (4.2.0)
-      json (~> 1.4)
     thor (0.19.1)
 
 PLATFORMS
@@ -31,4 +29,4 @@ DEPENDENCIES
   rdoc (~> 4.2)
 
 BUNDLED WITH
-   1.10.3
+   1.10.5

data/README.md

@@ -71,7 +71,7 @@ Bootsraps a server using a template and creating port-forwarding rules for port
 $ cloudstack-cli server create server-01 --template CentOS-6.4-x64-v1.4 --zone DC1 --offering 1cpu_1gb --port-rules :22 :80
 ```
 
-### Example: Run a any custom API command
+### Example: Run any custom API command
 
 Run the "listAlerts" command against the Cloudstack API with an argument of type=8:
 

data/Rakefile

@@ -1,2 +1 @@
-require 'bundler'  
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"

data/cloudstack-cli.gemspec

@@ -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', '~> 1.0.3')
+  gem.add_dependency('cloudstack_client', '~> 1.0.4')
 end

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

@@ -13,14 +13,23 @@ class Project < CloudstackCli::Base
   end
 
   desc "list", "list projects"
+  option :domain, desc: "List only resources belonging to the domain specified"
   def list
-    projects = client.list_projects(listall: true)
+    resolve_domain
+    projects = client.list_projects(options.merge listall: true)
     if projects.size < 1
       puts "No projects found."
     else
-      table = [["Name", "Displaytext", "Domain"]]
+      table = [%w(Name Displaytext VMs CPU Memory Domain)]
       projects.each do |project|
-        table << [project['name'], project['displaytext'], project['domain']]
+        table << [
+          project['name'],
+          project['displaytext'],
+          project['vmtotal'],
+          project['cputotal'],
+          project['memorytotal'] / 1024,
+          project['domain']
+        ]
       end
       print_table(table)
       say "Total number of projects: #{projects.count}"

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

@@ -8,7 +8,6 @@ class Router < CloudstackCli::Base
   option :redundant_state, desc: "the state of redundant virtual router",
     enum: %w(master backup fault unknown)
   option :listall, type: :boolean, desc: "list all routers", default: true
-  option :showid, type: :boolean, desc: "display the router ID"
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   option :command,
     desc: "command to execute for each router",
@@ -17,6 +16,8 @@ class Router < CloudstackCli::Base
     desc: "number of concurrent command to execute"
   option :format, default: "table",
     enum: %w(table json yaml)
+  option :showid, type: :boolean, desc: "display the router ID"
+  option :verbose, aliases: '-V', desc: "display additional fields"
   def list
     resolve_project
     resolve_zone
@@ -24,7 +25,8 @@ class Router < CloudstackCli::Base
 
     routers = client.list_routers(options)
 
-    if options[:listall]
+    # show all routers unless project or account is set
+    if options[:listall] && !options[:project] && !options[:account]
       client.list_projects(listall: true).each do |project|
         routers = routers + client.list_routers(
           options.merge(projectid: project['id'])
@@ -33,7 +35,11 @@ class Router < CloudstackCli::Base
     end
 
     if options[:redundant_state]
-      routers = filter_by(routers, 'redundantstate', options[:redundant_state].downcase)
+      routers = filter_by(
+        routers,
+        'redundantstate',
+        options[:redundant_state].downcase
+      )
     end
 
     routers.reverse! if options[:reverse]
@@ -52,7 +58,6 @@ class Router < CloudstackCli::Base
     enum: %w(table json yaml)
   def list_from_file(file)
     routers = parse_file(file)["routers"]
-
     routers.reverse! if options[:reverse]
     print_routers(routers, options)
     execute_router_commands(options[:command].downcase, routers) if options[:command]
@@ -154,24 +159,30 @@ class Router < CloudstackCli::Base
           say JSON.pretty_generate(routers: routers)
         else
           table = [%w(
-            ID Name Zone Account Project Redundant-State IP Linklocal-IP Status Redundant Offering
+            Name Zone Account/Project IP Linklocal-IP Status
           )]
-          table[0].delete('ID') unless options[:showid]
+          table[0].unshift('ID') if options[:showid]
+          if options[:verbose]
+            table[0].push('Redundant-State', 'Requ-Upgrade', 'Version', 'Offering')
+          end
           routers.each do |router|
             table << [
-              router["id"],
               router["name"],
               router["zonename"],
-              router["account"],
-              router["project"],
-              router["redundantstate"],
-              router["nic"] && router["nic"].first ? router["nic"].first['ipaddress'] : "",
-              router["linklocalip"],
-              router["state"],
-              router["isredundantrouter"],
-              router["serviceofferingname"]
+              router["project"] || router["account"],
+              router["nic"] && router["nic"].first ? router["nic"].first['ipaddress'] : "-",
+              router["linklocalip"] || "-",
+              router["state"]
             ]
-            table[-1].delete_at(0) unless table[0].index "ID"
+            table[-1].unshift(router["id"]) if options[:showid]
+            if options[:verbose]
+              table[-1].push(
+                print_redundant_state(router),
+                router["requiresupgrade"] || "-",
+                router["version"] || "-",
+                router["serviceofferingname"]
+              )
+            end
           end
           print_table table
           puts
@@ -180,6 +191,10 @@ class Router < CloudstackCli::Base
       end
     end
 
+    def print_redundant_state(router)
+      router["isredundantrouter"] == "true" ? router["redundantstate"] : "non-redundant"
+    end
+
     def execute_router_commands(command, routers)
       unless %w(start stop reboot).include?(command)
         say "\nCommand #{options[:command]} not supported.", :red

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com