cloudstack-cli 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d099b0bfa2e3e253687b229068afb8bd7db8c26c
-  data.tar.gz: 9834e72d1fc6f4fea8d3e6aa8483ecf05df6a592
+  metadata.gz: ffadc0abeb36e96de2834f68f1f892685a34ef55
+  data.tar.gz: 8977041739bfc80f370c07d8dde52418b744e626
 SHA512:
-  metadata.gz: 73dac4d635ea0c72e53f09a1d7a71f99591a188aa6c3f47327c737d0024defe095c913106cac6a85dd0b0df3826082a89bbccae061035b8104ee326e57665550
-  data.tar.gz: 665f5287031e7065eaf49372cbc9679cbb9da07e2a0a92a668bd7eddc3d85ac1462ad974222b7aab0b6e4d6afd09615d6db7a2cf27cb6a5272b7f86976498a8c
+  metadata.gz: 8400276d74958d7c19f8cf1649360190339faa317145b91cd9f3845618e84375e574ab43ad4585da9c8476d1f9feeffd04c60b4a33d5872769489a3cafafb98a
+  data.tar.gz: 1e60b27a881ff70e68c6add4a7e7801731f8ac37ab366457c616dcc8036e657b8550cd227ab548923309e832bbd69a6f9291abff293d4f36640ab1d6d72194b1

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.7)
+    cloudstack-cli (1.5.8)
       cloudstack_client (~> 1.4.3)
       thor (~> 0.19)
 

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

@@ -108,7 +108,7 @@ class VirtualMachine < CloudstackCli::Base
         name: name, project_id: options[:project_id]
         ).first
         say "virtual machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
-        job = {id: 0, name: "Create virtual machine #{name}", status: 1}
+        job = {id: 0, name: "Create virtual machine #{name}", status: 3}
       else
         job = {
           id: client.deploy_virtual_machine(options.merge(name: name), {sync: true})['jobid'],
@@ -120,19 +120,27 @@ class VirtualMachine < CloudstackCli::Base
     watch_jobs(jobs)
     if options[:port_rules].size > 0
       say "Create port forwarding rules...", :green
-      jobs = []
+      pjobs = []
       names.each do |name|
         virtual_machine = client.list_virtual_machine(name: name, project_id: options[:project_id]).first
         create_port_rules(virtual_machine, options[:port_rules], false).each_with_index do |job_id, index|
-          jobs << {
+          pjobs << {
             id: job_id,
             name: "Create port forwarding ##{index + 1} rules for virtual machine #{virtual_machine['name']}"
           }
         end
       end
-      watch_jobs(jobs)
+      watch_jobs(pjobs)
     end
     say "Finished.", :green
+    if (jobs.count {|job| job[:status] == 1 } > 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
+      end
+      print_table table
+    end
   end
 
   desc "destroy NAME [NAME2 ..]", "destroy virtual machine(s)"

data/lib/cloudstack-cli/helper.rb

@@ -15,7 +15,8 @@ module CloudstackCli
       -1 => "waiting",
       0  => "running",
       1  => "completed",
-      2  => "error"
+      2  => "error",
+      3  => "aborted"
     }
 
     def watch_jobs(jobs)
@@ -120,7 +121,7 @@ module CloudstackCli
       end
       t_elapsed = opts[:t_start] ? (Time.now - opts[:t_start]).round(1) : 0
       completed = jobs.select{|j| j[:status] == 1}.size
-      say "Completed: #{completed}/#{jobs.size} (#{t_elapsed}s)", :magenta
+      say "Completed: #{completed} of #{jobs.size} (#{t_elapsed}s)", :magenta
       sleep opts[:sleeptime] || 0.1
       spinner.push spinner.shift
       spinner

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Nik Wolfgramm