cloudstack-cli 0.3.4 → 0.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.3.3)
+    cloudstack-cli (0.3.4)
       thor (~> 0.18.1)
 
 GEM

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

@@ -1,15 +1,15 @@
 class Capacity < CloudstackCli::Base
 	CAPACITY_TYPES = {
-		0 => "Memory",
-		1 => "CPU",
-		2 => "Storage",
-		3 => "Storage Allocated",
-		4 => "Public IP's",
-		5 => "Private IP's",
-		6 => "Secondary Storage",
-		7 => "VLAN",
-		8 => "Direct Attached Public IP's",
-		9 => "Local Storage"
+		0 => {name: "Memory", unit: "GB", divider: 1024.0**3},
+		1 => {name: "CPU", unit: "GHz", divider: 1000.0},
+		2 => {name: "Storage", unit: "TB", divider: 1024.0**4},
+		3 => {name: "Primary Storage", unit: "TB", divider: 1024.0**4},
+		4 => {name: "Public IP's"},
+		5 => {name: "Private IP's"},
+		6 => {name: "Secondary Storage", unit: "TB", divider: 1024.0**4},
+		7 => {name: "VLAN"},
+		8 => {name: "Direct Attached Public IP's"},
+		9 => {name: "Local Storage", unit: "TB", divider: 1024.0**4}
 	}
 
   desc "list", "list system capacity"
@@ -21,9 +21,9 @@ class Capacity < CloudstackCli::Base
     capacities.each do |c|
     	table << [
     		c['zonename'],
-    	 	CAPACITY_TYPES[c['type']],
-    	 	c['capacityused'],
-    	 	c['capacitytotal'],
+    	 	CAPACITY_TYPES[c['type']][:name],
+    	 	capacity_to_s(c, 'capacityused'),
+    	 	capacity_to_s(c, 'capacitytotal'),
     	 	"#{c['percentused']}%"
     	]
     end
@@ -31,4 +31,17 @@ class Capacity < CloudstackCli::Base
     print_table table
   end
 
+  no_commands do
+
+    def capacity_to_s(capacity, entity)
+      value = CAPACITY_TYPES[capacity['type']][:divider] ? 
+        (capacity[entity] / CAPACITY_TYPES[capacity['type']][:divider]).round(1) : 
+        capacity[entity]
+      CAPACITY_TYPES[capacity['type']][:unit] ? 
+        "#{value}#{CAPACITY_TYPES[capacity['type']][:unit]}" :
+        value.to_s
+    end
+
+  end
+
 end

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

@@ -33,7 +33,8 @@ class Network < CloudstackCli::Base
     elsif options[:account]
       networks = client.list_networks(account: options[:account])
     else
-      networks = client.list_networks(project_id: -1, isdefault: options[:isdefault])
+      networks = client.list_networks(isdefault: options[:isdefault])
+      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault])
     end
 
     if networks.size < 1

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

@@ -18,6 +18,10 @@ class PortRule < CloudstackCli::Base
       ip = pf_rule.split(":")[0]
       if ip != ''
         ip_addr = client.get_public_ip_address(ip)
+        unless ip_addr
+          say "Error: IP #{ip} not found.", :red
+          next
+        end
       else
         ip_addr = frontendip ||= client.associate_ip_address(
           client.get_network(options[:network], project ? project["id"] : nil)["id"]

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

@@ -47,8 +47,42 @@ class Server < CloudstackCli::Base
   option :keypair, desc: "the name of the ssh keypair to use"
   option :group, desc: "group name"
   option :account, desc: "account name"
-  def create(name)
-    bootstrap_server(options.merge({name: name}))
+  def create(*names)
+    projectid = find_project['id'] if options[:project]
+    say "Start deploying servers...", :green
+    jobs = names.map do |name|
+      server = client(quiet: true).get_server(name, projectid)
+      if server
+        say "Server #{name} (#{server["state"]}) already exists.", :yellow
+        job = {
+          id: 0,
+          name: "Create server #{name}",
+          status: 1
+        }
+      else
+        job = {
+          id: client.create_server(options.merge({name: name, sync: true}))['jobid'],
+          name: "Create server #{name}"
+        }
+      end
+      job
+    end
+    watch_jobs(jobs)
+    if options[:port_rules].size > 0
+      say "Create port forwarding rules...", :green
+      jobs = []
+      names.each do |name|
+        server = client(quiet: true).get_server(name, projectid)
+        create_port_rules(server, options[:port_rules], false).each_with_index do |job_id, index|
+          jobs << {
+            id: job_id,
+            name: "Create port forwarding ##{index + 1} rules for server #{server['name']}"
+          }
+        end
+      end
+      watch_jobs(jobs)
+    end
+    say "Finished.", :green
   end
 
   desc "destroy NAME [NAME2 ..]", "destroy server(s)"

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

@@ -20,6 +20,7 @@ class SshKeyPair < CloudstackCli::Base
   desc 'create NAME', 'create ssh key pair'
   option :account
   option :project
+  option :public_key
   def create(name)
     pair = client.create_ssh_key_pair(name, options)
     say "Name : #{pair['name']}"

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

@@ -3,30 +3,63 @@ 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
+    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
-    threads.each {|t| t.join }
+    watch_jobs(jobs)
+    say "Finished.", :green
   end
 
   desc "destroy STACKFILE", "destroy a stack of servers"
@@ -37,13 +70,29 @@ class Stack < CloudstackCli::Base
     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
+
+    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
-    say "Destroy stack #{stack["name"]}...", :yellow
-    puts
-    invoke "server:destroy", servers, project: stack["project"], force: options[:force]
   end
 
   no_commands do
@@ -59,7 +108,7 @@ class Stack < CloudstackCli::Base
     end
 
     def string_to_array(string)
-      string ? string.gsub(', ', ',').split(', ') : nil
+      string ? string.gsub(', ', ',').split(',') : nil
     end
   end
 

data/lib/cloudstack-cli/helper.rb

@@ -11,12 +11,6 @@ module CloudstackCli
       number < 0 ? 0 : number
     end
 
-    def get_async_job_status(ids)
-      ids.map do |id|
-        client.query_job(id)['jobstatus']
-      end
-    end
-
     ASYNC_STATES = {
       0 => "running",
       1 => "completed",
@@ -25,32 +19,45 @@ module CloudstackCli
 
     def watch_jobs(jobs)
       chars = %w(| / - \\)
-      status = get_async_job_status(jobs.map {|job| job[:id]})
       call = 0
       opts = {t_start: Time.now}
-      puts
-      while status.include?(0) do
+      jobs = update_job_status(jobs)
+      while jobs.select{|job| job[:status] == 0}.size > 0 do
         if call.modulo(40) == 0
-          t = Thread.new { status = get_async_job_status(jobs.map {|job| job[:id]}) }
+          t = Thread.new { jobs = update_job_status(jobs) }
           while t.alive?
-            chars = print_job_status(jobs, status, chars, opts)
+            chars = print_job_status(jobs, chars,
+              call == 0 ? opts.merge(no_clear: true) : opts
+            )
+            call += 1
           end
           t.join
         else
-          chars = print_job_status(jobs, status, chars,
+          chars = print_job_status(jobs, chars,
             call == 0 ? opts.merge(no_clear: true) : opts
           )
           call += 1
         end
       end
-      print_job_status(jobs, status, chars, opts)
+      print_job_status(jobs, chars,
+        call == 0 ? opts.merge(no_clear: true) : opts
+      )
     end
 
-    def print_job_status(jobs, status, spinner, opts = {t_start: Time.now})
-      print ("\r" + "\e[A\e[K" * (status.size + 1)) unless opts[:no_clear]
-      status.each_with_index do |job_status, i|
-        print "#{jobs[i][:name]} : job #{ASYNC_STATES[job_status]} "
-        puts job_status == 0 ? spinner.first : ""
+    def update_job_status(jobs)
+      jobs.each do |job|
+        unless job[:status] && job[:status] > 0
+          job[:status] = client.query_job(job[:id])['jobstatus']
+        end
+      end
+      jobs
+    end
+
+    def print_job_status(jobs, spinner, opts = {t_start: Time.now})
+      print ("\r" + "\e[A\e[K" * (jobs.size + 1)) unless opts[:no_clear]
+      jobs.each_with_index do |job, i|
+        print "#{job[:name]} : job #{ASYNC_STATES[job[:status]]} "
+        puts job[:status] == 0 ? spinner.first : ""
       end
       t_elapsed = opts[:t_start] ? (Time.now - opts[:t_start]).round(1) : 0
       puts "Runtime: #{t_elapsed}s"
@@ -81,21 +88,49 @@ module CloudstackCli
       server
     end
 
-    def create_port_rules(server, port_rules)
+    def create_server(args = {})
+      if args[:project] && project = client(quiet: true).get_project(args[:project])
+        project_id = project["id"]
+        project_name = project['name']
+      end
+      server = client(quiet: true).get_server(args[:name], project_id)
+      unless server
+        server = client.create_server(args)
+      end
+      server
+    end
+
+    def create_port_rules(server, port_rules, async = true)
       frontendip = nil
+      jobs = []
+      client.verbose = async
       port_rules.each do |pf_rule|
         ip = pf_rule.split(":")[0]
         if ip != ''
           ip_addr = client.get_public_ip_address(ip)
+          unless ip_addr
+            say "Error: IP #{ip} not found.", :red
+            next
+          end
         else
           ip_addr = frontendip ||= client.associate_ip_address(
             server["nic"].first["networkid"]
           )
         end
         port = pf_rule.split(":")[1]
-        say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{server["name"]}.", :yellow
-        client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
+        if async 
+          say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{server["name"]}.", :yellow
+          client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
+          return
+        else
+          jobs << client.create_port_forwarding_rule(
+            ip_addr["id"],
+            port, 'TCP', port, server["id"],
+            false
+          )['jobid']
+        end
       end
+      jobs
     end
 
     def bootstrap_server_interactive

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/cloudstack-client/client.rb

@@ -20,12 +20,14 @@ module CloudstackClient
       include Object.const_get("CloudstackClient").const_get(module_name)
     end
 
+    attr_accessor :verbose
+
     def initialize(api_url, api_key, secret_key, opts = {})
       @api_url = api_url
       @api_key = api_key
       @secret_key = secret_key
       @use_ssl = api_url.start_with? "https"
-      @verbose = !opts[:quiet]
+      @verbose = opts[:quiet] ? false : true
     end
 
     ##

data/lib/cloudstack-client/commands/port_forwarding_rule.rb

@@ -32,7 +32,7 @@ module CloudstackClient
     ##
     # Creates a port forwarding rule.
 
-    def create_port_forwarding_rule(ip_address_id, private_port, protocol, public_port, virtual_machine_id)
+    def create_port_forwarding_rule(ip_address_id, private_port, protocol, public_port, virtual_machine_id, async = true)
       params = {
           'command' => 'createPortForwardingRule',
           'ipAddressId' => ip_address_id,
@@ -41,8 +41,7 @@ module CloudstackClient
           'publicPort' => public_port,
           'virtualMachineId' => virtual_machine_id
       }
-      json = send_async_request(params)
-      json['portforwardingrule']
+      async ? send_async_request(params)['portforwardingrule'] : send_request(params)
     end
 
 	end

data/lib/cloudstack-client/commands/server.rb

@@ -193,7 +193,6 @@ module CloudstackClient
         network['id']
       }
 
-
       params = {
           'command' => 'deployVirtualMachine',
           'serviceOfferingId' => service['id'],
@@ -220,8 +219,7 @@ module CloudstackClient
         params['account'] = args[:account]
       end
 
-      json = send_async_request(params)
-      json['virtualmachine']
+      args[:sync] ? send_request(params) : send_async_request(params)['virtualmachine']
     end
 
     ##
@@ -289,14 +287,13 @@ module CloudstackClient
     # Destroy the server with the specified name.
     #
 
-    def destroy_server(id)
+    def destroy_server(id, async = true)
       params = {
           'command' => 'destroyVirtualMachine',
           'id' => id
       }
 
-      json = send_async_request(params)
-      json['virtualmachine']
+      async ? send_async_request(params)['virtualmachine'] : send_request(params)
     end
   
   end

data/lib/cloudstack-client/commands/ssh_key_pair.rb

@@ -64,6 +64,7 @@ module CloudstackClient
         params['domainid'] = account["domainid"]
         params['account'] = args[:account]
       end
+      params['publickey'] = args[:public_key] if args[:public_key]
       
       json = send_request(params)['keypair']
     end

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc