stack.rb in cloudstack-cli-0.3.5

- old
+ new

@@ -1,51 +1,100 @@
 class Stack < CloudstackCli::Base
 
 	desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)
   	stack = parse_stackfile(stackfile)
-    say "Create stack #{stack["name"]}..."
-    threads = []
-    stack["servers"].each do |server|
-      server["name"].split(', ').each_with_index do |name, i|
-        threads << Thread.new(i) {
-          bootstrap_server(
-            name: name,
-            displayname: server["decription"],
-            zone: server["zone"] || stack["zone"],
-            template: server["template"],
-            iso: server["iso"] ,
-            offering: server["offering"],
-            networks: string_to_array(server["networks"]),
-            port_rules: string_to_array(server["port_rules"]),
-            project: stack["project"],
-            disk_offering: server["disk_offering"],
-            disk_size: server["disk_size"],
-            group: server["group"] || stack["group"],
-            keypair: server["keypair"] || stack["keypair"]
-          )
-        }
+    say "Create stack #{stack["name"]}...", :green
+    projectid = find_project(stack["project"])['id'] if stack["project"]
+    jobs = []
+    client.verbose = false
+    stack["servers"].each do |instance|
+      instance["name"].gsub(', ', ',').split(',').each do |name|
+        server = client.get_server(name, projectid)
+        if server
+          say "Server #{name} (#{server["state"]}) already exists.", :yellow
+          jobs << {
+            id: 0,
+            name: "Create server #{name}",
+            status: 1
+          }
+        else
+          jobs << {
+            id: client.create_server(
+              {
+                name: name,
+                displayname: instance["decription"],
+                zone: instance["zone"] || stack["zone"],
+                template: instance["template"],
+                iso: instance["iso"] ,
+                offering: instance["offering"],
+                networks: string_to_array(instance["networks"]),
+                project: stack["project"],
+                disk_offering: instance["disk_offering"],
+                disk_size: instance["disk_size"],
+                group: instance["group"] || stack["group"],
+                keypair: instance["keypair"] || stack["keypair"],
+                sync: true
+              }
+            )['jobid'],
+            name: "Create server #{name}"
+          }
+        end
       end
     end
-    threads.each {|t| t.join }
+    watch_jobs(jobs)
+    
+    say "Check for port forwarding rules...", :green
+    jobs = []
+    stack["servers"].each do |instance|
+      instance["name"].gsub(', ', ',').split(',').each do |name|
+        if port_rules = string_to_array(instance["port_rules"])
+          server = client(quiet: true).get_server(name, projectid)
+          create_port_rules(server, port_rules, false).each_with_index do |job_id, index|
+            jobs << {
+              id: job_id,
+              name: "Create port forwarding ##{index + 1} rules for server #{name}"
+            }
+          end
+        end
+      end
+    end
+    watch_jobs(jobs)
+    say "Finished.", :green
   end
 
   desc "destroy STACKFILE", "destroy a stack of servers"
   option :force,
     description: "destroy without asking",
     type: :boolean,
     default: false,
     aliases: '-f'
   def destroy(stackfile)
     stack = parse_stackfile(stackfile)
+    projectid = find_project(stack["project"])['id'] if stack["project"]
+    client.verbose = false
     servers = []
-    server = stack["servers"].collect do |server|
-      server["name"].split(', ').each {|name| servers << name}
+    stack["servers"].each do |server|
+      server["name"].gsub(', ', ',').split(',').each {|name| servers << name}
     end
-    say "Destroy stack #{stack["name"]}...", :yellow
-    puts
-    invoke "server:destroy", servers, project: stack["project"], force: options[:force]
+
+    if options[:force] || yes?("Destroy the following servers #{servers.join(', ')}?", :yellow)
+      jobs = []
+      servers.each do |name|
+        server = client(quiet: true).get_server(name, projectid)
+        if server
+          jobs << {
+            id: client.destroy_server(
+              server['id'], false
+            )['jobid'],
+            name: "Destroy server #{name}"
+          }
+        end
+      end
+      watch_jobs(jobs)
+      say "Finished.", :green
+    end
   end
 
   no_commands do
     def parse_stackfile(stackfile)
       begin
@@ -57,10 +106,10 @@
         exit
       end
     end
 
     def string_to_array(string)
-      string ? string.gsub(', ', ',').split(', ') : nil
+      string ? string.gsub(', ', ',').split(',') : nil
     end
   end
 
 end
\ No newline at end of file