cloudstack-cli 0.0.5 → 0.1.0

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

@@ -1,11 +1,9 @@
-class Offering < Thor
-  include CommandLineReporter
+class Offering < CloudstackCli::Base
 
-  desc 'offering list', 'list offerings by type [compute|network|storage]'
+  desc 'list', 'list offerings by type [compute|network|storage]'
   option :domain
   def list(type='compute')
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    offerings = cs_cli.server_offerings(options[:domain])
+    offerings = client.list_service_offerings(options[:domain])
 
     offerings.group_by{|o| o["domain"]}.each_value do |offers|
       offers.sort {
@@ -18,26 +16,20 @@ class Offering < Thor
     if offerings.size < 1
       puts "No offerings found"
     else
-      table(border: true) do
-        row do
-          column 'Name', width: 20
-          column 'Description', width: 30
-          column 'ID', width: 30
-          column 'Domain', width: 16
-        end
-        offerings.each do |offering|
-          row do
-            column offering["name"]
-            column offering["id"]
-            column offering["displaytext"]
-            column offering["domain"]
-          end
-        end
+      table = [["Name", "Displaytext", "Domain", "ID"]]
+      offerings.each do |offering|
+        table << [
+          offering["name"],
+          offering["displaytext"],
+          offering["domain"],
+          offering["id"]
+        ]
       end
+      print_table table
     end
   end
 
-  desc 'offering create NAME', 'create offering'
+  desc 'create NAME', 'create offering'
   option :cpunumber, required: true
   option :cpuspeed, required: true
   option :displaytext, required: true
@@ -47,28 +39,25 @@ class Offering < Thor
   option :tags
   def create(name)
     options[:name] = name
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    puts "OK" if cs_cli.create_offering(options)
+    puts "OK" if client.create_offering(options)
   end
 
   desc 'delete ID', 'delete offering'
   def delete(id)
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    puts "OK" if cs_cli.delete_offering(id)
+    puts "OK" if client.delete_offering(id)
   end
 
 
-  desc 'offering sort', 'sort by cpu and memory grouped by domain'
+  desc '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])
+    offerings = client.list_service_offerings(options[:domain])
     sortkey = -1
     offerings.group_by{|o| o["domain"]}.each_value do |offers|
       offers.sort {
         |oa, ob| [oa["cpunumber"], oa["memory"]] <=> [ob["cpunumber"], ob["memory"]]
       }.each do |offer|
         puts "#{sortkey.abs} #{offer['domain']} - #{offer["displaytext"]}"
-        cs_cli.update_offering({
+        client.update_offering({
           "id" => offer['id'],
           'sortkey' => sortkey
         })

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

@@ -1,15 +1,17 @@
-class Project < Thor
+class Project < CloudstackCli::Base
 
-  desc "project list", "list projects"
+  desc "list", "list projects"
   def list
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    projects = cs_cli.projects
+    projects = client.list_projects
     if projects.size < 1
       puts "No projects found"
     else
+      table = [["Name", "Displaytext", "Domain"]]
       projects.each do |project|
-        puts "#{project['name']} - #{project['displaytext']} - #{project['domain']}"
+        table << [project['name'], project['displaytext'], project['domain']]
       end
+      print_table(table)
     end
   end
+  
 end

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

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

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

@@ -1,83 +1,68 @@
-class Router < Thor
-	include Thor::Actions
-	include CommandLineReporter
+class Router < CloudstackCli::Base
 
-	desc "router list", "list virtual routers"
+	desc "list", "list virtual routers"
   option :project
   option :account
   option :zone
   option :status, desc: "Running or Stopped"
-  option :redundant_state, desc: "MASTER, BACKUP or UNKNOWN"
+  option :redundant_state, desc: "master, backup, failed or unknown"
   option :listall, type: :boolean
-  option :text, type: :boolean, desc: "text output (only the instance name)"
+  option :showid, type: :boolean
   option :command, desc: "command to execute for each router: START or STOP"
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   def list
-		cs_cli = CloudstackCli::Helper.new(options[:config])
-   	if options[:project]
-    	project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-     	unless project
-     		say "Error: Project '#{options[:project]}' not found", :red
-     		exit 1
-     	end
-     	projectid = project['id']
-   	end
-
-		routers = cs_cli.list_routers(
+   	projectid = find_project['id'] if options[:project]
+		routers = client.list_routers(
 			{
 				account: options[:account], 
 				projectid: projectid,
 				status: options[:status],
 				zone: options[:zone]
-			}, 
-			options[:redundant_state]
+			}
 		)
 
-
 		if options[:listall]
-			projects = cs_cli.projects
+			projects = client.list_projects
 			projects.each do |project|
-		  	routers = routers + cs_cli.list_routers(
+		  	routers = routers + client.list_routers(
 		  		{
 		  			account: options[:account],
 		  			projectid: project['id'],
 		  			status: options[:status],
 		  			zone: options[:zone]
-		  		},
-		  		options[:redundant_state]
+		  		}
 		  	)
 		  end
 		end
 
+		if options[:redundant_state]
+			routers = filter_by(routers, 'redundantstate', options[:redundant_state].downcase)
+		end
+
 		routers.reverse! if options[:reverse]
-		if options[:text]
-			puts routers.map {|r| r['name']}.join(" ")
+		if routers.size < 1
+			say "No routers found."
 		else
-		  puts "Total number of routers: #{routers.size}"
-			table(border: true) do
-	    	row do
-	    		column 'ID', width: 40
-	        column 'Name'
-	        column 'Zone'
-	        column 'Account', width: 14 unless options[:project]
-	        column 'Project', width: 14 if options[:listall] || options[:project]
-	        column 'Redundant State'
-	        column 'Linklocal IP', width: 15
-	        column 'Status'
-	      end
-	      routers.each do |router|
-	        row do
-	        	column router["id"]
-	          column router["name"]
-	          column router["zonename"]
-	          column router["account"] unless options[:project]
-	          column router["project"] if options[:listall] || options[:project]
-	          column router["redundantstate"]
-	          column router["linklocalip"]
-	          column router["state"]
-	        end
-	      end
-	    end
+		  table = [[
+		  	'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'Linklocal IP', 'Status', 'ID'
+		  ]]
+		  table[0].delete('ID') unless options[:showid]
+      routers.each do |router|
+        table << [
+          router["name"],
+          router["zonename"],
+          router["account"],
+          router["project"],
+          router["redundantstate"],
+          router["linklocalip"],
+          router["state"],
+          router["id"]
+        ]
+        table[-1].delete_at(-1) unless table[0].index "ID"
+      end
+      print_table table
+      puts
+      say "Number of routers: #{routers.size}"
 	  end
 
 	  if options[:command]
@@ -86,14 +71,14 @@ class Router < Thor
 	  		exit unless yes?("Start the routers above? [y/N]:", :magenta)
 	  		routers.each do |router|
 	  			say "Start router #{router['name']}... "
-	  			say "job started ", :green if job = cs_cli.start_router(router['id'])
+	  			say "job started ", :green if job = client.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|
 	  			say "Stop router #{router['name']}... "
-	  			say "job started ", :green if job = cs_cli.stop_router(router['id'])
+	  			say "job started ", :green if job = client.stop_router(router['id'])
 	  			say "(jobid: #{job['jobid']})"
 	  		end
 	  	else
@@ -103,25 +88,22 @@ class Router < Thor
 	  end
   end
 
-  desc "router stop ID", "stop virtual router"
+  desc "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
+  	client.stop_router id
   end
 
-  desc "router start ID", "start virtual router"
+  desc "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
+  	client.start_router id
   end
 
-  desc "router destroy ID", "destroy virtual router"
+  desc "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])
-  	say "OK", :green if cs_cli.destroy_router(id)
+  	say "OK", :green if client.destroy_router(id)
   end
 
 end

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

@@ -1,33 +1,37 @@
-class Server < Thor
+class Server < CloudstackCli::Base
 
-  desc "server list", "list servers"
-  option :listall, :type => :boolean
-  option :text, :type => :boolean
+  desc "list", "list servers"
   option :project
   option :account
   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
-      options[:project_id] = project['id']
-      options[:account] = nil
+      if options[:project].downcase == "all"
+        options[:project_id] = -1
+      else
+        project = find_project
+        options[:project_id] = project['id']
+      end
     end
-    servers = cs_cli.virtual_machines(options)
+    servers = client.list_servers(options)
     if servers.size < 1
       puts "No servers found"
     else
-      if options[:text]
-        servers.each do |server|
-          puts "#{server['name']} - #{server['state']} - #{server['domain']}"
-        end
-      else
-        cs_cli.virtual_machines_table(servers)
+      table = [["Name", "State", "Offering", "Zone", options[:project] ? "Project" : "Account", "IP's"]]
+      servers.each do |server|
+        table << [
+          server['name'],
+          server['state'],
+          server['serviceofferingname'],
+          server['zonename'],
+          options[:project] ? server['project'] : server['account'],
+          server['nic'].map { |nic| nic['ipaddress']}.join(' ')
+        ]
       end
+      print_table table
     end
   end
 
-  desc "server create NAME", "create a server"
+  desc "create NAME", "create a server"
   option :zone, :required => true
   option :template, :required => true
   option :offering, :required => true
@@ -37,34 +41,37 @@ class Server < Thor
   option :interactive, :type => :boolean
   def create(name)
     CloudstackCli::Helper.new(options[:config]).bootstrap_server(
-        name,
-        options[:zone],
-        options[:template],
-        options[:offering],
-        options[:networks],
-        options[:port_forwarding],
-        options[:project]
-      )
+      name,
+      options[:zone],
+      options[:template],
+      options[:offering],
+      options[:networks],
+      options[:port_forwarding],
+      options[:project]
+    )
   end
 
-  desc "server bootstrap", "interactive creation of a server with network access"
+  desc "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"
+  desc "stop NAME", "stop a server"
   def stop(name)
-    CloudstackCli::Helper.new(options[:config]).stop_server(name)
+    client.stop_server(name)
+    puts
   end
 
-  desc "server start NAME", "start a server"
+  desc "start NAME", "start a server"
   def start(name)
-    CloudstackCli::Helper.new(options[:config]).start_server(name)
+    client.start_server(name)
+    puts
   end
 
-  desc "server reboot NAME", "reboot a server"
+  desc "reboot NAME", "reboot a server"
   def restart(name)
-    CloudstackCli::Helper.new(options[:config]).reboot_server(name)
+    client.reboot_server(name)
+    puts
   end
 
 end

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

@@ -1,16 +1,8 @@
-class Stack < Thor
+class Stack < CloudstackCli::Base
 
-	desc "stack create STACKFILE", "create a stack of servers"
+	desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)
-    CloudstackCli::Cli.new.bootstrap_server(
-        name,
-        options[:zone],
-        options[:template],
-        options[:offering],
-        options[:networks],
-        options[:port_forwarding],
-        options[:project]
-      )
+    # TODO
   end
 
 end

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

@@ -1,24 +1,22 @@
-class Template < Thor
+class Template < CloudstackCli::Base
 
-  desc 'template list', 'list templates by type [featured|self|self-executable|executable|community]' 
+  desc 'list', 'list templates by type [featured|self|self-executable|executable|community]' 
   option :project
   def list(type='featured')
-    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
+    project = find_project if options[:project]
+    unless %w(featured self self-executable executable community).include? type
+      say "unsupported template type '#{type}'", :red
+      exit 1
     end
-    
-    exit_now! "unsupported template type '#{type}'" unless
-      %w(featured self self-executable executable community).include? type
-    templates = cs_cli.templates(type, project ? project['id'] : nil)
+    templates = client.list_templates(type, project ? project['id'] : nil)
     if templates.size < 1
       puts "No templates found"
     else
+      table = [["Name", "Zone"]]
       templates.each do |template|
-        puts template['name']
+        table <<  [template['name'], template['zonename']]
       end
+      print_table(table)
     end
   end