cloudstack-cli 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e275c44c299b822462e77ba0d69ea939587ba99
-  data.tar.gz: 16635f34c875017d6c27c4a1ebd9be6a7c915c9a
+  metadata.gz: e84e2c0d7b3711600594a643e966594a63559ecf
+  data.tar.gz: 4969bcbff43220ee17ffb883261c4a102bca7f0c
 SHA512:
-  metadata.gz: 4463ce0856dff7467b679260510438122d4ddc170024341e4c735d34fda447fde6ec70f6445fd144459bda487ef0f19ed50a9bf8f66e23780b87bfa02eb43bdf
-  data.tar.gz: 1a0ea872edcbc76720cd98f510a43452a4fce2ad4598a0a207f449707da7bafd0849b79cc3cbbbb51b625a8d4588c61e96c7189f6830487d41ca0ce71e5ae386
+  metadata.gz: f0bf8526c12368a20db1b62afdba3551ec2a1b47b6580f478dcadc0113c746ca3c69ebad28c105ff4147bd967cebef6e5b62148fe975487d78a755e02cb76974
+  data.tar.gz: 446535092e456d529c46b33f3b9df8486d3664f9132c008df97d00552dd98cfb38020a165799492a448e5a26ca186756ed5eefda255f888252146fd21d19ce43

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

@@ -18,13 +18,13 @@ class Router < CloudstackCli::Base
     enum: %w(table json yaml)
   option :showid, type: :boolean, desc: "display the router ID"
   option :verbose, aliases: '-V', desc: "display additional fields"
+  option :version, desc: "list virtual router elements by version"
   def list
     resolve_project
     resolve_zone
     resolve_account
 
     routers = client.list_routers(options)
-
     # show all routers unless project or account is set
     if options[:listall] && !options[:project] && !options[:account]
       client.list_projects(listall: true).each do |project|
@@ -33,16 +33,6 @@ class Router < CloudstackCli::Base
         )
       end
     end
-
-    if options[:redundant_state]
-      routers = filter_by(
-        routers,
-        'redundantstate',
-        options[:redundant_state].downcase
-      )
-    end
-
-    routers.reverse! if options[:reverse]
     print_routers(routers, options)
     execute_router_commands(options[:command].downcase, routers) if options[:command]
   end
@@ -58,7 +48,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]
   end
@@ -152,6 +141,15 @@ class Router < CloudstackCli::Base
       if routers.size < 1
         say "No routers found."
       else
+        if options[:redundant_state]
+          routers = filter_by(
+            routers,
+            'redundantstate',
+            options[:redundant_state].downcase
+          )
+        end
+        routers.reverse! if options[:reverse]
+
         case options[:format].to_sym
         when :yaml
           puts({'routers' => routers}.to_yaml)
@@ -159,11 +157,11 @@ class Router < CloudstackCli::Base
           say JSON.pretty_generate(routers: routers)
         else
           table = [%w(
-            Name Zone Account/Project IP Linklocal-IP Status
+            Name Zone Account/Project IP Linklocal-IP Status Version
           )]
           table[0].unshift('ID') if options[:showid]
           if options[:verbose]
-            table[0].push('Redundant-State', 'Requ-Upgrade', 'Version', 'Offering')
+            table[0].push('Redundant-State', 'Requ-Upgrade', 'Offering')
           end
           routers.each do |router|
             table << [
@@ -172,14 +170,14 @@ class Router < CloudstackCli::Base
               router["project"] || router["account"],
               router["nic"] && router["nic"].first ? router["nic"].first['ipaddress'] : "-",
               router["linklocalip"] || "-",
-              router["state"]
+              router["state"],
+              router["version"] || "-"
             ]
             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

data/lib/cloudstack-cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Nik Wolfgramm