cloudstack-cli 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c08f0890333055353aa278e75285c2427bf19c
-  data.tar.gz: 981ea8a195ebab835f91dc214b5aad289ab87a70
+  metadata.gz: b4fd382092e6b838e263390534e9ce894d76e74b
+  data.tar.gz: d97473fb465c269be305e4f6a24722503616dff9
 SHA512:
-  metadata.gz: b139212a371f5d19dd0b9e9fc603f211f523dd8fbb054b72cbbdd8fa8e42d5c6eaf5529c7f6dcbc718a3921edd196f3def8b2f85c279b247a5024d2d685fdbcd
-  data.tar.gz: d9649201da6880b84f7f84db55dc7954cc299088995c0d8113f3b37f185bb8a105a115928ae717c308795b4b2dae8d00098ea249f127fcc8c10189e742577eb3
+  metadata.gz: 9d192a430759b011154bc20d8f2a9290b810f30783b3d50e65569c68164ea66edaa1bf678d437a1b5e4d14418081bfa408ddad3016cdb96a5172ee89e8596eab
+  data.tar.gz: f27eaad931a0f977a63159b1cccf9f3074edcb526f6a3c6712914ec6ebd56de1d1740fedfa8829ec343fad065d556f650b8155902e5dc08bd64b2e1d5faad185

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.5.3)
+    cloudstack-cli (0.5.4)
       cloudstack_client (~> 0.3)
       thor (~> 0.18)
 

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

@@ -3,31 +3,45 @@ class Network < CloudstackCli::Base
   desc "list", "list networks"
   option :project
   option :account
+  option :zone
+  option :type, desc: 'the type of the network'
   option :showid, type: :boolean
   option :isdefault, type: :boolean
   def list
     project = find_project if options[:project]
+    if options[:zone]
+      unless zone = client.get_zone(options[:zone])
+        say "Zone '#{options[:zone]}' not found.", :red
+        exit 1
+      end
+      zone_id = zone['id']
+    end
+
     networks = []
     if project
-      networks = client.list_networks(project_id: project['id'])
+      networks = client.list_networks(project_id: project['id'], zone_id: zone_id)
     elsif options[:account]
-      networks = client.list_networks(account: options[:account])
+      networks = client.list_networks(account: options[:account], zone_id: zone_id)
     else
-      networks = client.list_networks(isdefault: options[:isdefault])
-      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault])
+      networks = client.list_networks(isdefault: options[:isdefault], zone_id: zone_id)
+      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault], zone_id: zone_id)
+    end
+
+    if options[:type]
+      networks = filter_by(networks, 'type', options[:type])
     end
 
     if networks.size < 1
       puts "No networks found."
     else
-      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State", "Type"]]
+      table = [["Name", "Displaytext", "Account/Project", "Zone", "Domain", "State", "Type"]]
       table[0] << "ID" if options[:showid]
       networks.each do |network|
         table << [
           network["name"],
           network["displaytext"],
-          network["account"],
-          network["project"],
+          network["account"] || network["project"],
+          network["zonename"],
           network["domain"],
           network["state"],
           network["type"]

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc