cloudstack-cli 0.0.5 → 0.1.0

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.0.3)
-      command_line_reporter (~> 3.2.1)
+    cloudstack-cli (0.0.5)
       net-ssh (~> 2.6.7)
       rainbow (~> 1.1.4)
       thor (~> 0.18.1)
@@ -10,9 +9,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    colored (1.2)
-    command_line_reporter (3.2.1)
-      colored (>= 1.2)
     json (1.8.0)
     net-ssh (2.6.8)
     rainbow (1.1.4)

data/README.md

@@ -1,6 +1,6 @@
 # Cloudstack CLI
 
-Cloudstack CLI gives command line access to the CloudStack API commands.
+Cloudstack CLI is a [CloudStack](http://cloudstack.apache.org/) API client written in Ruby.
 
 ## Installation
 
@@ -12,7 +12,7 @@ Install the cloudstack-cli gem:
 
 Create the initial configuration:
 
-	cs setup
+	$ cs setup
 
 cloudstack-cli expects to find a configuartion file with the API URL and your CloudStack credentials in your home directory named .cloudstack-cli.yml. If the file is located elsewhere you can specify the loaction using the --config option.
 
@@ -40,24 +40,24 @@ Bootsrap a server:
 
 Run a custom API command:
 
-    cs command listAlerts type=8
+    $ cs command listAlerts type=8
 
 ### Example 3
 
 Sort all computing offerings by CPU and Memory grouped my Domain:
 
-    cs offering sort
+    $ cs offering sort
 
 ### 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
+    $ 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
+    $ watch -n cs router list --project Demo
 
 
 ## References

data/cloudstack-cli.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency('thor', '~> 0.18.1')
   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

data/lib/cloudstack-cli/base.rb

@@ -0,0 +1,36 @@
+module CloudstackCli  
+  class Base < Thor
+    include Thor::Actions
+    attr_reader :config
+
+    # catch control-c and exit
+    trap("SIGINT") {
+      puts
+      puts "bye"
+      exit!
+    }
+
+    no_commands do  
+      def client
+        @config ||= CloudstackClient::ConnectionHelper.load_configuration(options[:config])
+        @client ||= CloudstackClient::Connection.new(
+          @config[:url],
+          @config[:api_key],
+          @config[:secret_key]
+        )
+      end
+
+      def find_project(project_name = options[:project])
+        unless project = client.get_project(project_name)
+          say "Project '#{options[:project]}' not found", :red
+          exit 1
+        end
+        project
+      end
+
+      def filter_by(objects, tag_name, tag)
+        objects.select {|r| r[tag_name].downcase == tag }
+      end
+    end
+  end
+end

data/lib/cloudstack-cli/cli.rb

@@ -1,7 +1,5 @@
 module CloudstackCli
-  trap("TERM") { puts "SIGTERM received"; exit }
-
-  class Cli < Thor
+  class Cli < CloudstackCli::Base
     include Thor::Actions
 
     package_name "cloudstack-cli" 
@@ -24,8 +22,8 @@ module CloudstackCli
     def setup(file = options[:config])
       config = {}
       unless options[:url]
-        say "What's the URL of your Cloudstack API?", :blue
-        say "Example: https://my-cloudstack-server/client/api/", :blue
+        say "What's the URL of your Cloudstack API?", :yellow
+        say "Example: https://my-cloudstack-server/client/api/", :yellow
         config[:url] = ask("URL:", :magenta)
       end
 
@@ -55,46 +53,49 @@ module CloudstackCli
       puts JSON.pretty_generate(client.cs.send_request params)
     end
     
-    desc "zone SUBCOMMAND ...ARGS", "manage zones"
+    desc "zone SUBCOMMAND ...ARGS", "Manage zones"
     subcommand "zone", Zone
 
-    desc "project SUBCOMMAND ...ARGS", "manage servers"
+    desc "project SUBCOMMAND ...ARGS", "Manage servers"
     subcommand "project", Project
 
-    desc "server SUBCOMMAND ...ARGS", "manage servers"
+    desc "server SUBCOMMAND ...ARGS", "Manage servers"
     subcommand "server", Server
 
-    desc "offering SUBCOMMAND ...ARGS", "manage offerings"
+    desc "offering SUBCOMMAND ...ARGS", "Manage offerings"
     subcommand "offering", Offering
 
-    desc "network SUBCOMMAND ...ARGS", "manage networks"
+    desc "network SUBCOMMAND ...ARGS", "Manage networks"
     subcommand "network", Network
 
-    desc "lb SUBCOMMAND ...ARGS", "manage load balancing rules"
+    desc "lb SUBCOMMAND ...ARGS", "Manage load balancing rules"
     subcommand "lb", Lb
 
-    desc "template SUBCOMMAND ...ARGS", "manage template"
+    desc "template SUBCOMMAND ...ARGS", "Manage template"
     subcommand "template", Template
 
-    desc "router SUBCOMMAND ...ARGS", "manage virtual routers"
+    desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
     subcommand "router", Router
 
-    desc "router SUBCOMMAND ...ARGS", "manage virtual routers"
+    desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
     subcommand "router", Router
 
-    desc "volume SUBCOMMAND ...ARGS", "manage volumes"
+    desc "volume SUBCOMMAND ...ARGS", "Manage volumes"
     subcommand "volume", Volume
 
-    desc "stack SUBCOMMAND ...ARGS", "manage stacks"
+    desc "stack SUBCOMMAND ...ARGS", "Manage stacks"
     subcommand "stack", Stack
 
-    desc "account SUBCOMMAND ...ARGS", "manage accounts"
+    desc "account SUBCOMMAND ...ARGS", "Manage accounts"
     subcommand "account", Account
 
-    desc "domain SUBCOMMAND ...ARGS", "manage domains"
+    desc "domain SUBCOMMAND ...ARGS", "Manage domains"
     subcommand "domain", Domain
 
-    desc "publicip SUBCOMMAND ...ARGS", "manage public ip addresses"
+    desc "publicip SUBCOMMAND ...ARGS", "Manage public ip addresses"
     subcommand "publicip", Publicip
+
+    desc "capacity SUBCOMMAND ...ARGS", "Lists all the system wide capacities"
+    subcommand "capacity", Capacity
   end
 end

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

@@ -1,15 +1,22 @@
-class Account < Thor
+class Account < CloudstackCli::Base
 
-  desc 'account list [NAME]', 'list accounts'
+  TYPES = {
+    0 => 'user',
+    1 => 'domain-admin',
+    2 => 'admin'
+  }
+
+  desc 'list [NAME]', 'list accounts'
   def list(name = nil)
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    accounts = cs_cli.list_accounts(name)
+    accounts = client.list_accounts({name: name})
     if accounts.size < 1
       puts "No accounts found"
     else
+      table = [["Name", "Type", "Domain"]]
       accounts.each do |account|
-        puts "#{account['name']} - #{account['domain']}"
+        table << [account['name'], TYPES[account['accounttype']], account['domain']]
       end
+      print_table table
     end
   end
   

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

@@ -0,0 +1,34 @@
+class Capacity < CloudstackCli::Base
+	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"
+	}
+
+  desc "list", "list system capacity"
+  option :zone
+  def list
+  	capacities = client.list_capacity
+  	table = []
+    header = ["Zone", "Type", "Capacity Used", "Capacity Total", "Used"]
+    capacities.each do |c|
+    	table << [
+    		c['zonename'],
+    	 	TYPES[c['type']],
+    	 	c['capacityused'],
+    	 	c['capacitytotal'],
+    	 	"#{c['percentused']}%"
+    	]
+    end
+    table = table.sort {|a, b|  [a[0], a[1]] <=> [b[0], b[1]]}.insert(0, header)
+    print_table table
+  end
+
+end

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

@@ -1,15 +1,16 @@
-class Domain < Thor
+class Domain < CloudstackCli::Base
 
-  desc 'domain list [NAME]', 'list domains'
+  desc 'list [NAME]', 'list domains'
   def list(name = nil)
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    domains = cs_cli.domains(name)
+    domains = client.list_domains(name)
     if domains.size < 1
       puts "No domains found"
     else
+      table = [["Name", "Path"]]
       domains.each do |domain|
-        puts "#{domain['name']}"
+        table << [domain['name'], domain['path']]
       end
+      print_table table
     end
   end
   

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

@@ -1,59 +1,53 @@
-class Lb < Thor
+class Lb < CloudstackCli::Base
   
-  desc "lb list", "list load balancer rules"
+  desc "list", "list load balancer rules"
   option :project
   def list
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    if options[:project]
-      project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-      exit_now! "Project '#{options[:project]}' not found" unless project
-    end
-    
-    rules = cs_cli.list_load_balancer_rules(project ? project['id'] : nil)
+    project = find_project if options[:project]
+    rules = client.list_load_balancer_rules(
+      { project_name: project ? project['name'] : nil }
+    )
     if rules.size < 1
       puts "No load balancer rules found"
     else
+      table = [["Name", "Public-IP", "Public-Port"]]
       rules.each do |rule|
-        puts "#{rule['name']} - #{rule['publicip']}:#{rule['publicport']}"
+        table << [rule['name'], rule['publicip'], rule['publicport']]
       end
+      print_table table
     end
   end
 
-  desc "lb create NAME", "create load balancer rule"
+  desc "create NAME", "create load balancer rule"
   option :project
-  option :ip, :required => true
-  option :public_port, :required => true
+  option :ip, required: true
+  option :public_port, required: true
   option :private_port
   def create(name)
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    if options[:project]
-      project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-      exit_now! "Project '#{options[:project]}' not found" unless project
-    end
-
+    project = find_project
     options[:private_port] = options[:public_port] if options[:private_port] == nil
-    
-    rule = cs_cli.create_load_balancer_rule(
+    say "Create rule #{name}...", :yellow
+    rule = client.create_load_balancer_rule(
       name,
       options[:ip],
       options[:private_port],
       options[:public_port],
     )
+    say "OK!", :green
   end
 
-  desc "lb add NAME", "assign servers to balancer rule"
-  option :project
+  desc "add NAME", "assign servers to balancer rule"
   option :servers, required: true, type: :array, description: 'server names'
   def add(name)
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    if options[:project]
-      project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-      exit_now! "Project '#{options[:project]}' not found" unless project
-    end
-    
-    rule = cs_cli.assign_to_load_balancer_rule(
+    say "Add #{names.join(', ')} to rule #{id}...", :yellow
+    rule = client.assign_to_load_balancer_rule(
       name,
       options[:servers],
     )
+    if rule['success']
+      say "OK!", :green
+    else
+      say "Failed!", :red
+    end
   end
 end

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

@@ -1,71 +1,50 @@
-class Network < Thor
-  include CommandLineReporter
+class Network < CloudstackCli::Base
 
-  desc "network create NAME", "create network"
+  desc "create NAME", "create network"
   def create(name)
-
-
+    # TODO
   end
 
-  desc "network list", "list networks"
+  desc "list", "list networks"
   option :project
   option :physical, type: :boolean
   def list
-    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
-    end
-    
+    project = find_project if options[:project]
     if options[:physical]
-      networks = cs_cli.physical_networks
+      networks = client.list_physical_networks
       if networks.size < 1
         puts "No networks found"
       else
-        table(border: true) do
-          row do
-            column 'ID', width: 40
-            column 'Name', width: 30
-            column 'Zone ID', width: 14 unless options[:project]
-            column 'State'
-          end
-          networks.each do |network|
-            row do
-              column network["id"]
-              column network["name"]
-              column network["zoneid"]
-              column network["state"]
-            end
-          end
+        table = [['Name', 'State', 'ID', 'Zone ID']]
+        networks.each do |network|
+          table << [
+            network["name"],
+            network["state"],
+            network["id"],
+            network["zoneid"] 
+          ]
         end
+        print_table table
       end
     else
-      networks = cs_cli.networks(project ? project['id'] : -1)
+      networks = client.list_networks(project ? project['id'] : -1)
       if networks.size < 1
         puts "No networks found"
       else
-        table(border: true) do
-          row do
-            column 'ID', width: 40
-            column 'Name', width: 30
-            column 'Displaytext', width: 30
-            column 'Account', width: 14 unless options[:project]
-            column 'Project', width: 14 if options[:listall] || options[:project]
-            column 'State'
-          end
-          networks.each do |network|
-            row do
-              column network["id"]
-              column network["name"]
-              column network["displaytext"]
-              column network["account"] unless options[:project]
-              column network["project"] if options[:listall] || options[:project]
-              column network["state"]
-            end
-          end
+        table = [["Name", "Displaytext", "Account", "Project", "State", "ID"]]
+        networks.each do |network|
+          table << [
+            network["name"],
+            network["displaytext"],
+            network["account"],
+            network["project"],
+            network["state"],
+            network["id"]
+          ]
         end
+        print_table table
       end
     end
-
   end
+
 end