bbcloud 0.9.2 → 0.10.1

data/README

@@ -35,7 +35,7 @@ branch.
 
 == License
 
-Copyright (c) 2010 John Leach, Brightbox Systems Ltd <john@brightbox.co.uk>
+Copyright (c) 2010,2011 John Leach, Brightbox Systems Ltd <john@brightbox.co.uk>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -35,7 +35,7 @@ branch.
 
 == License
 
-Copyright (c) 2010 John Leach, Brightbox Systems Ltd <john@brightbox.co.uk>
+Copyright (c) 2010,2011 John Leach, Brightbox Systems Ltd <john@brightbox.co.uk>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bbcloud.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
 	s.add_dependency 'json', '=1.4.6'
 	s.add_dependency 'json_pure', '=1.4.6'
 
-	s.add_dependency 'gli', '1.1.2'
+	s.add_dependency 'gli', '1.2.5'
 	s.add_dependency 'hirb', '0.3.5'
-	s.add_dependency 'fog', '=0.3.23'
-	s.add_dependency 'excon', '>=0.2.4'
+	s.add_dependency 'fog', '=0.4.0'
+	s.add_dependency 'excon', '>=0.3.7'
 	s.add_dependency 'ini', '0.1.1'
 
 end

data/bin/brightbox-lbs

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+begin
+  require "bbcloud/cli"
+rescue LoadError
+  bbcloud_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(bbcloud_path)
+  require "bbcloud/cli"
+end

data/lib/bbcloud/cli.rb

@@ -5,7 +5,7 @@ unless defined?(DISABLE_RUBYGEMS)
   require "rubygems" 
 	gem "json", "=1.4.6"
 	gem "json_pure", "=1.4.6"
-  gem "fog", "=0.3.23"
+  gem "fog", "=0.4.0"
 end
 
 # Add any vendored libraries into search path
@@ -44,7 +44,7 @@ module Fog
   end
 end
 
-%w{api servers images types zones cloud_ips users accounts config version}.each do |f|
+%w{api servers images types zones cloud_ips users accounts config version load_balancers}.each do |f|
   require File.join(File.dirname(__FILE__), f)
 end
 

data/lib/bbcloud/cloud_ips.rb

@@ -18,7 +18,13 @@ module Brightbox
     end
 
     def attributes
-      fog_model.attributes
+      a = fog_model.attributes
+      if a["load_balancer"]
+        a[:destination] = a["load_balancer"]["id"]
+      else
+        a[:destination] = a[:server_id]
+      end
+      a
     end
 
     def to_row
@@ -30,7 +36,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :status, :public_ip, :server_id, :interface_id, :reverse_dns]
+      [:id, :status, :public_ip, :destination, :reverse_dns]
     end
 
     def <=>(b)

data/lib/bbcloud/commands/cloudips-map.rb

@@ -1,5 +1,5 @@
 desc 'map Cloud IPs'
-arg_name 'cloudip-id server-id'
+arg_name 'cloudip-id destination'
 command [:map] do |c|
   c.desc "Unmap mapped ips before remapping them"
   c.switch [:u, "unmap"]
@@ -11,16 +11,28 @@ command [:map] do |c|
     end
 
     if args.size < 2
-      raise "You must specify the cloud ip id and the server id"
+      raise "You must specify the cloud ip id and the destination"
     end
 
     ip_id = args.first
 
     ip = CloudIP.find ip_id
 
+    destination_id = args.last
+    case destination_id
+    when /^srv\-/
+      server = Server.find destination_id
+      destination_id = server.interfaces.first["id"]
+      info "Mapping #{ip} to interface #{destination_id} on #{server}"
+    when /^lba\-/
+      lb = LoadBalancer.find destination_id
+      info "Mapping #{ip} to load balancer #{lb}"
+    else
+      raise "Unknown destination '#{destination_id}'" 
+    end
+
     if ip.mapped?
       if options[:u]
-        info "Unmapping ip #{ip}"
         ip.unmap
         3.times do
           break unless ip.mapped?
@@ -32,13 +44,7 @@ command [:map] do |c|
       end
     end
 
-    server_id = args.last
-    server = Server.find server_id
-    
-    interface_id = server.interfaces.first["id"]
-    info "Mapping #{ip} to interface #{interface_id} on #{server}"
-
-    ip.map interface_id
+    ip.map destination_id
 
     # Wait up to 3 seconds for mapping to complete
     3.times do

data/lib/bbcloud/commands/cloudips-show.rb

@@ -12,7 +12,7 @@ command [:show] do |c|
       warn "Couldn't find cloud ip #{id}"
     end
 
-    fields = [:id, :status, :public_ip, :reverse_dns, :server_id, :interface_id]
+    fields = [:id, :status, :public_ip, :reverse_dns, :destination, :interface_id]
 
     render_table(ips.compact, global_options.merge({ :vertical => true, :fields => fields}))                                              
   end

data/lib/bbcloud/commands/lbs-add-nodes.rb

@@ -0,0 +1,20 @@
+desc 'Add nodes to a load balancer'
+arg_name 'lb-id node-id...'
+command [:add_nodes] do |c|
+
+  c.action do |global_options, options, args|
+
+    raise "You must specify the load balancer and the node ids to add" if args.size < 2
+
+    lb = LoadBalancer.find(args.shift)
+
+    nodes = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
+
+    info "Adding #{nodes.size} nodes to load balancer #{lb.id}"
+    lb.add_nodes nodes
+    lb.reload
+    render_table([lb], global_options)
+  end
+end

data/lib/bbcloud/commands/lbs-create.rb

@@ -0,0 +1,87 @@
+desc 'Create a load balancer'
+long_desc "All intervals and timeouts are in milliseconds"
+arg_name 'srv-id...'
+command [:create] do |c|
+
+  c.desc "Friendly name of load balancer"
+  c.flag [:n, :name]
+
+  c.desc "Load balancer policy"
+  c.default_value "least-connections"
+  c.flag [:p, :policy]
+
+  c.desc "Listeners. Format: in-port:out-port:type. Comma separate multiple listeners."
+  c.default_value "80:80:http,443:443:tcp"
+  c.flag [:l, :listeners]
+
+  c.desc "Healthcheck port. Defaults to first listener out port."
+  c.flag [:k, "hc-port"]
+
+  c.desc "Healthcheck type. Defaults to first listener protocol."
+  c.flag [:y, "hc-type"]
+
+  c.desc "Healthcheck timeout"
+  c.default_value "5000"
+  c.flag [:t, "hc-timeout"]
+
+  c.desc "Healthcheck request. When the type is 'http' this is the url to request."
+  c.default_value "/"
+  c.flag [:s, "hc-request"]
+
+  c.desc "Healthcheck interval"
+  c.default_value "5000"
+  c.flag [:e, "hc-interval"]
+
+  c.desc "Healthcheck threshold up. Number of successful healthchecks for the node to be considered up."
+  c.default_value "3"
+  c.flag [:u, "hc-up"]
+
+  c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
+  c.default_value "3"
+  c.flag [:d, "hc-down"]
+
+  c.action do |global_options, options, args|
+
+    raise "You must specify which servers to balance connections to" if args.empty?
+
+    listeners = options[:l].split(",").collect do |l|
+      inport, outport, protocol = l.split ":"
+      raise "listener '#{l}' is invalid" if inport.nil? or outport.nil? or protocol.nil?
+      { :in => inport, :out => outport, :protocol => protocol }
+    end
+
+    raise "You must specify at least one listener" if listeners.empty?
+
+    # Setup default healthcheck port if not specified
+    if options[:k].nil?
+      options[:k] = listeners.first[:out]
+    end
+
+    if options[:y].nil?
+      options[:y] = listeners.first[:protocol]
+    end
+
+    hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
+      :request, :e => :interval, :u => :threshold_up, :d =>
+      :threshold_down }
+
+    healthcheck = {}
+
+    options.keys.each do |k|
+      if options[k] and hc_arg_lookup[k]
+        healthcheck[hc_arg_lookup[k]] = options[k]
+      end
+    end
+
+    nodes = args.collect { |i| { :node => i } }
+
+    msg = "Creating a new load balancer"
+    info msg
+    lb = LoadBalancer.create(:policy => options[:policy],
+                             :name => options[:n],
+                             :healthcheck => healthcheck,
+                             :listeners => listeners,
+                             :nodes => nodes)
+    render_table([lb], global_options)
+  end
+end

data/lib/bbcloud/commands/lbs-destroy.rb

@@ -0,0 +1,18 @@
+desc 'Destroy load balancers'
+arg_name 'lb-id...'
+command [:destroy] do |c|
+
+  c.action do |global_options, options, args|
+
+    raise "You must specify the load balancers to destroy" if args.empty?
+
+    lbs = LoadBalancer.find_or_call(args) do |id|
+      raise "Couldn't find load balancer #{id}"
+    end
+
+    lbs.each do |lb|
+      info "Destroying load balancer #{lb}"
+      lb.destroy
+    end
+  end
+end

data/lib/bbcloud/commands/lbs-list.rb

@@ -0,0 +1,16 @@
+desc 'List load balancers'
+arg_name '[lb-id...]'
+command [:list] do |c|
+  c.action do |global_options,options,args|
+
+    if args.empty?
+      lbs = LoadBalancer.find(:all)
+    else
+      lbs = LoadBalancer.find_or_call(args) do |id|
+        warn "Couldn't find load balancer #{id}"
+      end
+    end
+
+    render_table(lbs, global_options)
+  end
+end

data/lib/bbcloud/commands/lbs-remove-nodes.rb

@@ -0,0 +1,20 @@
+desc 'Remove nodes from a load balancer'
+arg_name 'lb-id node-id...'
+command [:remove_nodes] do |c|
+
+  c.action do |global_options, options, args|
+
+    raise "You must specify the load balancer and the node ids to remove" if args.size < 2
+
+    lb = LoadBalancer.find(args.shift)
+
+    # We don't want to check servers exist as you can remove deleted
+    # servers from a load balancer.
+    nodes = args.collect { |a| Server.new(a) }
+
+    info "Removing #{nodes.size} nodes from load balancer #{lb.id}"
+    lb.remove_nodes nodes
+    lb.reload
+    render_table([lb], global_options)
+  end
+end

data/lib/bbcloud/commands/lbs-show.rb

@@ -0,0 +1,21 @@
+desc 'Show detailed load balancer info'
+arg_name 'lbs-id...'
+command [:show] do |c|
+
+  c.action do |global_options,options,args|
+
+    raise "You must specify load balancers to show" if args.empty?
+
+    lbs = LoadBalancer.find_or_call(args) do |id|
+      raise "Couldn't find lb #{id}"
+    end
+
+    table_opts = global_options.merge({
+      :vertical => true,
+      :fields => [:id, :status, :name, "created_at", "deleted_at", :policy, :cloud_ips, :nodes, :listeners, :healthcheck]
+    })
+
+    render_table(lbs, table_opts)
+
+  end
+end

data/lib/bbcloud/commands/lbs-update.rb

@@ -0,0 +1,85 @@
+desc 'Update a load balancer'
+long_desc "All intervals and timeouts are in milliseconds"
+arg_name 'lba-id [node-id...]'
+
+command [:update] do |c|
+
+  c.desc "Friendly name of load balancer"
+  c.flag [:n, :name]
+
+  c.desc "Load balancer policy"
+  c.flag [:p, :policy]
+
+  c.desc "Listeners (in-port:out-port:protocol. Comma separate multiple listeners)"
+  c.flag [:l, :listeners]
+
+  c.desc "Healthcheck port"
+  c.flag [:k, "hc-port"]
+
+  c.desc "Healthcheck type"
+  c.flag [:y, "hc-type"]
+
+  c.desc "Healthcheck timeout"
+  c.flag [:t, "hc-timeout"]
+
+  c.desc "Healthcheck request. When the type is 'http' this is the url to request."
+  c.flag [:s, "hc-request"]
+
+  c.desc "Healthcheck interval"
+  c.flag [:e, "hc-interval"]
+
+  c.desc "Healthcheck threshold up. Number of successful healthchecks for the node to be considered up."
+  c.flag [:u, "hc-up"]
+
+  c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
+  c.flag [:d, "hc-down"]
+
+  c.action do |global_options, options, args|
+
+    lb_id = args.shift
+    raise "You must specify the load balancer to update as the first argument" unless lb_id =~ /^lba-/
+
+    lbopts = {}
+
+    unless args.empty?
+      lbopts[:nodes] = args.collect { |a| { :node => a } }
+    end
+
+    hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
+      :request, :e => :interval, :u => :threshold_up, :d =>
+      :threshold_down }
+
+    healthcheck = {}
+
+    options.keys.each do |k|
+      if options[k] and hc_arg_lookup[k]
+        healthcheck[hc_arg_lookup[k]] = options[k]
+      end
+    end
+
+    unless healthcheck.keys.empty?
+      lbopts[:healthcheck] = healthcheck
+    end
+
+    if options[:l]
+      lbopts[:listeners] = options[:l].split(",").collect do |l|
+        inport, output, protocol = l.split ":"
+        { :in => inport, :out => output, :protocol => protocol }
+      end
+    end
+
+    if options[:n]
+      lbopts[:name] = options[:n]
+    end
+
+    if options[:p]
+      lbopts[:policy] = options[:p]
+    end 
+
+    lb = LoadBalancer.find lb_id
+
+    info "Updating load balancer #{lb}"
+    lb = lb.update(lbopts)
+    render_table([lb], global_options)
+  end
+end

data/lib/bbcloud/commands/servers-create.rb

@@ -61,9 +61,16 @@ command [:create] do |c|
 
     if user_data_file
       raise "Cannot specify user data on command line and in file at same time" if user_data
-      File.open(user_data_file, "r") do |f|
-        raise "User data file too big (>16k)" if f.stat.size > 16 * 1024
-        user_data = f.read
+      # Wot we use to read the data, be it from stdin or a file on disk
+      file_handler = lambda do |fh|
+        raise "User data file too big (>16k)" if fh.stat.size > 16 * 1024
+        user_data = fh.read
+      end
+      # Figure out how to invoke file_handler, and then invoke it
+      if user_data_file == "-"
+        file_handler[$stdin]
+      else
+        File.open user_data_file, "r", &file_handler
       end
     end
 

data/lib/bbcloud/load_balancers.rb

@@ -0,0 +1,86 @@
+module Brightbox
+  class LoadBalancer < Api
+
+    def self.create(options)
+      new(conn.load_balancers.create(options))
+    end
+
+    def attributes
+      fog_model.attributes
+    end
+
+    def to_row
+      attributes.merge({ :nodes => node_ids,
+        :created_on => created_on,
+        :listeners => listeners,
+        :cloud_ips => cloud_ips
+      })
+    end
+
+    def created_on
+      attributes["created_at"].to_s.split('T').first
+    end
+
+    def node_ids
+      @node_ids ||= attributes[:nodes].collect { |n| n["id"] } if attributes[:nodes]
+    end
+
+    def cloud_ip_ids
+      @cloud_ip_ids ||= attributes["cloud_ips"].collect { |n| n["id"] } if attributes["cloud_ips"]
+    end
+
+    def cloud_ips
+      @cloud_ips ||= attributes["cloud_ips"].collect { |n| n["public_ip"] } if attributes["cloud_ips"]
+    end
+
+    def listeners
+      if attributes[:listeners]
+        attributes[:listeners].collect { |l| [l["in"], l["out"], l["protocol"]].join(":") }
+      else
+        nil
+      end
+    end
+
+    def destroy
+      fog_model.destroy
+    rescue Excon::Errors::Conflict => e
+      raise Conflict, "Cannot delete load balancer #{id}"
+    end
+
+    def add_nodes(nodes)
+      node_hashes = nodes.collect { |n| { :node => n.id } }
+      LoadBalancer.conn.add_nodes_load_balancer(id, :nodes => node_hashes)
+    rescue Excon::Errors::BadRequest => e
+      raise Conflict, JSON.parse(e.response.body)['error']['details']
+    end
+
+    def remove_nodes(nodes)
+      node_hashes = nodes.collect { |n| { :node => n.id } }
+      LoadBalancer.conn.remove_nodes_load_balancer(id, :nodes => node_hashes)
+    rescue Excon::Errors::BadRequest => e
+      raise Conflict, JSON.parse(e.response.body)['error']['details']
+    end
+
+    def update(options)
+      debug options.inspect
+      LoadBalancer.conn.update_load_balancer(id, options)
+      self.reload
+      self
+    rescue Excon::Errors::BadRequest => e
+      raise Conflict, JSON.parse(e.response.body)['error']['details']
+    end
+
+    def self.get(id)
+      conn.load_balancers.get id
+    end
+
+    def self.all
+      conn.load_balancers
+    end
+
+    def self.default_field_order
+      [:id, :status, :created_on, :cloud_ips, :nodes, :name]
+    end
+
+  end
+end

data/lib/bbcloud/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "0.9.2"
+  VERSION = "0.10.1"
 end

data/tools/bash_completion_script

@@ -85,7 +85,7 @@ _brightbox()
 					client_default|client_remove|client_list)
 						;;
 					*)
-						COMPREPLY=( $( compgen -W 'client_add client_remove client_default help' -- "$cur" ) )
+						COMPREPLY=( $( compgen -W 'client_add client_remove client_default client_list help' -- "$cur" ) )
 						;;
 				esac
 			;;
@@ -115,6 +115,24 @@ _brightbox()
 						;;
 				esac
 			;;
+			brightbox-lbs)
+				case $command in
+					create|update)
+						if [[ "$cur" == -* ]] ; then
+							COMPREPLY=( $( compgen -W '--hc-down --hc-interval --port --listeners --name --policy --hc-request --hc-timeout --hc-up --hc-type' -- "$cur" ) )
+						else
+							test -d ~/.brightbox/cache && COMPREPLY=( $( compgen -W '`ls ~/.brightbox/cache/`' -- "$cur" ) ) 
+						fi
+						;;
+					destroy|list|show|remove_nodes|add_nodes)
+						test -d ~/.brightbox/cache && COMPREPLY=( $( compgen -W '`ls ~/.brightbox/cache/`' -- "$cur" ) ) 
+						;;
+					*)
+						COMPREPLY=( $( compgen -W 'create destroy help list show shutdown snapshot start stop' -- "$cur" ) )
+						;;
+				esac
+			;;
+
 		esac
 
 }
@@ -123,10 +141,11 @@ complete -F _brightbox -o filenames brightbox-images
 complete -F _brightbox -o filenames brightbox-cloudips
 complete -F _brightbox -o filenames brightbox-config
 complete -F _brightbox -o filenames brightbox-users
+complete -F _brightbox -o filenames brightbox-lbs
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 4
+# sh-basic-offset: 2
 # sh-indent-comment: t
 # indent-tabs-mode: nil
 # End:

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 2
-  version: 0.9.2
+  - 10
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - John Leach
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +00:00
+date: 2011-01-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,9 +57,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 5
+        version: 1.2.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -87,9 +87,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 23
-        version: 0.3.23
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -102,9 +102,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 4
-        version: 0.2.4
+        - 3
+        - 7
+        version: 0.3.7
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ executables:
 - brightbox-cloudips
 - brightbox-config
 - brightbox-images
+- brightbox-lbs
 - brightbox-servers
 - brightbox-types
 - brightbox-users
@@ -149,6 +150,7 @@ files:
 - bin/brightbox-cloudips
 - bin/brightbox-config
 - bin/brightbox-images
+- bin/brightbox-lbs
 - bin/brightbox-servers
 - bin/brightbox-types
 - bin/brightbox-users
@@ -174,6 +176,13 @@ files:
 - lib/bbcloud/commands/images-list.rb
 - lib/bbcloud/commands/images-register.rb
 - lib/bbcloud/commands/images-show.rb
+- lib/bbcloud/commands/lbs-add-nodes.rb
+- lib/bbcloud/commands/lbs-create.rb
+- lib/bbcloud/commands/lbs-destroy.rb
+- lib/bbcloud/commands/lbs-list.rb
+- lib/bbcloud/commands/lbs-remove-nodes.rb
+- lib/bbcloud/commands/lbs-show.rb
+- lib/bbcloud/commands/lbs-update.rb
 - lib/bbcloud/commands/servers-create.rb
 - lib/bbcloud/commands/servers-destroy.rb
 - lib/bbcloud/commands/servers-list.rb
@@ -190,6 +199,7 @@ files:
 - lib/bbcloud/commands/zones-list.rb
 - lib/bbcloud/config.rb
 - lib/bbcloud/images.rb
+- lib/bbcloud/load_balancers.rb
 - lib/bbcloud/servers.rb
 - lib/bbcloud/tables.rb
 - lib/bbcloud/types.rb