lib/cloudstack-cli/commands/stack.rb in cloudstack-cli-0.15.1 vs lib/cloudstack-cli/commands/stack.rb in cloudstack-cli-1.0.0.rc1

@@ -1,44 +1,46 @@
 class Stack < CloudstackCli::Base
 
-  desc "create STACKFILE", "create a stack of servers"
+  desc "create STACKFILE", "create a stack of VMs"
   def create(stackfile)
     stack = parse_file(stackfile)
+    project_id = find_project_by_name(stack["project"])
+
     say "Create stack #{stack["name"]}...", :green
-    projectid = find_project(stack["project"])['id'] if stack["project"]
     jobs = []
-    client.verbose = false
     stack["servers"].each do |instance|
       string_to_array(instance["name"]).each do |name|
-        server = client.get_server(name, project_id: projectid)
+        server = client.list_virtual_machines(name: name, project_id: project_id).first
         if server
-          say "Server #{name} (#{server["state"]}) already exists.", :yellow
+          say "VM #{name} (#{server["state"]}) already exists.", :yellow
           jobs << {
             id: 0,
-            name: "Create server #{name}",
+            name: "Create VM #{name}",
             status: 1
           }
         else
+          options = {
+            name: name,
+            displayname: instance["decription"],
+            zone: instance["zone"] || stack["zone"],
+            template: instance["template"],
+            iso: instance["iso"] ,
+            offering: instance["offering"],
+            networks: load_string_or_array(instance["networks"]),
+            project: stack["project"],
+            disk_offering: instance["disk_offering"],
+            size: instance["disk_size"],
+            group: instance["group"] || stack["group"],
+            keypair: instance["keypair"] || stack["keypair"],
+            sync: true
+          }
           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: load_string_or_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
-              }
+            id: client.deploy_virtual_machine(
+              vm_options_to_params(options),
+              {sync: true}
             )['jobid'],
-            name: "Create server #{name}"
+            name: "Create VM #{name}"
           }
         end
       end
     end
     watch_jobs(jobs)
@@ -46,65 +48,73 @@
     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(quiet: true).get_server(name, project_id: projectid)
+          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 server #{name}"
+              name: "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
             }
           end
         end
       end
     end
     watch_jobs(jobs)
     say "Finished.", :green
   end
 
-  desc "destroy STACKFILE", "destroy a stack of servers"
+  desc "destroy STACKFILE", "destroy a stack of VMs"
   option :force,
     desc: "destroy without asking",
     type: :boolean,
     default: false,
     aliases: '-f'
   option :expunge,
-    desc: "expunge servers immediately",
+    desc: "expunge VMs immediately",
     type: :boolean,
     default: false,
     aliases: '-E'
   def destroy(stackfile)
-    stack = parse_stackfile(stackfile)
-    projectid = find_project(stack["project"])['id'] if stack["project"]
-    client.verbose = false
+    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}
     end
 
-    if options[:force] || yes?("Destroy the following servers #{servers.join(', ')}? [y/N]:", :yellow)
+    if options[:force] || yes?("Destroy the following VM #{servers.join(', ')}? [y/N]:", :yellow)
       jobs = []
       servers.each do |name|
-        server = client(quiet: true).get_server(name, project_id: projectid)
-        if server
+        if server = client.list_virtual_machines(name: name, project_id: project_id).first
           jobs << {
-            id: client.destroy_server(
-              server['id'], {
-                sync: true,
-                expunge: options[:expunge]
-              }
+            id: client.destroy_virtual_machine(
+              { id: server['id'], expunge: options[:expunge] },
+              { sync: true }
             )['jobid'],
-            name: "Destroy server #{name}"
+            name: "Destroy VM #{name}"
           }
         end
       end
       watch_jobs(jobs)
       say "Finished.", :green
     end
   end
 
   no_commands do
+    def find_project_by_name(name)
+      if name
+        unless project_id = client.list_projects(name: name).first['id']
+          say "Error: Project '#{name}' not found.", :red
+          exit 1
+        end
+      else
+        project_id = nil
+      end
+      project_id
+    end
+
     def load_string_or_array(item)
      item.is_a?(Array) ? item : [item]
     end
 
     def string_to_array(string)