cloudstack_client 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb1427e6c34dbd08a11efe73596d391afbb4507
-  data.tar.gz: 73d14950cf035e0078290e6f1014d9bb2cf9b88c
+  metadata.gz: dec70317784dcbbde93d5f8b66b22b0e93229f48
+  data.tar.gz: 3d53de49fd5d9ca92edf12082f6d1f89dc274cb2
 SHA512:
-  metadata.gz: 76d331fd4846aad6a1bf686161ce1256291d3aa16939b97ec9ad1d8a2eb0629989a70b328823f3b68f6ece7e0043ae91e5b1b127fbbd177cc766f520243792cb
-  data.tar.gz: eb7a29f513f49c26db71b8dc07277944ed3c146d32fd6753651a2813ef08aa164f2e25d59fcb7bb98db866c5a0a55dea804bad2711f0f096494acbaf50eef9dc
+  metadata.gz: 2c5d69c56cf83e03576eafccc1bcca0484b58398033ac1a25933a348819c6c196a908067d8d8c97b4e2e506b0f76ac931bd27d53cc79ba6af995d4ef57c0c230
+  data.tar.gz: 8e35e1d89ad61a8a2dd827c71a778894d94c48ebd066e60d0010eb3609b20ad3ac7266350ba91baf7a3e468dc54f0ade57c5fafc753e5d4e88cfe515df925537

data/lib/cloudstack_client/commands/server.rb

@@ -14,7 +14,7 @@ module CloudstackClient
       params['projectid'] = args[:project_id] if args[:project_id]
 
       if args[:account]
-        if account = list_accounts({name: args[:account]}).first
+        if account = list_accounts(name: args[:account]).first
           params['domainid'] = account["domainid"]
           params['account'] = args[:account]
         end
@@ -96,28 +96,28 @@ module CloudstackClient
     ##
     # Lists servers.
 
-    def list_servers(options = {})
+    def list_servers(args = {})
       params = {
         'command' => 'listVirtualMachines',
         'listAll' => true
       }
-      params['projectid'] = options[:project_id] if options[:project_id]
-      params['state'] = options[:status] if options[:status]
-      params['groupid'] = options[:group_id] if options[:group_id]
+      params['projectid'] = args[:project_id] if args[:project_id]
+      params['state'] = args[:status] if args[:status]
+      params['groupid'] = args[:group_id] if args[:group_id]
 
-      if options[:zone]
-        zone = get_zone(options[:zone])
+      if args[:zone]
+        zone = get_zone(args[:zone])
         unless zone 
-          puts "Error: Zone #{options[:zone]} not found"
+          puts "Error: Zone #{args[:zone]} not found"
           exit 1
         end
         params['zoneid'] = zone['id']  
       end
 
-      if options[:account]
-        if account = list_accounts({name: options[:account]}).first
+      if args[:account]
+        if account = list_accounts(name: args[:account]).first
           params['domainid'] = account["domainid"]
-          params['account'] = options[:account]
+          params['account'] = args[:account]
         end
       end
 

data/lib/cloudstack_client/commands/user.rb

@@ -14,7 +14,7 @@ module CloudstackClient
       params['listall'] = true if args[:listall]
       
       if args[:account]
-        account = list_accounts({name: args[:account]}).first
+        account = list_accounts(name: args[:account]).first
         unless account
           puts "Error: Account #{args[:account]} not found."
           exit 1

data/lib/cloudstack_client/commands/volume.rb

@@ -5,12 +5,33 @@ module CloudstackClient
 		##
     # Lists all volumes.
 
-    def list_volumes(project_id = nil)
+    def list_volumes(args = {})
       params = {
           'command' => 'listVolumes',
           'listall' => true,
       }
-      params['projectid'] = project_id if project_id
+
+      if args[:zone]
+        zone = get_zone(args[:zone])
+        unless zone 
+          puts "Error: Zone #{args[:zone]} not found"
+          exit 1
+        end
+        params['zoneid'] = zone['id']  
+      end
+
+      if args[:account]
+        if account = list_accounts(name: args[:account]).first
+          params['domainid'] = account["domainid"]
+          params['account'] = args[:account]
+        end
+      end
+
+      params['projectid'] = args[:project_id] if args[:project_id]
+      params['type'] = args[:type] if args[:type]
+      params['keyword'] = args[:keyword] if args[:keyword]
+      params['name'] = args[:name] if args[:name]
+  
       json = send_request(params)
       json['volume'] || []
     end

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

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