cloudstack_client 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd63beb8ab67704569e056c8179fa7038ae5794
-  data.tar.gz: 26304d025eb85cce68304fec2cb4aa129fd89d94
+  metadata.gz: 20779611c9bf0415cd3b21dd3c66d26f3420f81e
+  data.tar.gz: 0c8028ee8e322b7e091acaaf4ed8dbe32e4b6bb4
 SHA512:
-  metadata.gz: 629ca9e1c0e1625020da16904cbef4fd922ac2e2acd08aff9daa9373e994524e156ed6b0e6ca1001db4cbb0771fd93b367daa00159c283ebe3b4dce18044025b
-  data.tar.gz: ec077e92e135282048b52432c865346bd0d4c97b38342d4c914602488d217db11c7f5ea6529beb993ef8f51dd2a699e417b202cf81dffb440d2c7035332f2598
+  metadata.gz: fa661e5349b428162a9553516e940328dd19f1006e97c2dabd87e1689a422840833680e4ec21a745819ce9957e251d5723c054ecbe6e37750aca40b1264286fa
+  data.tar.gz: a76e3df97e98cd7042a55572013fa2380bc329f237266404a9095f6232eb3c7f3c39b7c26d15faac8a4d0a2920d1658550f233292635449480a8de42d7e01d11

data/lib/cloudstack_client/commands/ip_address.rb

@@ -53,11 +53,12 @@ module CloudstackClient
     ##
     # Acquires and associates a public IP to an account.
 
-    def associate_ip_address(network_id)
+    def associate_ip_address(network_id, project_id = nil)
       params = {
           'command' => 'associateIpAddress',
           'networkid' => network_id
       }
+      params['projectid'] = project_id if project_id
 
       json = send_async_request(params)
       json['ipaddress']

data/lib/cloudstack_client/commands/server.rb

@@ -159,18 +159,74 @@ module CloudstackClient
     # Deploys a new server using the specified parameters.
 
     def create_server(args = {})
+      params = {'command' => 'deployVirtualMachine'}
+      params['keypair'] = args[:keypair] if args[:keypair]
+      params['size'] = args[:disk_size] if args[:disk_size]
+      params['group'] = args[:group] if args[:group]
+      params['displayname'] = args[:displayname] if args[:displayname]
+
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        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
+      params['name'] = args[:name] if args[:name]
+
       if args[:name]
-        if get_server(args[:name])
+        server = params['projectid'] ? 
+          get_server(args[:name], project_id: params['projectid']) :
+          get_server(args[:name])
+        if server 
           puts "Error: Server '#{args[:name]}' already exists."
           exit 1
         end
       end
 
+      networks = []
+      if args[:networks]
+        args[:networks].each do |name|
+          network = defined?(project) ? get_network(name, project['id']) : get_network(name)
+          if !network
+            puts "Error: Network '#{name}' not found"
+            exit 1
+          end
+          networks << network
+        end
+      end
+      if networks.empty?
+        networks << get_default_network
+      end
+      if networks.empty?
+        puts "No default network found"
+        exit 1
+      end
+      network_ids = networks.map { |network|
+        network['id']
+      }
+      params['networkids'] = network_ids.join(',')
+
       service = get_service_offering(args[:offering])
       if !service
         puts "Error: Service offering '#{args[:offering]}' is invalid"
         exit 1
       end
+      params['serviceOfferingId'] = service['id']
 
       if args[:template]
         template = get_template(args[:template])
@@ -187,6 +243,7 @@ module CloudstackClient
           puts "Error: #{msg}"
           exit 1
         end
+        params['diskofferingid'] = disk_offering['id']
       end
 
       if args[:iso]
@@ -199,12 +256,14 @@ module CloudstackClient
           puts "Error: a disk offering is required when using iso"
           exit 1
         end
+        params['hypervisor'] = (args[:hypervisor] || 'vmware')
       end
 
       if !template && !iso
         puts "Error: Iso or Template is required"
         exit 1
       end
+      params['templateId'] = template ? template['id'] : iso['id']
 
       zone = args[:zone] ? get_zone(args[:zone]) : get_default_zone
       if !zone
@@ -212,65 +271,7 @@ module CloudstackClient
         puts "Error: #{msg}"
         exit 1
       end
-
-      networks = []
-      if args[:networks]
-        args[:networks].each do |name|
-          network = project ? get_network(name, project['id']) : get_network(name)
-          if !network
-            puts "Error: Network '#{name}' not found"
-            exit 1
-          end
-          networks << network
-        end
-      end
-      if networks.empty?
-        networks << get_default_network
-      end
-      if networks.empty?
-        puts "No default network found"
-        exit 1
-      end
-      network_ids = networks.map { |network|
-        network['id']
-      }
-
-      params = {
-          'command' => 'deployVirtualMachine',
-          'serviceOfferingId' => service['id'],
-          'templateId' => template ? template['id'] : iso['id'],
-          'zoneId' => zone['id'],
-          'networkids' => network_ids.join(',')
-      }
-      params['name'] = args[:name] if args[:name]
-      params['diskofferingid'] = disk_offering['id'] if disk_offering
-      params['hypervisor'] = (args[:hypervisor] || 'vmware') if iso
-      params['keypair'] = args[:keypair] if args[:keypair]
-      params['size'] = args[:disk_size] if args[:disk_size]
-      params['group'] = args[:group] if args[:group]
-      params['displayname'] = args[:displayname] if args[:displayname]
-
-      if args[:account]
-        account = list_accounts({name: args[:account]}).first
-        unless account
-          puts "Error: Account #{args[:account]} not found."
-          exit 1
-        end
-        params['domainid'] = account["domainid"]
-        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
+      params['zoneid'] = zone['id']
 
       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.3"
+  VERSION = "0.4.4"
 end

metadata

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