cloudstack-cli 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85939f310bb8ee9429a065100d5bfa4704a6d016
-  data.tar.gz: b86324e4d2083680e848e765cb0df50cd9833c0d
+  metadata.gz: c1fddcccc9c2fe8010aeb200b88b033aa1d97d1e
+  data.tar.gz: 6e7b9cc1af09643f543266cef7c96c1aec3b9cea
 SHA512:
-  metadata.gz: a469af847c11b94a289f1e0a90012e0d395433c62298ce640ccdb3cbe897dd457568d19f499b1f14486987be13714636b783f9e86fd515febac05b2b888e3689
-  data.tar.gz: 2225637aad656507ced2b8e1f511f3ffd551489512599b70f0b558bd73fe40c4007a5bc29fa6727c7415f37ccf06e9c4e60dee28ae371e7682abb40a2ea0d1f7
+  metadata.gz: 0fb2398fdda615a61506c7ab7eb1e5974538f4a9bf8dd160ff18263ef133aa82a46c797e629157bb40d5a900d0a92b94d698a98bb429389a5d67efc580bf7223
+  data.tar.gz: 54ef72715d16d1042a0a5c78852c8f99fe8e678111d64eceb27cb4a06b49f98ffdd7452ca8896bb55392bbd30389596f4b7fea469eb829a8fa2b8f58072a234c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.0.0.rc3)
+    cloudstack-cli (1.0.0.rc4)
       cloudstack_client (~> 1.0.3)
       thor (~> 0.19.1)
 

data/README.md

@@ -149,14 +149,8 @@ Stop all virtual routers of project named Demo (you could filter by zone too):
 $ cloudstack-cli router list --project Demo --status running --redundant-state BACKUP --command STOP
 ````
 
-**Hint:** You can watch the status of the command with watch.
-
-```bash
-$ watch -n cloudstack-cli router list --project Demo
-```
-
-
 ## References
+
 -  [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/)
 -  This tool was inspired by the Knife extension for Cloudstack: [knife-cloudstack](https://github.com/CloudStack-extras/knife-cloudstack)
 

data/lib/cloudstack-cli/base.rb

@@ -78,7 +78,7 @@ module CloudstackCli
       end
 
       def filter_by(objects, key, value)
-        objects.select {|r| r[key].downcase == value.downcase}
+        objects.select {|r| r[key.to_s].downcase == value.downcase}
       end
 
       def parse_file(file, extensions = %w(.json .yaml .yml))

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

@@ -15,4 +15,61 @@ class Domain < CloudstackCli::Base
     end
   end
 
+  desc 'create', 'create domain'
+  option :network_domain, desc: "Network domain for networks in the domain."
+  option :parent_domain, desc: "Assigns new domain a parent domain by domain name of the parent. If no parent domain is specied, the ROOT domain is assumed."
+  def create(name)
+    create_domains([options.merge(name: name)])
+  end
+
+  desc 'delete', 'delete domain'
+  option :parent_domain, desc: "Parent domain by domain name of the parent. If no parent domain is specied, the ROOT domain is assumed."
+  def delete(name)
+    delete_domains([options.merge(name: name)])
+  end
+
+  no_commands do
+
+    def create_domains(domains)
+      puts domains
+      domains.each do |domain|
+        say "Creating domain '#{domain['name']}'... "
+
+        if dom = client.list_domains(name: domain["name"], listall: true).first
+          unless domain["parent_domain"] && dom['parentdomainname'] != domain["parent_domain"]
+            say "domain '#{domain["name"]}' already exists.", :yellow
+            next
+          end
+        end
+
+        if domain["parent_domain"]
+          parent = client.list_domains(name: domain["parent_domain"], listall: true).first
+          unless parent
+            say "parent domain '#{domain["parent_domain"]}' of domain '#{domain["name"]}' not found.", :yellow
+            next
+          end
+          domain['parentdomain_id'] = parent['id']
+        end
+
+        client.create_domain(domain) ? say("OK.", :green) : say("Failed.", :red)
+      end
+    end
+
+    def delete_domains(domains)
+      domains.each do |domain|
+        print "Deleting domain '#{domain['name']}'..."
+        if dom = client.list_domains(name: domain["name"], listall: true).first
+          if domain["parent_domain"] && dom['parentdomainname'] =! domain["parent_domain"]
+            say "domain '#{domain["name"]}' with same name found, but parent_domain '#{domain["parent_domain"]}' does not match.", :yellow
+            next
+          end
+          client.delete_domain(id: dom['id']) ? say(" OK.", :green) : say(" Failed.", :red)
+        else
+          say "domain '#{domain["name"]}' not found.", :yellow
+        end
+      end
+    end
+
+  end
+
 end

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

@@ -2,26 +2,25 @@ class InfrastructureStack < CloudstackCli::Base
 
   desc "create STACKFILE", "create a infrastructure stack"
   def create(stackfile)
-    puts stack = parse_file(stackfile)
+    stack = parse_file(stackfile)
     say "Create '#{stack["name"]}' infrastructure stack...", :green
 
-    create_domains(stack['domains'])
+    Domain.new.create_domains(stack['domains'])
 
-    say "Finished.", :green
+    say "Infrastructure stack '#{stack["name"]}' finished.", :green
   end
 
   desc "destroy STACKFILE", "destroy a infrastructure stack"
   def destroy(stackfile)
+    stack = parse_file(stackfile)
+    say "Destroy '#{stack["name"]}' infrastructure stack...", :green
 
-  end
 
-  no_commands do
-    def create_domains(domains)
-      domains.each do |domain|
-        puts domain
-      end
-    end
 
+    Domain.new.delete_domains(stack['domains'].reverse)
+    say "Infrastructure stack '#{stack["name"]}' finished.", :green
   end
 
+
+
 end

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

@@ -4,7 +4,7 @@ class Router < CloudstackCli::Base
   option :project, desc: "name of the project"
   option :account, desc: "name of the account"
   option :zone, desc: "name of the zone"
-  option :status, desc: "the status of the router"
+  option :state, desc: "the status of the router"
   option :redundant_state, desc: "the state of redundant virtual router",
     enum: %w(master backup fault unknown)
   option :listall, type: :boolean, desc: "list all routers", default: true
@@ -15,6 +15,8 @@ class Router < CloudstackCli::Base
     enum: %w(START STOP REBOOT)
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
     desc: "number of concurrent command to execute"
+  option :format, default: "table",
+    enum: %w(table json yaml)
   def list
     resolve_project
     resolve_zone
@@ -23,8 +25,7 @@ class Router < CloudstackCli::Base
     routers = client.list_routers(options)
 
     if options[:listall]
-      projects = client.list_projects
-      projects.each do |project|
+      client.list_projects(listall: true).each do |project|
         routers = routers + client.list_routers(
           options.merge(projectid: project['id'])
         )
@@ -37,22 +38,24 @@ class Router < CloudstackCli::Base
 
     routers.reverse! if options[:reverse]
     print_routers(routers, options)
+    execute_router_commands(options[:command].downcase, routers) if options[:command]
+  end
 
-    if options[:command]
-      command = options[:command].downcase
-      unless %w(start stop reboot).include?(command)
-        say "\nCommand #{options[:command]} not supported.", :red
-        exit 1
-      end
-      exit unless yes?("\n#{command.capitalize} the router(s) above? [y/N]:", :magenta)
-      routers.each_slice(options[:concurrency]) do | batch |
-        jobs = batch.map do |router|
-          {id: client.send("#{command}_router", router['id'], async: false)['jobid'], name: "#{command.capitalize} router #{router['name']}"}
-        end
-        puts
-        watch_jobs(jobs)
-      end
-    end
+  desc "list_from_file FILE", "list virtual routers from file"
+  option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
+  option :command,
+    desc: "command to execute for each router",
+    enum: %w(START STOP REBOOT)
+  option :concurrency, type: :numeric, default: 10, aliases: '-C',
+    desc: "number of concurrent command to execute"
+  option :format, default: "table",
+    enum: %w(table json yaml)
+  def list_from_file(file)
+    routers = parse_file(file)["routers"]
+
+    routers.reverse! if options[:reverse]
+    print_routers(routers, options)
+    execute_router_commands(options[:command].downcase, routers) if options[:command]
   end
 
   desc "stop NAME [NAME2 ..]", "stop virtual router(s)"
@@ -144,32 +147,58 @@ class Router < CloudstackCli::Base
       if routers.size < 1
         say "No routers found."
       else
-        table = [[
-          'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'IP', 'Linklocal IP', 'Status', 'Redundant', 'OfferingID', 'Offering', 'ID'
-        ]]
-        table[0].delete('ID') unless options[:showid]
-        routers.each do |router|
-          table << [
-            router["name"],
-            router["zonename"],
-            router["account"],
-            router["project"],
-            router["redundantstate"],
-            router["nic"] && router["nic"].first ? router["nic"].first['ipaddress'] : "",
-            router["linklocalip"],
-            router["state"],
-            router["isredundantrouter"],
-            router["serviceofferingid"],
-            router["serviceofferingname"],
-            router["id"]
-          ]
-          table[-1].delete_at(-1) unless table[0].index "ID"
+        case options[:format].to_sym
+        when :yaml
+          puts({'routers' => routers}.to_yaml)
+        when :json
+          say JSON.pretty_generate(routers: routers)
+        else
+          table = [%w(
+            ID Name Zone Account Project Redundant-State IP Linklocal-IP Status Redundant Offering
+          )]
+          table[0].delete('ID') unless options[:showid]
+          routers.each do |router|
+            table << [
+              router["id"],
+              router["name"],
+              router["zonename"],
+              router["account"],
+              router["project"],
+              router["redundantstate"],
+              router["nic"] && router["nic"].first ? router["nic"].first['ipaddress'] : "",
+              router["linklocalip"],
+              router["state"],
+              router["isredundantrouter"],
+              router["serviceofferingname"]
+            ]
+            table[-1].delete_at(0) unless table[0].index "ID"
+          end
+          print_table table
+          puts
+          say "Total number of routers: #{routers.size}"
         end
-        print_table table
-        puts
-        say "Total number of routers: #{routers.size}"
       end
     end
+
+    def execute_router_commands(command, routers)
+      unless %w(start stop reboot).include?(command)
+        say "\nCommand #{options[:command]} not supported.", :red
+        exit 1
+      end
+      exit unless yes?("\n#{command.capitalize} the router(s) above? [y/N]:", :magenta)
+
+      jobs = routers.map do |router|
+        {
+          job_id: nil,
+          object_id: router["id"],
+          name: "#{command.capitalize} router #{router['name']}",
+          status: -1
+        }
+      end
+
+      run_background_jobs(jobs, "#{command}_router")
+    end
+
   end
 
 end

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

@@ -1,10 +1,11 @@
 class Snapshot < CloudstackCli::Base
 
   desc 'list', 'list snapshots'
-  option :account
-  option :project
-  option :domain
-  option :listall, default: true
+  option :account, desc: "the account associated with the snapshot"
+  option :project, desc: "the project associated with the snapshot"
+  option :domain, desc: "the domain name of the snapshot's account"
+  option :listall, default: true, desc: "list all resources the caller has rights on"
+  option :state, desc: "filter snapshots by state"
   def list
     resolve_account
     resolve_project
@@ -13,11 +14,12 @@ class Snapshot < CloudstackCli::Base
     if snapshots.size < 1
       say "No snapshots found."
     else
-      table = [["Account", "Name", "Volume", "Created", "Type"]]
+      table = [%w(Account Name Volume Created Type State)]
+      snapshots = filter_by(snapshots, :state, options[:state]) if options[:state]
       snapshots.each do |snapshot|
         table << [
         	snapshot['account'], snapshot['name'], snapshot['volumename'],
-        	snapshot['created'], snapshot['snapshottype']
+        	snapshot['created'], snapshot['snapshottype'], snapshot['state']
         ]
       end
       print_table table

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

@@ -1,3 +1,5 @@
+require 'thread'
+
 class VirtualMachine < CloudstackCli::Base
 
   desc "list", "list virtual machines"
@@ -43,7 +45,10 @@ class VirtualMachine < CloudstackCli::Base
       puts "No virtual machines found."
     else
       print_virtual_machines(virtual_machines)
-      execute_virtual_machines_commands(virtual_machines) if options[:command]
+      execute_virtual_machines_commands(
+        options[:command].downcase,
+        virtual_machines
+      ) if options[:command]
     end
   end
 
@@ -84,7 +89,7 @@ class VirtualMachine < CloudstackCli::Base
     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
-        say "virtual_machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
+        say "virtual machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
         job = {
           id: 0,
           name: "Create virtual machine #{name}",
@@ -93,7 +98,7 @@ class VirtualMachine < CloudstackCli::Base
       else
         job = {
           id: client.deploy_virtual_machine(options, {sync: true})['jobid'],
-          name: "Create virtual_machine #{name}"
+          name: "Create virtual machine #{name}"
         }
       end
       job
@@ -116,17 +121,17 @@ class VirtualMachine < CloudstackCli::Base
     say "Finished.", :green
   end
 
-  desc "destroy NAME [NAME2 ..]", "destroy virtual_machine(s)"
+  desc "destroy NAME [NAME2 ..]", "destroy virtual machine(s)"
   option :project
   option :force, desc: "destroy without asking", type: :boolean, aliases: '-f'
-  option :expunge, desc: "expunge virtual_machine immediately", type: :boolean, default: false, aliases: '-E'
+  option :expunge, desc: "expunge virtual machine immediately", type: :boolean, default: false, aliases: '-E'
   def destroy(*names)
     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]:"
+        ask = "Destroy #{name} (#{virtual machine['state']})? [y/N]:"
         if options[:force] || yes?(ask, :yellow)
           say "destroying #{name} "
           client.destroy_virtual_machine(
@@ -139,12 +144,12 @@ class VirtualMachine < CloudstackCli::Base
     end
   end
 
-  desc "create_interactive", "interactive creation of a virtual_machine with network access"
+  desc "create_interactive", "interactive creation of a virtual machine with network access"
   def create_interactive
     bootstrap_server_interactive
   end
 
-  desc "stop NAME", "stop a virtual_machine"
+  desc "stop NAME", "stop a virtual machine"
   option :project
   option :force
   def stop(name)
@@ -170,12 +175,12 @@ class VirtualMachine < CloudstackCli::Base
       say "Virtual machine #{name} not found.", :red
       exit 1
     end
-    say("Starting virtual_machine #{name}", :magenta)
+    say("Starting virtual machine #{name}", :magenta)
     client.start_virtual_machine(id: virtual_machine['id'])
     puts
   end
 
-  desc "reboot NAME", "reboot a virtual_machine"
+  desc "reboot NAME", "reboot a virtual machine"
   option :project
   option :force
   def reboot(name)
@@ -212,7 +217,7 @@ class VirtualMachine < CloudstackCli::Base
           ]
         end
         print_table table
-        say "Total number of virtual_machines: #{virtual_machines.count}"
+        say "Total number of virtual machines: #{virtual_machines.count}"
       end
     end
 
@@ -222,20 +227,17 @@ class VirtualMachine < CloudstackCli::Base
         exit 1
       end
       exit unless yes?("\n#{command.capitalize} the virtual_machine(s) above? [y/N]:", :magenta)
-      virtual_machines.each_slice(options[:concurrency]) do | batch |
-        jobs = batch.map do |virtual_machine|
-          {
-            id: client.send(
-              "#{command}_virtual_machine",
-              { id: virtual_machine['id'] },
-              { sync: true }
-            )['jobid'],
-            name: "#{command.capitalize} virtual_machine #{virtual_machine['name']}"
-          }
-        end
-        puts
-        watch_jobs(jobs)
+
+      jobs = virtual_machines.map do |vm|
+        {
+          job_id: nil,
+          object_id: vm["id"],
+          name: "#{command.capitalize} virtual machine #{vm['name']}",
+          status: -1
+        }
       end
+
+      run_background_jobs(jobs, "#{command}_virtual_machine")
     end
 
   end # no_commands

data/lib/cloudstack-cli/helper.rb

@@ -12,44 +12,66 @@ module CloudstackCli
     end
 
     ASYNC_STATES = {
-      0 => "running",
-      1 => "completed",
-      2 => "error"
+      -1 => "waiting",
+      0  => "running",
+      1  => "completed",
+      2  => "error"
     }
 
-    def watch_jobs(jobs)
-      chars = %w(| / - \\)
-      call = 0
-      opts = {t_start: Time.now}
-      jobs = update_job_status(jobs)
-      while jobs.select{|job| job[:status] == 0}.size > 0 do
-        if call.modulo(40) == 0
-          t = Thread.new { jobs = update_job_status(jobs) }
-          while t.alive?
+    def run_background_jobs(jobs, command)
+      view_thread = Thread.new do
+        chars = %w(| / - \\)
+        call = 0
+        opts = {t_start: Time.now}
+
+        while jobs.select{|job| job[:status] < 1 }.size > 0 do
+          if call.modulo(40) == 0
+            t = Thread.new { jobs = update_jobs(jobs, command) }
+            while t.alive?
+              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, chars,
               call == 0 ? opts.merge(no_clear: true) : opts
             )
             call += 1
           end
-          t.join
-        else
-          chars = print_job_status(jobs, chars,
-            call == 0 ? opts.merge(no_clear: true) : opts
-          )
-          call += 1
         end
+        print_job_status(jobs, chars,
+          call == 0 ? opts.merge(no_clear: true) : opts
+        )
       end
-      print_job_status(jobs, chars,
-        call == 0 ? opts.merge(no_clear: true) : opts
-      )
+      view_thread.join
     end
 
-    def update_job_status(jobs)
-      jobs.each do |job|
-        unless job[:status] && job[:status] > 0
-          job[:status] = client.query_async_job_result(job_id: job[:id])['jobstatus']
+    def update_jobs(jobs, command)
+      # update running job status
+      threads = jobs.select{|job| job[:status] == 0 }.map do |job|
+        Thread.new do
+          job[:status] = client.query_async_job_result(job_id: job[:job_id])['jobstatus']
+        end
+      end
+      threads.each(&:join)
+
+      # launch new jobs if required and possible
+      launch_capacity = options[:concurrency] - jobs.select{|job| job[:status] == 0 }.count
+      threads = []
+      jobs.select{|job| job[:status] == -1 }.each do |job|
+        if launch_capacity > 0
+          threads << Thread.new do
+            job[:job_id] = client.send(
+              command, { id: job[:object_id] }, { sync: true }
+            )['jobid']
+            job[:status] = 0
+          end
+          launch_capacity -= 1
         end
       end
+      threads.each(&:join)
       jobs
     end
 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc