cloudstack-cli 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0627b894e7b7c1cef8693c8b0b467bb2deaa4cb2
-  data.tar.gz: b48db8f182a2d17717d7a9897ec775f975d0ed10
+  metadata.gz: 9ccb77e0ffb661b126a24d49267c01e7ee5d8475
+  data.tar.gz: f148f87197bafa1c1e627ff73311b9e1a04feb2b
 SHA512:
-  metadata.gz: 50f9c65fcee553a3b35a9881e84b52a87a2481bbc9975c3ea66fec608b7bb0c4f1676299ddc16ae5bb813af256ff801387f3ae7395d181b6eedb070717789046
-  data.tar.gz: f084ea2345dd07d0ca976d93d72cd2b13fbef5fd8753215bd97b346a426850b3aa40ca7247407d8b5740e242e8e3f682fc4f9135f701b982b3ade62221da11e7
+  metadata.gz: f3f6c49400185cc0f198a1a9f3e7ca33d82eded1102bbfaeaf3290e107c25ba282db5eca0d11f4242a7590b3017256c0be46b646d0ee6d69aed8708fb96ff2bd
+  data.tar.gz: 3fbdeac646beb0d2e50219e50a2874f9d482ccc3a0380f45c09548933021da6a27ab06b6d95da37771e1c3e65ccb1cebbdbe1b59c39f41a05aecb119717bbee5

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.1)
+    cloudstack-cli (1.5.2)
       cloudstack_client (~> 1.4)
       thor (~> 0.19)
 

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

@@ -1,6 +1,9 @@
 class Stack < CloudstackCli::Base
 
   desc "create STACKFILE", "create a stack of VMs"
+  option :skip_forwarding_rules, default: false,
+    type: :boolean, aliases: '-s',
+    desc: "Skip creation of port forwarding rules."
   def create(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
@@ -34,7 +37,6 @@ class Stack < CloudstackCli::Base
             keypair: instance["keypair"] || stack["keypair"],
             ip_address: instance["ip_address"]
           })
-
           jobs << {
             id: client.deploy_virtual_machine(
               vm_options_to_params,
@@ -47,22 +49,25 @@ class Stack < CloudstackCli::Base
     end
     watch_jobs(jobs)
 
-    say "Check for port forwarding rules...", :green
-    jobs = []
-    stack["servers"].each do |instance|
-      string_to_array(instance["name"]).each do |name|
-        if 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|
-            jobs << {
-              id: job_id,
-              name: "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
-            }
+    unless 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 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|
+              jobs << {
+                id: job_id,
+                name: "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
+              }
+            end
           end
         end
       end
+      watch_jobs(jobs)
     end
-    watch_jobs(jobs)
+
     say "Finished.", :green
   end
 
@@ -118,7 +123,8 @@ class Stack < CloudstackCli::Base
     end
 
     def load_string_or_array(item)
-     item.is_a?(Array) ? item : [item]
+      return nil if item == nil
+      item.is_a?(Array) ? item : [item]
     end
 
     def string_to_array(string)

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

@@ -91,9 +91,20 @@ class VirtualMachine < CloudstackCli::Base
   option :group, desc: "group name"
   option :account, desc: "account name"
   option :ip_address, desc: "the ip address for default vm's network"
+  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."
   def create(*names)
-    vm_options_to_params
+    if names.size == 0
+      say "Please provide at least one virtual machine name.", :yellow
+      exit 1
+    end
 
+    if options[:ip_network_list]
+      options[:ip_network_list] = array_to_network_list(options[:ip_network_list])
+    end
+
+    vm_options_to_params
     say "Start deploying virtual machine#{ "s" if names.size > 1 }...", :green
     jobs = names.map do |name|
       if virtual_machine = client.list_virtual_machines(name: name, project_id: options[:project_id]).first
@@ -131,15 +142,21 @@ class VirtualMachine < CloudstackCli::Base
 
   desc "destroy NAME [NAME2 ..]", "destroy virtual machine(s)"
   option :project
-  option :force, desc: "destroy without asking", type: :boolean, aliases: '-f'
+  option :force, desc: "destroy without confirmation", type: :boolean, aliases: '-f'
   option :expunge, desc: "expunge virtual machine immediately", type: :boolean, default: false, aliases: '-E'
   def destroy(*names)
+    if names.size == 0
+      say "Please provide at least one virtual machine name.", :yellow
+      exit 1
+    end
+
     resolve_project
     names.each do |name|
       unless virtual_machine = client.list_virtual_machines(options.merge(name: name, listall: true)).first
         say "Virtual machine #{name} not found.", :red
       else
-        ask = "Destroy #{name} (#{virtual_machine['state']})? [y/N]:"
+        action = options[:expunge] ? "Expunge" : "Destroy"
+        ask = "#{action} #{name} (#{virtual_machine['state']})? [y/N]:"
         if options[:force] || yes?(ask, :yellow)
           say "destroying #{name} "
           client.destroy_virtual_machine(
@@ -228,7 +245,7 @@ class VirtualMachine < CloudstackCli::Base
   option :ha_enable, enum: %w(true false),
     desc: "true if high-availability is enabled for the virtual machine, false otherwise"
   option :user_data,
-    desc: "an optional binary data that can be sent to the virtual machine upon a successful deployment."
+    desc: "optional binary data that can be sent to the virtual machine upon a successful deployment."
   def update(name)
     resolve_project
 
@@ -315,6 +332,14 @@ class VirtualMachine < CloudstackCli::Base
       run_background_jobs(jobs, "#{command}_virtual_machine")
     end
 
+    def array_to_network_list(arr)
+      arr.each.map do |item|
+        name = item.split(':')[0]
+        ip = item.split(':')[1]
+        {"name" => name, "ip" => ip}
+      end
+    end
+
   end # no_commands
 
 end

data/lib/cloudstack-cli/option_resolver.rb

@@ -109,11 +109,11 @@ module CloudstackCli
       if options[:ip_network_list]
         options[:ip_network_list].each do |item|
           unless network = available_networks.find { |n| n['name'] == item["name"] }
-            say "Error: Network '#{name}' not found.", :red
+            say "Error: Network '#{item["name"]}' not found.", :red
             exit 1
           end
           item.delete("name")
-          network_list << {networkid: network["id"]}.merge(item) # rescue nil
+          network_list << {networkid: network["id"]}.merge(item)
         end
       end
       network_list.compact!
@@ -122,6 +122,7 @@ module CloudstackCli
         exit 1
       end
       options[:ip_to_network_list] = network_list
+      [:network_ids, :ip_address].each { |k| options.delete(k) }
       options
     end
 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake