lib/cloudstack-cli/commands/stack.rb in cloudstack-cli-1.5.3 vs lib/cloudstack-cli/commands/stack.rb in cloudstack-cli-1.5.4

@@ -1,75 +1,75 @@
 class Stack < CloudstackCli::Base
 
-  desc "create STACKFILE", "create a stack of VMs"
+  desc "create STACKFILE", "create a stack of VM's"
+  option :limit, type: :array, aliases: '-l',
+    desc: "Limit on specific server names."
   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"])
-
     say "Create stack #{stack["name"]}...", :green
     jobs = []
     stack["servers"].each do |instance|
       string_to_array(instance["name"]).each do |name|
-        server = client.list_virtual_machines(name: name, project_id: project_id).first
-        if server
-          say "VM #{name} (#{server["state"]}) already exists.", :yellow
-          jobs << {
-            id: 0,
-            name: "Create VM #{name}",
-            status: 1
-          }
-        else
-          options.merge!({
-            name: name,
-            displayname: instance["decription"],
-            zone: instance["zone"] || stack["zone"],
-            project: stack["project"],
-            template: instance["template"],
-            iso: instance["iso"] ,
-            offering: instance["offering"],
-            networks: load_string_or_array(instance["networks"]),
-            ip_network_list: instance["ip_network_list"],
-            disk_offering: instance["disk_offering"],
-            size: instance["disk_size"],
-            group: instance["group"] || stack["group"],
-            keypair: instance["keypair"] || stack["keypair"],
-            ip_address: instance["ip_address"]
-          })
-          jobs << {
-            id: client.deploy_virtual_machine(
-              vm_options_to_params,
-              {sync: true}
-            )['jobid'],
-            name: "Create VM #{name}"
-          }
+        if options[:limit].include?(name)
+          server = client.list_virtual_machines(name: name, project_id: project_id).first
+          if server
+            say "VM #{name} (#{server["state"]}) already exists.", :yellow
+            jobs << {
+              id: 0,
+              name: "Create VM #{name}",
+              status: 1
+            }
+          else
+            options.merge!({
+              name: name,
+              displayname: instance["decription"],
+              zone: instance["zone"] || stack["zone"],
+              project: stack["project"],
+              template: instance["template"],
+              iso: instance["iso"] ,
+              offering: instance["offering"],
+              networks: load_string_or_array(instance["networks"]),
+              ip_network_list: instance["ip_network_list"],
+              disk_offering: instance["disk_offering"],
+              size: instance["disk_size"],
+              group: instance["group"] || stack["group"],
+              keypair: instance["keypair"] || stack["keypair"],
+              ip_address: instance["ip_address"]
+            })
+            jobs << {
+              id: client.deploy_virtual_machine(
+                vm_options_to_params,
+                {sync: true}
+              )['jobid'],
+              name: "Create VM #{name}"
+            }
+          end
         end
       end
     end
     watch_jobs(jobs)
 
     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"])
+          if 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|
-              jobs << {
-                id: job_id,
-                name: "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
-              }
+              job_name = "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
+              jobs << {id: job_id, name: job_name}
             end
           end
         end
       end
       watch_jobs(jobs)
     end
-
     say "Finished.", :green
   end
 
   desc "destroy STACKFILE", "destroy a stack of VMs"
   option :force,
@@ -80,15 +80,24 @@
   option :expunge,
     desc: "expunge VMs immediately",
     type: :boolean,
     default: false,
     aliases: '-E'
+  option :limit, type: :array, aliases: '-l',
+    desc: "Limit on specific server names."
   def destroy(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
     servers = []
     stack["servers"].each do |server|
-      string_to_array(server["name"]).each {|name| servers << name}
+      string_to_array(server["name"]).each do |name|
+        servers << name if options[:limit].include?(name)
+      end
+    end
+
+    if servers.size == 0
+      say "No servers in stack selected.", :yellow
+      exit
     end
 
     if options[:force] || yes?("Destroy the following VM #{servers.join(', ')}? [y/N]:", :yellow)
       jobs = []
       servers.each do |name|