cloudstack-cli 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.1.1)
+    cloudstack-cli (0.1.2)
       net-ssh (~> 2.6.7)
       rainbow (~> 1.1.4)
       thor (~> 0.18.1)

data/README.md

@@ -12,19 +12,19 @@ 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.
 
 Example content of the configuration file:
 
     :url:         "https://my-cloudstack-server/client/api/"
-	:api_key:     "cloudstack-api-key"
-	:secret_key:  "cloudstack-api-secret"
+    :api_key:     "cloudstack-api-key"
+    :secret_key:  "cloudstack-api-secret"
 
 ## Usage
 
-Please see http://rubydoc.info/gems/cloudstack-cli/0.0.3/frames
+For additional documentation find the RubyDoc [here](http://rubydoc.info/gems/cloudstack-cli/).
 
 See the help screen:
 
@@ -82,8 +82,8 @@ Sort all computing offerings by CPU and Memory grouped my Domain:
 
 ### Example 5
 
-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)
+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 redundant routers)
 
     $ cs router list --project Demo --status running --redundant-state BACKUP --command stop
 

data/cloudstack-cli.gemspec

@@ -24,5 +24,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')
 end

data/lib/cloudstack-cli/cli.rb

@@ -68,11 +68,11 @@ module CloudstackCli
     desc "network SUBCOMMAND ...ARGS", "Manage networks"
     subcommand "network", Network
 
-    desc "physicalnetwork SUBCOMMAND ...ARGS", "Manage physical networks"
-    subcommand "physicalnetwork", PhysicalNetwork
+    desc "physical_network SUBCOMMAND ...ARGS", "Manage physical networks"
+    subcommand "physical_network", PhysicalNetwork
 
-    desc "lb SUBCOMMAND ...ARGS", "Manage load balancing rules"
-    subcommand "lb", Lb
+    desc "load_balancer SUBCOMMAND ...ARGS", "Manage load balancing rules"
+    subcommand "load_balancer", LoadBalancer
 
     desc "template SUBCOMMAND ...ARGS", "Manage template"
     subcommand "template", Template
@@ -80,9 +80,6 @@ module CloudstackCli
     desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
     subcommand "router", Router
 
-    desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
-    subcommand "router", Router
-
     desc "volume SUBCOMMAND ...ARGS", "Manage volumes"
     subcommand "volume", Volume
 
@@ -95,10 +92,13 @@ module CloudstackCli
     desc "domain SUBCOMMAND ...ARGS", "Manage domains"
     subcommand "domain", Domain
 
-    desc "publicip SUBCOMMAND ...ARGS", "Manage public ip addresses"
-    subcommand "publicip", Publicip
+    desc "ip_address SUBCOMMAND ...ARGS", "Manage ip addresses"
+    subcommand "ip_address", IpAddress
 
     desc "capacity SUBCOMMAND ...ARGS", "Lists all the system wide capacities"
     subcommand "capacity", Capacity
+
+    desc "port_rules SUBCOMMAND ...ARGS", "Manage portforwarding rules"
+    subcommand "port_rule", PortRule
   end
 end

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

@@ -0,0 +1,33 @@
+class IpAddress < CloudstackCli::Base
+
+  desc "release ID", "release public IP address"
+  def release(id)
+    puts "OK" if client.disassociate_ip_address(id)
+  end
+
+  desc "assign NETWORK", "assign a public IP address"
+  option :project
+  def assign(network)
+  	project = find_project if options[:project]
+  	unless network = client.get_network(network, project ? project["id"] : nil)
+  		error "Network #{network} not found."
+  		exit 1
+  	end
+  	ip = client.associate_ip_address(network["id"])
+  	puts
+  	say ip['ipaddress']
+  end
+
+  desc "list", "list public IP address"
+  option :project
+  option :account
+  option :listall
+  def list
+  	table = [["Address", "Account", "Zone"]]
+  	client.list_public_ip_addresses(options).each do |address|
+  		table << [address["ipaddress"], address["account"], address["zonename"]]
+  	end
+  	print_table table
+  end
+
+end

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

@@ -1,4 +1,4 @@
-class Lb < CloudstackCli::Base
+class LoadBalancer < CloudstackCli::Base
   
   desc "list", "list load balancer rules"
   option :project

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

@@ -7,31 +7,34 @@ class Network < CloudstackCli::Base
 
   desc "list", "list networks"
   option :project
-  option :account, default: ""
+  option :account
+  option :showid, type: :boolean
   def list
     project = find_project if options[:project]
-
     networks = []
     if project
       networks = client.list_networks(project['id'])
+    elsif options[:account]
+      networks = client.list_networks(account: options[:account])
     else
-      networks = client.list_networks(-1, options[:account] != '' ? options[:account] : nil )
-      networks + client.list_networks(nil, options[:account] != '' ? options[:account] : nil )
+      networks = client.list_networks(project_id: -1)
     end
 
     if networks.size < 1
       puts "No networks found"
     else
-      table = [["Name", "Displaytext", "Account", "Project", "State", "ID"]]
+      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State"]]
+      table[0] << "ID" if options[:showid]
       networks.each do |network|
         table << [
           network["name"],
           network["displaytext"],
           network["account"],
           network["project"],
-          network["state"],
-          network["id"]
+          network["domain"],
+          network["state"]
         ]
+        table[-1] << network["id"] if options[:showid]
       end
       print_table table
     end

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

@@ -5,16 +5,17 @@ class PhysicalNetwork < CloudstackCli::Base
   def list
     project = find_project if options[:project]
     networks = client.list_physical_networks
+    zones = client.list_zones
     if networks.size < 1
       puts "No networks found"
     else
-      table = [['Name', 'State', 'ID', 'Zone ID']]
+      table = [['Name', 'State', 'Zone', 'ID']]
       networks.each do |network|
         table << [
           network["name"],
           network["state"],
-          network["id"],
-          network["zoneid"] 
+          zones.select{|zone| zone['id'] == network["zoneid"]}.first["name"], 
+          network["id"]
         ]
       end
       print_table table

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

@@ -0,0 +1,66 @@
+class PortRule < CloudstackCli::Base
+
+  desc "create SERVER", "create portforwarding rules"
+  option :rules, type: :array,
+    required: true,
+    desc: "Port Forwarding Rules [public_ip]:port ...",
+    aliases: '-r'
+  option :network, required: true, aliases: '-n'
+  option :project
+  def create(server_name)
+    unless server = client.get_server(server_name)
+      error "Server #{server_name} not found."
+      exit 1
+    end
+    frontendip = nil
+    project = client.get_project(project)
+    options[:rules].each do |pf_rule|
+      ip = pf_rule.split(":")[0]
+      if ip != ''
+        ip_addr = client.get_public_ip_address(ip)
+      else
+        ip_addr = frontendip ||= client.associate_ip_address(
+          client.get_network(options[:network], project ? project["id"] : nil)["id"]
+        )
+      end
+      port = pf_rule.split(":")[1]
+      puts
+      say "Create port forwarding rule #{ip_addr["ipaddress"]}:#{port} for server #{server_name}.", :yellow
+      client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
+      puts
+    end
+  end
+
+  desc "list", "list portforwarding rules"
+  option :project
+  def list
+    project_id = find_project['id'] if options[:project]
+    rules = client.list_port_forwarding_rules(ip_address_id=nil, project_id)
+    if rules.size < 1
+      puts "No rules found."
+    else
+      table = [["IP", "Server", "Public-Port", "Private-Port", "Protocol", "State"]]
+      rules.each do |rule|
+        table << [
+          rule['ipaddress'],
+          rule['virtualmachinename'],
+          print_ports(rule, 'public'),
+          print_ports(rule, 'private'),
+          rule['protocol'],
+          rule['state']
+        ]
+      end
+      print_table table
+    end
+  end
+
+  no_commands do
+    def print_ports(rule, type)
+      if rule["#{type}port"] == rule["#{type}endport"]
+        return rule["#{type}port"]
+      else
+        return rule["#{type}port"] + "-" + rule["#{type}endport"]
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 class Server < CloudstackCli::Base
+  include CloudstackCli::Helper
 
   desc "list", "list servers"
   option :project
@@ -14,7 +15,7 @@ class Server < CloudstackCli::Base
     end
     servers = client.list_servers(options)
     if servers.size < 1
-      puts "No servers found"
+      puts "No servers found."
     else
       table = [["Name", "State", "Offering", "Zone", options[:project] ? "Project" : "Account", "IP's"]]
       servers.each do |server|
@@ -37,20 +38,36 @@ class Server < CloudstackCli::Base
   option :offering, required: true
   option :networks, type: :array, required: true
   option :project
-  option :port_rules, type: :array, aliases: :pf,
+  option :port_rules, type: :array,
     default: [],
-    description: "Port Forwarding Rules [public_ip]:port ..."
+    desc: "Port Forwarding Rules [public_ip]:port ..."
   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_rules],
-      options[:project]
-    )
+    if project = @cs.get_project(project)
+      project_id = project["id"]
+    end 
+    server = client.get_server(name, project_id)
+    unless server
+      say "Create server #{name}...", :yellow
+      server = client.create_server(
+       name, options[:offering], options[:template],
+       options[:zone], options[:networks], options[:project]
+      )
+      puts
+      say "Server #{name} has been created.", :green
+      client.wait_for_server_state(server["id"], "Running")
+      say "Server #{name} is running.", :green
+    else
+      say "Server #{name} already exists.", :green
+      # TODO: check status of server
+    end
+
+    if options[:port_rules] && options[:port_rules].size > 0
+      invoke "port_rule:create", name,
+        project: options[:project],
+        network: options[:networks].first,
+        rules: options[:port_rules]
+    end
   end
 
   desc "destroy NAME [NAME2 ..]", "destroy a server"
@@ -76,7 +93,7 @@ class Server < CloudstackCli::Base
 
   desc "bootstrap", "interactive creation of a server with network access"
   def bootstrap
-    CloudstackCli::Helper.new(options[:config]).bootstrap_server_interactive()
+    bootstrap_server_interactive
   end
 
   desc "stop NAME", "stop a server"

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

@@ -1,23 +1,27 @@
 class Stack < CloudstackCli::Base
+	include CloudstackCli::Helper
 
 	desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)
   	stack = parse_stackfile(stackfile)
-    say "Crate stack #{stack["name"]}..."
-    puts
+    say "Create stack #{stack["name"]}..."
+    threads = []
     stack["servers"].each do |server|
-      server["name"].split(', ').each do |name|
-        CloudstackCli::Helper.new(options[:config]).bootstrap_server(
-          name,
-          server["zone"] || stack['zone'],
-          server["template"],
-          server["offering"],
-          server["networks"] ? server["networks"].split(', ') : nil,
-          server["port_rules"] ? server["port_rules"].split(', ') : nil,
-          stack["project"]
-        )
+      server["name"].split(', ').each_with_index do |name, i|
+        threads << Thread.new(i) {
+          bootstrap_server(
+            name,
+            server["zone"] || stack["zone"],
+            server["template"],
+            server["offering"],
+            server["networks"] ? server["networks"].split(', ') : nil,
+            server["port_rules"] ? server["port_rules"].split(', ') : nil,
+            stack["project"]
+          )
+        }
       end
     end
+    threads.each {|t| t.join }
   end
 
   desc "destroy STACKFILE", "destroy a stack of servers"

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

@@ -8,7 +8,7 @@ class Template < CloudstackCli::Base
       say "unsupported template type '#{type}'", :red
       exit 1
     end
-    templates = client.list_templates(type, project ? project['id'] : nil)
+    templates = client.list_templates(type: type, project_id: project ? project['id'] : nil)
     if templates.size < 1
       puts "No templates found"
     else

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

@@ -4,7 +4,7 @@ class Volume < CloudstackCli::Base
   option :project
   def list
     project = find_project if options[:project]
-    networks = client.list_networks(project ? project['id'] : nil)
+    networks = client.list_networks(project_id: project ? project['id'] : nil)
     if networks.size < 1
       puts "No networks found"
     else

data/lib/cloudstack-cli/helper.rb

@@ -1,179 +1,121 @@
 module CloudstackCli
-  class Helper
-    attr_reader :cs
-
-    def initialize(config_file)
-      @config_file = config_file
-	    @cs = CloudstackClient::Connection.new(
-	      options[:url],
-	      options[:api_key],
-	      options[:secret_key]
-	    )
-    end
-
-    def options
-       @options ||= CloudstackClient::ConnectionHelper.load_configuration(@config_file)
-    end
-
+  module Helper
     def print_options(options, attr = 'name')
       options.to_enum.with_index(1).each do |option, i|
          puts "#{i}: #{option[attr]}"
       end   
     end
 
-    def domains(name = nil)
-      @cs.list_domains(name)
-    end
-
-    def server_offerings(domain = nil)
-      @server_offerings ||= @cs.list_service_offerings(domain)
-    end
-    
-    def templates(type = 'featured', project_id = -1)
-      @templates ||= @cs.list_templates(type, project_id)
-    end
-
-    def projects
-      @projects ||= @cs.list_projects
-    end
-
-    def zones
-      @zones ||= @cs.list_zones
-    end
-
-    def networks(project_id = nil)
-      @cs.list_networks(project_id)
-    end
-
-
-    def volumes(project_id = nil)
-      @cs.list_volumes(project_id)
-    end
-    
-    def virtual_machines(options = {})
-      @cs.list_servers(options)
+    def ask_number(question)
+      number = ask(question).to_i - 1
+      number < 0 ? 0 : number
     end
 
     def bootstrap_server(name, zone, template, offering, networks, pf_rules = [], project = nil)
-
-      server = @cs.get_server(name)
-
+      if project = client.get_project(project)
+        project_id = project["id"]
+        project_name = project['name']
+      end
+      server = client.get_server(name, project_id)
       unless server
-  		  puts "Create server #{name}...".color(:yellow)
-  		  server = @cs.create_server(
-  			 name,
-  			 offering,
-  			 template,
-  			 zone,
-  			 networks,
-  			 project
-  		  )
-
+        say "Create server #{name}..."
+        server = client.create_server(
+         name, offering, template,
+         zone, networks, project_name
+        )
         puts
-        puts "Server #{server["name"]} has been created.".color(:green)
-        puts
-        puts "Make sure the server is running...".color(:yellow)
-        @cs.wait_for_server_state(server["id"], "Running")
-        puts "OK!".color(:green)
+        say "Server #{server["name"]} has been created.", :green
+        client.wait_for_server_state(server["id"], "Running")
+        say "Server #{server["name"]} is running.", :green
       else
-        puts "Server #{name} already exists".color(:green)
+        say "Server #{name} already exists.", :green
       end
 
-  		if pf_rules && pf_rules.size > 0
-  			puts
+      if pf_rules && pf_rules.size > 0
+        puts
         frontendip = nil
-        project = @cs.get_project(project)
-  			pf_rules.each do |pf_rule|
+        pf_rules.each do |pf_rule|
           ip = pf_rule.split(":")[0]
           if ip != ''
-  				  ip_addr = @cs.get_public_ip_address(ip)
+            ip_addr = client.get_public_ip_address(ip)
           else
-            ip_addr = frontendip ||= @cs.associate_ip_address(
-              @cs.get_network(networks[0], project ? project["id"] : nil)["id"]
+            ip_addr = frontendip ||= client.associate_ip_address(
+              client.get_network(networks[0], project_id)["id"]
             )
           end
-  				port = pf_rule.split(":")[1]
+          port = pf_rule.split(":")[1]
           puts
-  			  print "Create port forwarding rule #{ip}:#{port} ".color(:yellow)
-  			  @cs.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
-  			  puts
-  			end
-  		end
-
-  		puts
-  		puts "Complete!".color(:green)
-    end
-
-    def list_accounts(name = nil)
-      @cs.list_accounts({ name: name })
-    end 
-
-    def list_load_balancer_rules(project = nil)
-      @cs.list_load_balancer_rules(project)
-    end
-
-    def create_load_balancer_rule(name, ip, private_port, public_port, options = {})
-      puts "Create rule #{name}...".color(:yellow)
-      @cs.create_load_balancer_rule(name, ip, private_port, public_port, options = {})
-      puts "OK!".color(:green)
-    end
-
-    def assign_to_load_balancer_rule(id, names)
-      puts "Add #{names.join(', ')} to rule #{id}...".color(:yellow)
-      rule = @cs.assign_to_load_balancer_rule(id, names)
-      if rule['success']
-        puts "OK!".color(:green)
-      else
-        puts "Failed!".color(:red)
+          say "Create port forwarding rule #{ip}:#{port} ", :yellow
+          client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
+          puts
+        end
       end
+      puts
     end
 
     def bootstrap_server_interactive
-      ARGV.clear 
-    	puts
-    	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)
-    	puts " (spaces or special characters are NOT allowed): "
-    	server_name = gets.chomp
-
-    	if projects.size > 0
-    	  puts "Select a project".background(:blue)
-    	  print_options(projects)
-    	  project = gets.chomp.to_i - 1
-    	end
-
-    	puts "Select a computing offering:".background(:blue)
-    	print_options(server_offerings)
-    	service_offering = gets.chomp.to_i - 1
+      zones = client.list_zones
+      if zones.size > 1
+        say "Select a availability zone:", :yellow
+        print_options(zones)
+        zone = ask_number("Zone Nr.: ")
+      else
+        zone = 0
+      end
 
-    	puts "Select a template:".background(:blue)
-    	print_options(templates)
-    	template = gets.chomp.to_i - 1
+      projects = client.list_projects
+      if yes?("Do you want to deploy your server within a project?") && projects.size > 0
+        if projects.size > 0
+          say "Select a project", :yellow
+          print_options(projects)
+          project = ask_number("Project Nr.: ")
+        end
+        project_id = projects[project]['id'] rescue nil
+      end
 
-    	puts "Select a availability zone:".background(:blue)
-    	print_options(zones)
-    	zone = gets.chomp.to_i - 1
-	
-    	# FIXME: show only networks in selected zone
-    	puts "Select a network:".background(:blue)
-    	project_id = projects[project]['id'] rescue nil
-    	networks = @cs.list_networks(project_id)
-    	print_options(networks)
-    	network = gets.chomp.to_i - 1
+      say "Please provide a name for the new server", :yellow
+      say "(spaces or special characters are NOT allowed)"
+      server_name = ask("Server name: ")
+
+      server_offerings = client.list_service_offerings
+      say "Select a computing offering:", :yellow
+      print_options(server_offerings)
+      service_offering = ask_number("Offering Nr.: ")
+
+      templates = client.list_templates(project_id: project_id, zone_id: zones[zone]["id"])
+      say "Select a template:", :yellow
+      print_options(templates)
+      template = ask_number("Template Nr.: ")
+
+      networks = client.list_networks(project_id: project_id, zone_id: zones[zone]["id"])
+      if networks.size > 1
+        say "Select a network:", :yellow
+        print_options(networks)
+        network = ask_number("Network Nr.: ")
+      else
+        network = 0
+      end
 
-    	bootstrap_server(
-    	  server_name,
-    	  zones[zone]["name"],
-    	  templates[template]["name"],
-    	  server_offerings[service_offering]["name"],
-    	  [networks[network]["name"]],
-    	  projects[project]["name"]
-    	)
+      say "You entered the following configuration:", :yellow
+      table =  [["Zone", zones[zone]["name"]]]
+      table << ["Server Name", server_name]
+      table << ["Template", templates[template]["name"]]
+      table << ["Offering", server_offerings[service_offering]["name"]]
+      table << ["Network", networks[network]["name"]]
+      table << ["Project", projects[project]["name"]] if project
+      print_table table
+
+      if yes? "Do you want to deploy this server?"
+        bootstrap_server(
+          server_name,
+          zones[zone]["name"],
+          templates[template]["name"],
+          server_offerings[service_offering]["name"],
+          [networks[network]["name"]], nil,
+          project ? projects[project]["name"] : nil
+        )
+      end
     end
+
   end
 end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/cloudstack-client/client.rb

@@ -103,7 +103,7 @@ module CloudstackClient
       return nil unless server
 
       nic = get_server_default_nic(server) || {}
-      networks = list_networks(server['projectid']) || {}
+      networks = list_networks(project_id: server['projectid']) || {}
 
       id = nic['networkid']
       network = networks.select { |net|
@@ -418,13 +418,14 @@ module CloudstackClient
     # * executable - all templates that can be used to deploy a new VM
     # * community - templates that are public
 
-    def list_templates(filter, project_id = nil)
-      filter ||= 'featured'
+    def list_templates(args = {})
+      filter = args[:filter] || 'featured'
       params = {
           'command' => 'listTemplates',
           'templateFilter' => filter
       }
-      params['projectid'] = project_id if project_id
+      params['projectid'] = args[:project_id] if args[:project_id]
+      params['zoneid'] = args[:zone_id] if args[:zone_id]
       
       json = send_request(params)
       json['template'] || []
@@ -449,7 +450,6 @@ module CloudstackClient
           return n
         end
       }
-
       nil
     end
 
@@ -482,19 +482,20 @@ module CloudstackClient
     ##
     # Lists all available networks.
 
-    def list_networks(project_id = nil, account = nil)
+    def list_networks(args = {})
       params = {
         'command' => 'listNetworks',
         'listall' => true,
       }
-      params['projectid'] = project_id if project_id
-      if account
-        domain = list_accounts({name: account})
+      params['projectid'] = args[:project_id] if args[:project_id]
+      params['zoneid'] = args[:zone_id] if args[:zone_id]
+      if args[:account]
+        domain = list_accounts(name: args[:account])
         if domain.size > 0
-          params['account'] = account
+          params['account'] = args[:account]
           params['domainid'] = domain.first["domainid"]
         else
-          puts "Account #{account} not found."
+          puts "Account #{args[:account]} not found."
         end
       end
       json = send_request(params)
@@ -575,6 +576,33 @@ module CloudstackClient
       json['zone'] || []
     end
 
+    ##
+    # Lists the public ip addresses.
+
+    def list_public_ip_addresses(args = {})
+      params = {
+          'command' => 'listPublicIpAddresses',
+          'isrecursive' => true
+      }
+      if args[:project]
+        project = get_project(args[:project])
+        params['projectid'] = project['id']
+      end
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+      params['listall'] = args[:listall] if args[:listall]
+
+      json = send_request(params)
+      json['publicipaddress'] || []
+    end
+
     ##
     # Finds the public ip address for a given ip address string.
 
@@ -621,13 +649,16 @@ module CloudstackClient
     ##
     # Lists all port forwarding rules.
 
-    def list_port_forwarding_rules(ip_address_id=nil)
+    def list_port_forwarding_rules(ip_address_id=nil, project_id)
       params = {
-          'command' => 'listPortForwardingRules'
+          'command' => 'listPortForwardingRules',
+          'listall' => true,
+          'isrecursive' => true
       }
       params['ipAddressId'] = ip_address_id if ip_address_id
+      params['projectid'] = project_id if project_id
       json = send_request(params)
-      json['portforwardingrule']
+      json['portforwardingrule'] || []
     end
 
     ##

data/lib/cloudstack-client/helper.rb

@@ -6,7 +6,7 @@ module CloudstackClient
       rescue Exception => e
         $stderr.puts "Can't find the config file #{config_file}."
         $stderr.puts "To create a new configuration file run \"cs setup\"."
-        exit
+        exit 1
       end
     end
   end

data/lib/cloudstack_cli.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'rainbow'
 require "thor"
 
 require "cloudstack-cli/version"

data/test/stack_example.json

@@ -10,7 +10,7 @@
       "description": "Web nodes",
       "template": "CentOS-6.4-x64-v1.2",
       "offering": "1cpu_1gb",
-      "networks": "M_ROOT",
+      "networks": "M_PLAY",
       "port_rules": ":80, :443"
     },
     {
@@ -18,7 +18,7 @@
       "description": "PostgreSQL Master",
       "template": "CentOS-6.4-x64-v1.2",
       "offering": "2cpu_4gb",
-      "networks": "M_ROOT"
+      "networks": "M_PLAY"
     }
   ]
 }

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,24 +70,11 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.7
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
 description: cloudstack-cli is a CloudStack API client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -101,12 +96,13 @@ files:
 - lib/cloudstack-cli/commands/account.rb
 - lib/cloudstack-cli/commands/capacity.rb
 - lib/cloudstack-cli/commands/domain.rb
+- lib/cloudstack-cli/commands/ip_address.rb
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
 - lib/cloudstack-cli/commands/offering.rb
 - lib/cloudstack-cli/commands/physical_network.rb
+- lib/cloudstack-cli/commands/port_rule.rb
 - lib/cloudstack-cli/commands/project.rb
-- lib/cloudstack-cli/commands/publicip.rb
 - lib/cloudstack-cli/commands/router.rb
 - lib/cloudstack-cli/commands/server.rb
 - lib/cloudstack-cli/commands/stack.rb
@@ -123,7 +119,6 @@ files:
 - test/stack_example.json
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -131,20 +126,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: cloudstack-cli CloudStack API client
 test_files:
 - test/stack_example.json

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 71a5b85637b159d9b71b76d9c5703ec7eff903c9
-  data.tar.gz: 92774b4af91e17a60e84156c8532ec5eafad2fb2
-SHA512:
-  metadata.gz: ee45344f2a30049f4de0c8c9aa5cd884faaf6b3a7535656880c9357832846cd197c8ab4c5459ccb703dbda51f2b28098086b51d7fb5840e36352e51ea4c7f648
-  data.tar.gz: 6edfcef7302b4dfd45ddef2ab998c01d908084b1d3f33df872ff7402a4a0951ba38f827a97023f38838c4bb4aa99173b8e125c482394c38d36c6eeb8a8fa75fe

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

@@ -1,8 +0,0 @@
-class Publicip < CloudstackCli::Base
-
-  desc "remove ID", "remove public IP address"
-  def remove(id)
-    puts "OK" if client.disassociate_ip_address(id)
-  end
-
-end