cloudstack-cli 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.0.1)
+    cloudstack-cli (0.0.3)
       command_line_reporter (~> 3.2.1)
       net-ssh (~> 2.6.7)
       rainbow (~> 1.1.4)
@@ -14,7 +14,7 @@ GEM
     command_line_reporter (3.2.1)
       colored (>= 1.2)
     json (1.8.0)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     rainbow (1.1.4)
     rake (10.0.4)
     rdoc (4.0.1)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 niwo 
+Copyright (c) 2013 Nik Wolfgramm 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -4,15 +4,7 @@ Cloudstack CLI gives command line access to the CloudStack API commands.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem "cloudstack-cli"
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Install the cloudstack-cli gem:
 
     $ gem install cloudstack-cli
 
@@ -32,17 +24,43 @@ Example content of the configuration file:
 
 ## Usage
 
-See the help screen
+See the help screen:
+
+    $ cs
+
+### Example 1
+
+Bootsrap a server:
+
+    $ cs server create server01 --zone ZUERICH_IX --port-forwarding 193.218.104.10:22 193.218.104.10:80 --template CentOS-6.4-x64-v1.4 --offering 1cpu_1gb --networks M_Demo
+
+### Example 2
+
+Run a custom API command:
 
-    $ bin/cs
+    cs command listAlerts type=8
 
-Example: Bootsrap a server
+### Example 3
 
-    $ bin/cs server create delete-me-10 --zone ZUERICH_IX --port-forwarding 146.159.95.194:22 146.159.95.194:80 --template CentOS-6.4-x64-v1.2 --offering demo_1cpu_1gb --networks M_ZRH_NMC-Demo
+Sort all computing offerings by CPU and Memory grouped my Domain:
 
-Example: Run a custom API command
+    cs offering sort
 
-    bin/cs command listAlerts type=8
+### Example 4
+
+Stop all virtual routers of project Demo (you could filter by Zone too):
+(This command is helpful if you have to deploy new versions of Cloudstack when using redumdant routers)
+
+    cs router list --project Demo --status running --redundant-state BACKUP --command stop
+
+Hint: You can watch the status of the command with watch.
+
+    watch -n cs router list --project Demo
+
+
+## References
+-  [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/apidocs-4.1/TOC_Root_Admin.html)
+-  This tool was inspired by the Knife extension for Cloudstack: [knife-cloudstack](https://github.com/CloudStack-extras/knife-cloudstack)
 
 
 ## Contributing
@@ -52,3 +70,10 @@ Example: Run a custom API command
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+## License
+
+Released under the MIT License.  See the [LICENSE][] file for further details.
+
+[license]: LICENSE.txt

data/bin/cs

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.dirname(__FILE__)
-require_relative '../lib/cloudstack_client'
-require_relative '../lib/cloudstack_cli'
+require 'cloudstack_client'
+require 'cloudstack_cli'
 
 CloudstackCli::Cli.start(ARGV)

data/cloudstack-cli.gemspec

@@ -12,10 +12,12 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{cloudstack-cli CloudStack API client}
   gem.homepage      = "https://bitbucket.org/swisstxt/cloudstack-cli"
 
+  gem.required_ruby_version = '1.9.3'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = ['cs']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.rdoc_options  = %w[--line-numbers --inline-source]
 
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.0.4')
@@ -24,4 +26,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency('net-ssh', '~> 2.6.7')
   gem.add_dependency('rainbow', '~> 1.1.4')
   gem.add_dependency('command_line_reporter', '~> 3.2.1')
-end
+end

data/lib/cloudstack-cli/cli.rb

@@ -1,9 +1,21 @@
 module CloudstackCli
+  trap("TERM") { puts "SIGTERM received"; exit }
+
   class Cli < Thor
     include Thor::Actions
 
-    class_option :config, default: File.join(Dir.home, '.cloudstack-cli.yml'), aliases: '-c'
-    class_option :verbose, type: :boolean
+    package_name "cloudstack-cli" 
+    map %w(-v --version) => :version 
+
+    class_option :config,
+      default: File.join(Dir.home, '.cloudstack-cli.yml'),
+      aliases: '-c',
+      desc: 'localition of your cloudstack-cli configuration file'
+
+    desc "version", "outputs the cloudstack-cli version"
+    def version
+      say "cloudstack-cli v#{CloudstackCli::VERSION}"
+    end
 
     desc "setup", "initial setup of the Cloudstack connection"
     option :url

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

@@ -1,6 +1,6 @@
 class Account < Thor
 
-  desc 'list [NAME]', 'list accounts'
+  desc 'account list [NAME]', 'list accounts'
   def list(name = nil)
     cs_cli = CloudstackCli::Helper.new(options[:config])
     accounts = cs_cli.list_accounts(name)

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

@@ -1,6 +1,6 @@
 class Domain < Thor
 
-  desc 'list [NAME]', 'list domains'
+  desc 'domain list [NAME]', 'list domains'
   def list(name = nil)
     cs_cli = CloudstackCli::Helper.new(options[:config])
     domains = cs_cli.domains(name)

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

@@ -1,5 +1,6 @@
 class Lb < Thor
-  desc "list", "list load balancer rules"
+  
+  desc "lb list", "list load balancer rules"
   option :project
   def list
     cs_cli = CloudstackCli::Helper.new(options[:config])
@@ -18,7 +19,7 @@ class Lb < Thor
     end
   end
 
-  desc "create NAME", "create load balancer rule"
+  desc "lb create NAME", "create load balancer rule"
   option :project
   option :ip, :required => true
   option :public_port, :required => true
@@ -40,7 +41,7 @@ class Lb < Thor
     )
   end
 
-  desc "add NAME", "assign servers to balancer rule"
+  desc "lb add NAME", "assign servers to balancer rule"
   option :project
   option :servers, required: true, type: :array, description: 'server names'
   def add(name)

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

@@ -1,13 +1,13 @@
 class Network < Thor
   include CommandLineReporter
 
-  desc "create NAME", "create network"
+  desc "network create NAME", "create network"
   def create(name)
 
 
   end
 
-  desc "list", "list networks"
+  desc "network list", "list networks"
   option :project
   option :physical, type: :boolean
   def list
@@ -67,6 +67,5 @@ class Network < Thor
       end
     end
 
-    
   end
 end

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

@@ -1,7 +1,7 @@
 class Offering < Thor
   include CommandLineReporter
 
-  desc 'list', 'list offerings by type [compute|network|storage]'
+  desc 'offering list', 'list offerings by type [compute|network|storage]'
   option :domain
   def list(type='compute')
     cs_cli = CloudstackCli::Helper.new(options[:config])
@@ -37,7 +37,7 @@ class Offering < Thor
     end
   end
 
-  desc 'create NAME', 'create offering'
+  desc 'offering create NAME', 'create offering'
   option :cpunumber, required: true
   option :cpuspeed, required: true
   option :displaytext, required: true
@@ -58,7 +58,7 @@ class Offering < Thor
   end
 
 
-  desc 'sort', 'sort by cpu and memory grouped by domain'
+  desc 'offering sort', 'sort by cpu and memory grouped by domain'
   def sort
     cs_cli = CloudstackCli::Helper.new(options[:config])
     offerings = cs_cli.server_offerings(options[:domain])

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

@@ -1,6 +1,6 @@
 class Project < Thor
 
-  desc "list", "list projects"
+  desc "project list", "list projects"
   def list
     cs_cli = CloudstackCli::Helper.new(options[:config])
     projects = cs_cli.projects

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

@@ -1,6 +1,6 @@
 class Publicip < Thor
 
-  desc "remove ID", "remove public IP address"
+  desc "publicip remove ID", "remove public IP address"
   def remove(id)
     cs_cli = CloudstackCli::Helper.new(options[:config])
     puts "OK" if cs_cli.remove_publicip(id)

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

@@ -2,7 +2,7 @@ class Router < Thor
 	include Thor::Actions
 	include CommandLineReporter
 
-	desc "list", "list virtual routers"
+	desc "router list", "list virtual routers"
   option :project
   option :account
   option :zone
@@ -16,7 +16,10 @@ class Router < Thor
 		cs_cli = CloudstackCli::Helper.new(options[:config])
    	if options[:project]
     	project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-     	raise "Project '#{options[:project]}' not found" unless project
+     	unless project
+     		say "Error: Project '#{options[:project]}' not found", :red
+     		exit 1
+     	end
      	projectid = project['id']
    	end
 
@@ -82,16 +85,16 @@ class Router < Thor
 	  	when "start"
 	  		exit unless yes?("Start the routers above? [y/N]:", :magenta)
 	  		routers.each do |router|
-	  			print "Start router #{router['name']}"
-	  			cs_cli.start_router router['id']
-	  			puts
+	  			say "Start router #{router['name']}... "
+	  			say "job started ", :green if job = cs_cli.start_router(router['id'])
+	  			say "(jobid: #{job['jobid']})"
 	  		end
 	  	when "stop"
 	  		exit unless yes?("Stop the routers above? [y/N]:", :magenta)
 	  		routers.each do |router|
-	  			print "Stop router #{router['name']}"
-	  			cs_cli.stop_router router['id']
-	  			puts
+	  			say "Stop router #{router['name']}... "
+	  			say "job started ", :green if job = cs_cli.stop_router(router['id'])
+	  			say "(jobid: #{job['jobid']})"
 	  		end
 	  	else
 	  		say "Command #{options[:command]} not supported", :red
@@ -100,24 +103,25 @@ class Router < Thor
 	  end
   end
 
-  desc "stop ID", "stop virtual router"
+  desc "router stop ID", "stop virtual router"
   def stop(id)
   	exit unless yes?("Stop the router with ID #{id}?", :magenta)
   	cs_cli = CloudstackCli::Helper.new(options[:config])
   	cs_cli.stop_router id
   end
 
-  desc "start ID", "start virtual router"
+  desc "router start ID", "start virtual router"
   def start(id)
   	exit unless yes?("Start the router with ID #{id}?", :magenta)
   	cs_cli = CloudstackCli::Helper.new(options[:config])
   	cs_cli.start_router id
   end
 
-  desc "destroy ID", "destroy virtual router"
+  desc "router destroy ID", "destroy virtual router"
   def destroy(id)
+  	exit unless yes?("Destroy the router with ID #{id}?", :magenta)
   	cs_cli = CloudstackCli::Helper.new(options[:config])
-  	puts "OK" if cs_cli.destroy_router(name)
+  	say "OK", :green if cs_cli.destroy_router(id)
   end
 
 end

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

@@ -1,6 +1,6 @@
 class Server < Thor
 
-  desc "list", "list servers"
+  desc "server list", "list servers"
   option :listall, :type => :boolean
   option :text, :type => :boolean
   option :project
@@ -27,7 +27,7 @@ class Server < Thor
     end
   end
 
-  desc "create NAME", "create a server"
+  desc "server create NAME", "create a server"
   option :zone, :required => true
   option :template, :required => true
   option :offering, :required => true
@@ -36,7 +36,7 @@ class Server < Thor
   option :port_forwarding, :type => :array, :aliases => :pf, :default => [], :description => "public_ip:port"
   option :interactive, :type => :boolean
   def create(name)
-    CloudstackCli::Cli.new.bootstrap_server(
+    CloudstackCli::Helper.new(options[:config]).bootstrap_server(
         name,
         options[:zone],
         options[:template],
@@ -47,19 +47,24 @@ class Server < Thor
       )
   end
 
-  desc "stop NAME", "stop a server"
+  desc "server bootstrap", "interactive creation of a server with network access"
+  def bootstrap
+    CloudstackCli::Helper.new(options[:config]).bootstrap_server_interactive()
+  end
+
+  desc "server stop NAME", "stop a server"
   def stop(name)
-    CloudstackCli::Cli.new.stop_server(name)
+    CloudstackCli::Helper.new(options[:config]).stop_server(name)
   end
 
-  desc "start NAME", "start a server"
+  desc "server start NAME", "start a server"
   def start(name)
-    CloudstackCli::Cli.new.start_server(name)
+    CloudstackCli::Helper.new(options[:config]).start_server(name)
   end
 
-  desc "reboot NAME", "reboot a server"
+  desc "server reboot NAME", "reboot a server"
   def restart(name)
-    CloudstackCli::Cli.new.reboot_server(name)
+    CloudstackCli::Helper.new(options[:config]).reboot_server(name)
   end
 
 end

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

@@ -1,6 +1,6 @@
 class Stack < Thor
 
-	desc "create STACKFILE", "create a stack of servers"
+	desc "stack create STACKFILE", "create a stack of servers"
   def create(stackfile)
     CloudstackCli::Cli.new.bootstrap_server(
         name,

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

@@ -1,6 +1,6 @@
 class Template < Thor
 
-  desc 'list', 'list templates by type [featured|self|self-executable|executable|community]' 
+  desc 'template list', 'list templates by type [featured|self|self-executable|executable|community]' 
   option :project
   def list(type='featured')
     cs_cli = CloudstackCli::Helper.new(options[:config])

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

@@ -1,5 +1,5 @@
 class Volume < Thor
-  desc "list", "list networks"
+  desc "volume list", "list networks"
   option :project
   def list
     cs_cli = CloudstackCli::Helper.new(options[:config])

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

@@ -1,6 +1,6 @@
 class Zone < Thor
 
-  desc "list", "list zones"
+  desc "zone list", "list zones"
   def list
     cs_cli = CloudstackCli::Helper.new(options[:config])
     zones = cs_cli.zones

data/lib/cloudstack-cli/helper.rb

@@ -37,7 +37,7 @@ module CloudstackCli
       @cs.update_offering(args)
     end
     
-    def templates(type = 'featured', project_id)
+    def templates(type = 'featured', project_id = -1)
       @templates ||= @cs.list_templates(type, project_id)
     end
 
@@ -194,13 +194,13 @@ module CloudstackCli
     	end 	
     end
 
-    def interactive
+    def bootstrap_server_interactive
       ARGV.clear 
     	puts
-    	puts %{We are going to deploy a new server and...
-    	 - assign a public IP address
-    	 - create a firewall rule for SSH and HTTP access
-    	 - connect to the server and install the puppet client}.color(:magenta)
+    	puts "We are going to deploy a new server and..."
+    	puts "- assign a public IP address"
+    	puts "- create a firewall rule for SSH and HTTP access"
+    	puts "- connect to the server and install the puppet client}"
     	puts
 
     	print "Please provide a name for the new server".background(:blue)

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/cloudstack-client/client.rb

@@ -756,37 +756,34 @@ module CloudstackClient
     ##
     # Destroy virtual router.
 
-    def destroy_router(id)
+    def destroy_router(id, async = false)
       params = {
         'command' => 'destroyRouter',
         'id' => id
       }
-      json = send_request(params)
-      json['router'].first
+      async ? send_async_request(params) : send_request(params)
     end
 
     ##
     # Start virtual router.
 
-    def start_router(id)
+    def start_router(id, async = false)
       params = {
         'command' => 'startRouter',
         'id' => id
       }
-
-      json = send_async_request(params)
+      async ? send_async_request(params) : send_request(params)
     end
 
     ##
     # Stop virtual router.
 
-    def stop_router(id)
+    def stop_router(id, async = false)
       params = {
         'command' => 'stopRouter',
         'id' => id
       }
-
-      json = send_async_request(params)
+      async ? send_async_request(params) : send_request(params)
     end
 
     ##

data/lib/cloudstack_cli.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
-
 require 'yaml'
 require 'rainbow'
 require "thor"

data/lib/cloudstack_client.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
-
 require "cloudstack-client/client"
 require "cloudstack-client/helper"
 require "cloudstack-client/ssh_command"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -147,15 +147,17 @@ files:
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses: []
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --line-numbers
+- --inline-source
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: