cloudstack-cli 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3825bffdc7d610ccd33d5ea01d48804ad3caeaf
-  data.tar.gz: 23e2821aaf38b61cbc98091a460f91e42d75ebb9
+  metadata.gz: 9db726fce7f2ff20082296b4e424db14497a04ab
+  data.tar.gz: 6d6177310113255ec6ff7b34fc56dece69ff0c66
 SHA512:
-  metadata.gz: 2eca64f2d69c815e19fbf7696087efc5a9a0f3f743acec88c5ea26c8b6a155510f1471b977bac4d6113dd351148abf393402698dec05ab4f938997be8c30a5cb
-  data.tar.gz: 7c43cc6ce81a7df4c7bffc94a967786fc76ff50da12951ec2eafda751e9da1541a83263c4c69870f525338e9687715b4a0b7c0f1244df99a540d680fab880ad2
+  metadata.gz: 2e6177a5cd286a74c2374ef3171d8c886e36e7abb94ded0e482bf1d4e86613ba56b103c00963fcfe30e6aad1bdfa49c2d659fd1bf5721a8cf81f94c0a8c89714
+  data.tar.gz: a09c1c2ceed2856f46f5cececfd61248bb87fd87d7b5f62d0d8fe49bedbcde4ab94b98fd6cf7b87e308cdf5a6cbeb5222a5890a215bbf1956ad36d958cda0b21

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.9)
+    cloudstack-cli (1.5.10)
       cloudstack_client (~> 1.4.3)
       thor (~> 0.19)
 
@@ -25,4 +25,4 @@ DEPENDENCIES
   rake (~> 11.3)
 
 BUNDLED WITH
-   1.13.2
+   1.13.6

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

@@ -10,10 +10,13 @@ class PortRule < CloudstackCli::Base
   option :keyword, desc: "list by keyword"
   def create(server_name)
     resolve_project
-    unless server = client.list_virtual_machines(name: server_name, project_id: options[:project_id]).first
+    unless server = client.list_virtual_machines(
+      name: server_name, project_id: options[:project_id], listall: true
+      ).find {|vm| vm["name"] == server_name }
       error "Server #{server_name} not found."
       exit 1
     end
+    ip_addr = nil
     options[:rules].each do |pf_rule|
       ip = pf_rule.split(":")[0]
       unless ip == ''
@@ -23,16 +26,13 @@ class PortRule < CloudstackCli::Base
         end
       else
         say "Assign a new IP address ", :yellow
-        say(" OK", :green) if ip_addr = client.associate_ip_address(
-          networkid: client.list_networks(
-            project_id: options[:project_id]
-          ).find {|n| n['name'] == options[:network]}['id'],
-          project_id: options[:project_id]
-        )
+        net_id = client.list_networks(project_id: options[:project_id]).find {|n| n['name'] == options[:network]}['id']
+        say(" OK", :green) if ip_addr = client.associate_ip_address(networkid: net_id)["ipaddress"]
       end
       port = pf_rule.split(":")[1]
       say "Create port forwarding rule #{ip_addr["ipaddress"]}:#{port} for server #{server_name} ", :yellow
-      say(" OK.", :green) if client.create_port_forwarding_rule(
+
+      say(" OK", :green) if client.create_port_forwarding_rule(
         ipaddress_id: ip_addr["id"],
         public_port: port,
         private_port: port,

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

@@ -13,7 +13,7 @@ class Router < CloudstackCli::Base
     desc: "command to execute for each router",
     enum: %w(START STOP REBOOT STOP_START)
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
-    desc: "number of concurrent command to execute"
+    desc: "number of concurrent commands to execute"
   option :format, default: "table",
     enum: %w(table json yaml)
   option :showid, type: :boolean, desc: "display the router ID"
@@ -43,7 +43,7 @@ class Router < CloudstackCli::Base
     desc: "command to execute for each router",
     enum: %w(START STOP REBOOT)
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
-    desc: "number of concurrent command to execute"
+    desc: "number of concurrent commands to execute"
   option :format, default: "table",
     enum: %w(table json yaml)
   def list_from_file(file)
@@ -219,7 +219,7 @@ class Router < CloudstackCli::Base
         jobs = routers.map do |router|
           {
             job_id: nil,
-            object_id: router["id"],
+            args: { id: router["id"] },
             name: "#{cmd.capitalize} router #{router['name']}",
             status: -1
           }

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

@@ -6,25 +6,28 @@ class Stack < CloudstackCli::Base
   option :skip_forwarding_rules, default: false,
     type: :boolean, aliases: '-s',
     desc: "Skip creation of port forwarding rules."
+  option :concurrency, type: :numeric, default: 10, aliases: '-C',
+    desc: "number of concurrent commands to execute"
   def create(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
+
     say "Create stack #{stack["name"]}...", :green
     jobs = []
     stack["servers"].each do |instance|
       string_to_array(instance["name"]).each do |name|
         if !options[:limit] || options[:limit].include?(name)
-          server = client.list_virtual_machines(name: name, project_id: project_id).first
-          if server
+          if server = client.list_virtual_machines(
+            name: name, project_id: project_id, listall: true
+          ).find {|vm| vm["name"] == name }
             say "VM #{name} (#{server["state"]}) already exists.", :yellow
             jobs << {
               id: 0,
               name: "Create VM #{name}",
-              status: 1
+              status: 3
             }
           else
             options.merge!({
-              name: name,
               displayname: instance["decription"],
               zone: instance["zone"] || stack["zone"],
               project: stack["project"],
@@ -39,36 +42,55 @@ class Stack < CloudstackCli::Base
               keypair: instance["keypair"] || stack["keypair"],
               ip_address: instance["ip_address"]
             })
+            vm_options_to_params
             jobs << {
-              id: client.deploy_virtual_machine(
-                vm_options_to_params,
-                {sync: true}
-              )['jobid'],
-              name: "Create VM #{name}"
+              job_id: nil,
+              args: options.merge(name: name),
+              name: "Create VM #{name}",
+              status: -1
             }
           end
         end
       end
     end
-    watch_jobs(jobs)
 
-    unless options[:skip_forwarding_rules]
+    if jobs.count{|job| job[:status] < 1 } > 0
+      run_background_jobs(jobs, "deploy_virtual_machine")
+    end
+
+    # count jobs with status 1 => Completed
+    successful_jobs = jobs.count {|job| job[:status] == 1 }
+    unless successful_jobs == 0 || options[:skip_forwarding_rules]
       say "Check for port forwarding rules...", :green
-      jobs = []
-      stack["servers"].each do |instance|
-        string_to_array(instance["name"]).each do |name|
-          if (!options[:limit] || options[:limit].include?(name)) && port_rules = string_to_array(instance["port_rules"])
-            server = client.list_virtual_machines(name: name, project_id: project_id).first
-            create_port_rules(server, port_rules, false).each_with_index do |job_id, index|
-              job_name = "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
-              jobs << {id: job_id, name: job_name}
-            end
+      pjobs = []
+      jobs.select{|job| job[:status] == 1}.each do |job|
+        vm = job[:result]["virtualmachine"]
+        vm_def = find_vm_in_stack(vm["name"], stack)
+        if port_rules = string_to_array(vm_def["port_rules"])
+          create_port_rules(vm, port_rules, false).each_with_index do |job_id, index|
+            job_name = "Create port forwarding rules (#{port_rules[index]}) for VM #{vm["name"]}"
+            pjobs << {id: job_id, name: job_name}
           end
         end
       end
-      watch_jobs(jobs)
+      watch_jobs(pjobs)
+      pjobs.each do |job|
+        if job[:result]
+          result = job[:result]["portforwardingrule"]
+          puts "Created port forwarding rule #{result['ipaddress']}:#{result['publicport']} => #{result['privateport']} for VM #{result['virtualmachinename']}"
+        end
+      end
     end
     say "Finished.", :green
+
+    if successful_jobs > 0 && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
+      pw_table = jobs.select {|job| job[:status] == 1 && job[:result] }.map do |job|
+        if result = job[:result]["virtualmachine"]
+          ["#{result["name"]}:", result["password"] || "n/a"]
+        end
+      end
+      print_table(pw_table) if pw_table.size > 0
+    end
   end
 
   desc "destroy STACKFILE", "destroy a stack of VMs"
@@ -101,10 +123,13 @@ class Stack < CloudstackCli::Base
       exit
     end
 
-    if options[:force] || yes?("Destroy the following VM #{servers.join(', ')}? [y/N]:", :yellow)
+    if options[:force] ||
+      yes?("Destroy #{'and expunge ' if options[:expunge]}the following VM(s)? #{servers.join(', ')} [y/N]:", :yellow)
       jobs = []
       servers.each do |name|
-        if server = client.list_virtual_machines(name: name, project_id: project_id).first
+        if server = client.list_virtual_machines(
+          name: name, project_id: project_id, listall: true
+          ).find {|vm| vm["name"] == name }
           jobs << {
             id: client.destroy_virtual_machine(
               { id: server['id'], expunge: options[:expunge] },
@@ -142,6 +167,14 @@ class Stack < CloudstackCli::Base
       string ? string.gsub(', ', ',').split(',') : nil
     end
 
+    def find_vm_in_stack(name, stack)
+      stack["servers"].each do |server|
+        if string_to_array(server["name"]).find{|n| n == name }
+          return server
+        end
+      end
+    end
+
   end # no_commands
 
 end

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

@@ -15,7 +15,7 @@ class VirtualMachine < CloudstackCli::Base
     desc: "command to execute for the given virtual machines",
     enum: %w(START STOP REBOOT)
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
-    desc: "number of concurrent command to execute"
+    desc: "number of concurrent commands to execute"
   option :format, default: "table",
     enum: %w(table json yaml)
   def list
@@ -78,7 +78,7 @@ class VirtualMachine < CloudstackCli::Base
   option :zone, aliases: '-z', required: true, desc: "availability zone name"
   option :networks, aliases: '-n', type: :array, desc: "network names"
   option :project, aliases: '-p', desc: "project name"
-  option :port_rules, aliases: '-pr', type: :array,
+  option :port_rules, type: :array,
     default: [],
     desc: "Port Forwarding Rules [public_ip]:port ..."
   option :disk_offering, desc: "disk offering (data disk for template, root disk for iso)"
@@ -91,6 +91,8 @@ class VirtualMachine < CloudstackCli::Base
   option :ip_network_list, desc: "ip_network_list (net1:ip net2:ip...)", type: :array
   option :user_data,
     desc: "optional binary data that can be sent to the virtual machine upon a successful deployment."
+  option :concurrency, type: :numeric, default: 10, aliases: '-C',
+    desc: "number of concurrent commands to execute"
   def create(*names)
     if names.size == 0
       say "Please provide at least one virtual machine name.", :yellow
@@ -106,39 +108,45 @@ class VirtualMachine < CloudstackCli::Base
     jobs = names.map do |name|
       if virtual_machine = find_vm_by_name(name)
         say "virtual machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
-        job = {id: 0, name: "Create virtual machine #{name}", status: 3}
+        job = {name: "Create virtual machine #{name}", status: 3}
       else
         job = {
-          id: client.deploy_virtual_machine(options.merge(name: name), {sync: true})['jobid'],
-          name: "Create virtual machine #{name}"
+          args: options.merge(name: name),
+          name: "Create VM #{name}",
+          status: -1
         }
       end
       job
     end
-    watch_jobs(jobs)
+
+    if jobs.count{|job| job[:status] < 1 } > 0
+      run_background_jobs(jobs, "deploy_virtual_machine")
+    end
+
     successful_jobs = jobs.count {|job| job[:status] == 1 }
     if options[:port_rules].size > 0 && successful_jobs > 0
       say "Create port forwarding rules...", :green
       pjobs = []
-      names.each do |name|
-        vm = client.list_virtual_machines(name: name, project_id: options[:project_id]).first
+      jobs.select{|job| job[:status] == 1}.each do |job|
+        vm = job[:result]["virtualmachine"]
         create_port_rules(vm, options[:port_rules], false).each_with_index do |job_id, index|
           pjobs << {
             id: job_id,
-            name: "Create port forwarding ##{index + 1} rules for VM #{vm['name']}"
+            name: "Create port forwarding rule #{options[:port_rules][index]} for VM #{vm['name']}"
           }
         end
       end
       watch_jobs(pjobs)
     end
     say "Finished.", :green
+
     if successful_jobs > 0 && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
-      table = []
-      jobs.each do |job|
-        data = client.query_async_job_result(jobid: job[:id])["jobresult"]["virtualmachine"] rescue nil
-        table << ["#{data["name"]}:", data["password"]] if data
+      pw_table = jobs.select {|job| job[:status] == 1 && job[:result] }.map do |job|
+        if result = job[:result]["virtualmachine"]
+          ["#{result["name"]}:", result["password"] || "n/a"]
+        end
       end
-      print_table table
+      print_table(pw_table) if pw_table.size > 0
     end
   end
 
@@ -319,7 +327,7 @@ class VirtualMachine < CloudstackCli::Base
       jobs = virtual_machines.map do |vm|
         {
           job_id: nil,
-          object_id: vm["id"],
+          args: { id: vm["id"] },
           name: "#{command.capitalize} virtual machine #{vm['name']}",
           status: -1
         }

data/lib/cloudstack-cli/helper.rb

@@ -24,7 +24,7 @@ module CloudstackCli
       call = 0
       opts = {t_start: Time.now}
       jobs = update_job_status(jobs)
-      while jobs.select{|job| job[:status].to_i < 1 }.size > 0 do
+      while jobs.count{|job| job[:status].to_i < 1 } > 0 do
         if call.modulo(40) == 0
           t = Thread.new { jobs = update_job_status(jobs) }
           while t.alive?
@@ -50,7 +50,12 @@ module CloudstackCli
       jobs.each do |job|
         job[:status] = 0 unless job[:status]
         if job[:status] == 0
-          job[:status] = client.query_async_job_result(job_id: job[:id])['jobstatus']
+          result = client.query_async_job_result(job_id: job[:id])
+          job[:status] = result["jobstatus"]
+          # add result information for terminated jobs
+          if job[:status].between?(1, 2)
+            job[:result] = result["jobresult"]
+          end
         end
       end
       jobs
@@ -62,7 +67,7 @@ module CloudstackCli
         call = 0
         opts = {t_start: Time.now}
 
-        while jobs.select{|job| job[:status] < 1 }.size > 0 do
+        while jobs.count{|job| job[:status] < 1 } > 0 do
           if call.modulo(40) == 0
             t = Thread.new { jobs = update_jobs(jobs, command) }
             while t.alive?
@@ -90,19 +95,23 @@ module CloudstackCli
       # update running job status
       threads = jobs.select{|job| job[:status] == 0 }.map do |job|
         Thread.new do
-          job[:status] = client.query_async_job_result(job_id: job[:job_id])['jobstatus']
+          result = client.query_async_job_result(job_id: job[:job_id])
+          job[:status] = result['jobstatus']
+          if job[:status].between?(1, 2)
+            job[:result] = result["jobresult"]
+          end
         end
       end
       threads.each(&:join)
 
       # launch new jobs if required and possible
-      launch_capacity = options[:concurrency] - jobs.select{|job| job[:status] == 0 }.count
+      launch_capacity = (options[:concurrency] ||= 10) - jobs.count{|job| job[:status] == 0 }
       threads = []
       jobs.select{|job| job[:status] == -1 }.each do |job|
         if launch_capacity > 0
           threads << Thread.new do
             job[:job_id] = client.send(
-              command, { id: job[:object_id] }, { sync: true }
+              command, job[:args], { sync: true }
             )['jobid']
             job[:status] = 0
           end
@@ -120,7 +129,7 @@ module CloudstackCli
         puts job[:status] == 0 ? spinner.first : ""
       end
       t_elapsed = opts[:t_start] ? (Time.now - opts[:t_start]).round(1) : 0
-      completed = jobs.select{|j| j[:status] == 1}.size
+      completed = jobs.count{|j| j[:status] == 1 }
       say "Completed: #{completed} of #{jobs.size} (#{t_elapsed}s)", :magenta
       sleep opts[:sleeptime] || 0.1
       spinner.push spinner.shift

data/lib/cloudstack-cli/option_resolver.rb

@@ -18,6 +18,7 @@ module CloudstackCli
       else
         resolve_networks
       end
+      options
     end
 
     def resolve_zone

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.9"
+  VERSION = "1.5.10"
 end

data/test/stack_example_b.yml

@@ -0,0 +1,14 @@
+---
+  name: "web_stack_b"
+  description: "Web Application Stack"
+  version: "1.0"
+  zone: "ZUERICH_EQ"
+  project: "Playground"
+  group: "my_web_stack"
+  servers:
+    - name: "webx-01, webx-02"
+      description: "Web nodes"
+      template: "CentOS-7-x86_64"
+      offering: "1cpu_1gb"
+      networks: "M_PLAY"
+      port_rules: ":80, :443"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +111,7 @@ files:
 - test/ma-test.yml
 - test/stack_example.json
 - test/stack_example.yml
+- test/stack_example_b.yml
 homepage: http://github.com/niwo/cloudstack-cli
 licenses:
 - MIT
@@ -141,3 +142,4 @@ test_files:
 - test/ma-test.yml
 - test/stack_example.json
 - test/stack_example.yml
+- test/stack_example_b.yml