cloudstack_client 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9fbb45ce40bdb0236d5343c0cbc3b4c10db971d
-  data.tar.gz: c5424aaf51e164f39ffec350e092cb66b0d0302e
+  metadata.gz: ffd63beb8ab67704569e056c8179fa7038ae5794
+  data.tar.gz: 26304d025eb85cce68304fec2cb4aa129fd89d94
 SHA512:
-  metadata.gz: f188a35132d0fb2ddb6ab2751fbc520b80d270a7ab38904395410dbde12811a5120edd7c50cb0df27b2ca6b0e1c3bb8a3c2d69d9c72173475cb2470d2de39788
-  data.tar.gz: dd9189799dee9b6b107ecbeda491f7eee3f0a687603b0dbf8f1888c526f9d960b1232ebead4f6ba36755db01a3b801feecffa1c7ed76e80cebfde79caea7c1ae
+  metadata.gz: 629ca9e1c0e1625020da16904cbef4fd922ac2e2acd08aff9daa9373e994524e156ed6b0e6ca1001db4cbb0771fd93b367daa00159c283ebe3b4dce18044025b
+  data.tar.gz: ec077e92e135282048b52432c865346bd0d4c97b38342d4c914602488d217db11c7f5ea6529beb993ef8f51dd2a699e417b202cf81dffb440d2c7035332f2598

data/README.md

@@ -21,7 +21,7 @@ cs = CloudstackClient::Connection.new(
   'API_SECRET'
 )
      
-cs.list_servers(status: 'running').each do |server|
+cs.list_servers(state: 'running').each do |server|
   puts server['name']
 end
 ```    

data/lib/cloudstack_client/commands/server.rb

@@ -11,8 +11,6 @@ module CloudstackClient
           'listAll' => true,
           'name' => name
       }
-      params['projectid'] = args[:project_id] if args[:project_id]
-
 
       params['domainid'] = args[:domain_id] if args[:domain_id]
       if args[:account]
@@ -25,6 +23,18 @@ module CloudstackClient
         params['account'] = args[:account]
       end
 
+      if args[:project]
+        project = get_project(args[:project])
+        if !project
+          msg = "Project '#{args[:project]}' is invalid"
+          puts "Error: #{msg}"
+          exit 1
+        end
+        params['projectid'] = project['id']
+      elsif args[:project_id]
+        params['projectid'] = args[:project_id]
+      end
+
       json = send_request(params)
       machines = json['virtualmachine']
 
@@ -106,7 +116,7 @@ module CloudstackClient
         'command' => 'listVirtualMachines',
         'listAll' => true
       }
-      params['projectid'] = args[:project_id] if args[:project_id]
+      params['state'] = args[:state] if args[:state]
       params['state'] = args[:status] if args[:status]
       params['groupid'] = args[:group_id] if args[:group_id]
 
@@ -129,6 +139,18 @@ module CloudstackClient
         params['account'] = args[:account]
       end
 
+      if args[:project]
+        project = get_project(args[:project])
+        if !project
+          msg = "Project '#{args[:project]}' is invalid"
+          puts "Error: #{msg}"
+          exit 1
+        end
+        params['projectid'] = project['id']
+      elsif args[:project_id]
+        params['projectid'] = args[:project_id]
+      end
+
       json = send_request(params)
       json['virtualmachine'] || []
     end
@@ -191,15 +213,6 @@ module CloudstackClient
         exit 1
       end
 
-      if args[:project]
-        project = get_project(args[:project])
-        if !project
-          msg = "Project '#{args[:project]}' is invalid"
-          puts "Error: #{msg}"
-          exit 1
-        end
-      end
-
       networks = []
       if args[:networks]
         args[:networks].each do |name|
@@ -230,7 +243,6 @@ module CloudstackClient
           'networkids' => network_ids.join(',')
       }
       params['name'] = args[:name] if args[:name]
-      params['projectid'] = project['id'] if project
       params['diskofferingid'] = disk_offering['id'] if disk_offering
       params['hypervisor'] = (args[:hypervisor] || 'vmware') if iso
       params['keypair'] = args[:keypair] if args[:keypair]
@@ -248,6 +260,18 @@ module CloudstackClient
         params['account'] = args[:account]
       end
 
+      if args[:project]
+        project = get_project(args[:project])
+        if !project
+          msg = "Project '#{args[:project]}' is invalid"
+          puts "Error: #{msg}"
+          exit 1
+        end
+        params['projectid'] = project['id']
+      elsif args[:project_id]
+        params['projectid'] = args[:project_id]
+      end
+
       args[:sync] ? send_request(params) : send_async_request(params)['virtualmachine']
     end
 

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Nik Wolfgramm