cloudstack-cli 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4992b15860eda6fbefe75457c67366290a0b7301
-  data.tar.gz: bb3848d8d6b67d3cddadb12391d70783f2077846
+  metadata.gz: 908b98a2dbd0314746a8ab6f4ab5ce2c7993e718
+  data.tar.gz: eb50df278d75bab8f5b9051d307fc2c67800b0b6
 SHA512:
-  metadata.gz: 51f6c75a86c111e6e26665d534d2ccffb4122e3bae46d956084ef61392389f99dbab757c7dfc048b5bcda9c4eb9e0eabd9f6374e2fb672dd99f4080bcdeeffe6
-  data.tar.gz: 96bee024c0ba4af985cb9508bf8525dfabfd0092667630a5bc70f2cb3117c9b4010d01a1974b384a2b5aea5f6fcd9da4241249ea3648ad0787f1fe9e5cc07d49
+  metadata.gz: df3f7712ad79ed2976d2bbad453843bec5c7ac680f7646abdaa523ea61cb984a769b35fa63946f01c7a00c8932a7caef259b4758ab487797bcba56d7e4fb7266
+  data.tar.gz: 37cc848fb1928bc11ae770707743374cc2f57ce5bf3adb287a52948d11af3610ffc484e773565d7558f44429ce7d47e85620815526285ae47aaaaf7e75e42e96

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:niwo/cloudstack_client.git
-  revision: f4aa35073e82129aa27600cef0987254d2453259
+  revision: cc23ab7c336f0933d41ae3976fcac71e357b8b0d
   branch: master
   specs:
     cloudstack_client (0.9.7)

data/lib/cloudstack-cli/base.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "yaml"
+require "open-uri"
 
 module CloudstackCli
   class Base < Thor
@@ -75,6 +76,28 @@ module CloudstackCli
       def filter_by(objects, key, value)
         objects.select {|r| r[key].downcase == value.downcase}
       end
+
+      def parse_file(file, extensions = %w(.json .yaml .yml))
+        handler = case File.extname(file)
+        when ".json"
+          Object.const_get "JSON"
+        when ".yaml", ".yml"
+          Object.const_get "YAML"
+        else
+          say "File extension #{File.extname(file)} not supported. Supported extensions are #{extensions.join(', ')}", :red
+          exit
+        end
+        begin
+          return handler.load open(file){|f| f.read}
+        rescue SystemCallError
+          say "Can't find the file #{file}.", :red
+          exit 1
+        rescue => e
+          say "Error parsing #{File.extname(file)} file:", :red
+          say e.message
+          exit 1
+        end
+      end
     end
   end
 end

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

@@ -9,14 +9,15 @@ class Server < CloudstackCli::Base
   option :storage_id, desc: "the storage ID where vm's volumes belong to"
   option :keyword, desc: "filter by keyword"
   option :command,
-    desc: "command to execute for each server",
+    desc: "command to execute for the given servers",
     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
     if options[:project]
-      project_id = find_project['id']
-      options[:project_id] = project_id
+      options[:project_id] = find_project['id']
       options[:project] = nil
     end
     options[:custom] = { 'storageid' => options[:storage_id] } if options[:storage_id]
@@ -25,40 +26,25 @@ class Server < CloudstackCli::Base
     if servers.size < 1
       puts "No servers found."
     else
-      table = [["Name", "State", "Offering", "Zone", project_id ? "Project" : "Account", "IP's"]]
-      servers.each do |server|
-        table << [
-          server['name'],
-          server['state'],
-          server['serviceofferingname'],
-          server['zonename'],
-          project_id ? server['project'] : server['account'],
-          server['nic'].map { |nic| nic['ipaddress']}.join(' ')
-        ]
-      end
-      print_table table
-      say "Total number of servers: #{servers.count}"
+      print_servers(servers)
+      execute_server_commands(servers) if options[:command]
+    end
+  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 server(s) above? [y/N]:", :magenta)
-        servers.each_slice(options[:concurrency]) do | batch |
-          jobs = batch.map do |server|
-            args = { sync: true, account: server['account'] }
-            args[:project_id] = server['projectid'] if server['projectid']
-            {
-              id: client.send("#{command}_server", server['name'], args)['jobid'],
-              name: "#{command.capitalize} server #{server['name']}"
-            }
-          end
-          puts
-          watch_jobs(jobs)
-        end
-      end
+  desc "list_from_file FILE", "list servers from file"
+  option :command,
+  desc: "command to execute for the given servers",
+  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)
+    servers = parse_file(file)["servers"]
+    if servers.size < 1
+      puts "No servers found."
+    else
+      print_servers(servers)
+      execute_server_commands(servers) if options[:command]
     end
   end
 
@@ -193,4 +179,52 @@ class Server < CloudstackCli::Base
     puts
   end
 
+  no_commands do
+
+    def print_servers(servers)
+      case options[:format].to_sym
+      when :yaml
+        puts({'servers' => servers}.to_yaml)
+      when :json
+        say JSON.pretty_generate(servers: servers)
+      else
+        table = [["Name", "State", "Offering", "Zone", options[:project_id] ? "Project" : "Account", "IP's"]]
+        servers.each do |server|
+          table << [
+            server['name'],
+            server['state'],
+            server['serviceofferingname'],
+            server['zonename'],
+            options[:project_id] ? server['project'] : server['account'],
+            server['nic'].map { |nic| nic['ipaddress']}.join(' ')
+          ]
+        end
+        print_table table
+        say "Total number of servers: #{servers.count}"
+      end
+    end
+
+    def execute_server_commands(servers)
+      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 server(s) above? [y/N]:", :magenta)
+      servers.each_slice(options[:concurrency]) do | batch |
+        jobs = batch.map do |server|
+          args = { sync: true, account: server['account'] }
+          args[:project_id] = server['projectid'] if server['projectid']
+          {
+            id: client.send("#{command}_server", server['name'], args)['jobid'],
+            name: "#{command.capitalize} server #{server['name']}"
+          }
+        end
+        puts
+        watch_jobs(jobs)
+      end
+    end
+
+  end # no_commands
+
 end

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

@@ -1,10 +1,8 @@
-require 'open-uri'
-
 class Stack < CloudstackCli::Base
 
   desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)
-    stack = parse_stackfile(stackfile)
+    stack = parse_file(stackfile)
     say "Create stack #{stack["name"]}...", :green
     projectid = find_project(stack["project"])['id'] if stack["project"]
     jobs = []
@@ -106,28 +104,6 @@ class Stack < CloudstackCli::Base
   end
 
   no_commands do
-    def parse_stackfile(stackfile)
-      handler = case File.extname(stackfile)
-      when ".json"
-        Object.const_get "JSON"
-      when ".yaml", ".yml"
-        Object.const_get "YAML"
-      else
-        say "File extension #{File.extname(stackfile)} not supported. Supported extensions are .json, .yaml or .yml", :red
-        exit
-      end
-      begin
-        return handler.load open(stackfile){|f| f.read}
-      rescue SystemCallError
-        say "Can't find the stack file #{stackfile}.", :red
-        exit 1
-      rescue => e
-        say "Error parsing #{File.extname(stackfile)} file:", :red
-        say e.message
-        exit 1
-      end
-    end
-
     def load_string_or_array(item)
      item.is_a?(Array) ? item : [item]
     end

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

@@ -10,10 +10,10 @@ class SystemVm < CloudstackCli::Base
     if vms.size < 1
       say "No system VM's found."
     else
-      table = [["Zone", "State", "Type", "Name"]]
+      table = [%w(Name Zone State Type)]
       vms.each do |vm|
         table << [
-          vm['zonename'], vm['state'], vm['systemvmtype'], vm['name']
+          vm['name'], vm['zonename'], vm['state'], vm['systemvmtype']
         ]
       end
       print_table table

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc