bbcloud 0.11.2 → 0.12.0

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

@@ -1,18 +1,20 @@
-desc 'Destroy load balancers'
-arg_name 'lb-id...'
-command [:destroy] do |c|
+module Brightbox
+  desc 'Destroy load balancers'
+  arg_name 'lb-id...'
+  command [:destroy] do |c|
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    raise "You must specify the load balancers to destroy" if args.empty?
+      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 = 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
+      lbs.each do |lb|
+        info "Destroying load balancer #{lb}"
+        lb.destroy
+      end
     end
   end
 end

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

@@ -1,16 +1,18 @@
-desc 'List load balancers'
-arg_name '[lb-id...]'
-command [:list] do |c|
-  c.action do |global_options,options,args|
+module Brightbox
+  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}"
+      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
-    end
 
-    render_table(lbs, global_options)
+      render_table(lbs, global_options)
+    end
   end
 end

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

@@ -1,20 +1,22 @@
-desc 'Remove nodes from a load balancer'
-arg_name 'lb-id node-id...'
-command [:remove_nodes] do |c|
+module Brightbox
+  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|
+    c.action do |global_options, options, args|
 
-    raise "You must specify the load balancer and the node ids to remove" if args.size < 2
+      raise "You must specify the load balancer and the node ids to remove" if args.size < 2
 
-    lb = LoadBalancer.find(args.shift)
+      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) }
+      # 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)
+      info "Removing #{nodes.size} nodes from load balancer #{lb.id}"
+      lb.remove_nodes nodes
+      lb.reload
+      render_table([lb], global_options)
+    end
   end
 end

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

@@ -1,21 +1,23 @@
-desc 'Show detailed load balancer info'
-arg_name 'lbs-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'Show detailed load balancer info'
+  arg_name 'lbs-id...'
+  command [:show] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    raise "You must specify load balancers to show" if args.empty?
+      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
+      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]
-    })
+      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)
+      render_table(lbs, table_opts)
 
+    end
   end
 end

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

@@ -1,85 +1,87 @@
-desc 'Update a load balancer'
-long_desc "All intervals and timeouts are in milliseconds"
-arg_name 'lba-id [node-id...]'
+module Brightbox
+  desc 'Update a load balancer'
+  long_desc "All intervals and timeouts are in milliseconds"
+  arg_name 'lba-id [node-id...]'
 
-command [:update] do |c|
+  command [:update] do |c|
 
-  c.desc "Friendly name of load balancer"
-  c.flag [:n, :name]
+    c.desc "Friendly name of load balancer"
+    c.flag [:n, :name]
 
-  c.desc "Load balancer policy"
-  c.flag [:p, :policy]
+    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 "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 port"
+    c.flag [:k, "hc-port"]
 
-  c.desc "Healthcheck type"
-  c.flag [:y, "hc-type"]
+    c.desc "Healthcheck type"
+    c.flag [:y, "hc-type"]
 
-  c.desc "Healthcheck timeout"
-  c.flag [:t, "hc-timeout"]
+    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 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 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 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.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|
+    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-/
+      lb_id = args.shift
+      raise "You must specify the load balancer to update as the first argument" unless lb_id =~ /^lba-/
 
-    lbopts = {}
+      lbopts = {}
 
-    unless args.empty?
-      lbopts[:nodes] = args.collect { |a| { :node => a } }
-    end
+      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 }
+      hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
+        :request, :e => :interval, :u => :threshold_up, :d =>
+        :threshold_down }
 
-    healthcheck = {}
+      healthcheck = {}
 
-    options.keys.each do |k|
-      if options[k] and hc_arg_lookup[k]
-        healthcheck[hc_arg_lookup[k]] = options[k]
+      options.keys.each do |k|
+        if options[k] and hc_arg_lookup[k]
+          healthcheck[hc_arg_lookup[k]] = options[k]
+        end
       end
-    end
 
-    unless healthcheck.keys.empty?
-      lbopts[:healthcheck] = healthcheck
-    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 }
+      if options[:l]
+        lbopts[:listeners] = options[:l].split(",").collect do |l|
+          inport, output, protocol = l.split ":"
+          { :in => inport, :out => output, :protocol => protocol }
+        end
       end
-    end
 
-    if options[:n]
-      lbopts[:name] = options[:n]
-    end
+      if options[:n]
+        lbopts[:name] = options[:n]
+      end
 
-    if options[:p]
-      lbopts[:policy] = options[:p]
-    end 
+      if options[:p]
+        lbopts[:policy] = options[:p]
+      end 
 
-    lb = LoadBalancer.find lb_id
+      lb = LoadBalancer.find lb_id
 
-    info "Updating load balancer #{lb}"
-    lb = lb.update(lbopts)
-    render_table([lb], global_options)
+      info "Updating load balancer #{lb}"
+      lb = lb.update(lbopts)
+      render_table([lb], global_options)
+    end
   end
 end

data/lib/bbcloud/commands/servers-activate-cloud.rb

@@ -1,23 +1,25 @@
-desc 'Activate the console service for one or more servers'
-arg_name 'server-id...'
-command [:activate_console] do |c|
+module Brightbox
+  desc 'Activate the console service for one or more servers'
+  arg_name 'server-id...'
+  command [:activate_console] do |c|
 
-  c.action do |global_options,options,args|
-    
-    raise "You must specify servers to activate the console for" if args.empty?
+    c.action do |global_options,options,args|
+      
+      raise "You must specify servers to activate the console for" if args.empty?
 
-    servers = Server.find_or_call(args) do |id|
-      raise "Couldn't find server #{id}"
-    end
+      servers = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
 
-    consoles = []
+      consoles = []
 
-    servers.each do |s|
-      info "Activating console for server #{s}"
-      r = s.activate_console
-      consoles << { :url => r["console_url"], :token => r["console_token"], :expires => r["console_token_expires"] }
-    end
+      servers.each do |s|
+        info "Activating console for server #{s}"
+        r = s.activate_console
+        consoles << { :url => r["console_url"], :token => r["console_token"], :expires => r["console_token_expires"] }
+      end
 
-    render_table(consoles, global_options.merge(:fields => [:url, :token, :expires]))
+      render_table(consoles, global_options.merge(:fields => [:url, :token, :expires]))
+    end
   end
 end

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

@@ -1,100 +1,103 @@
-desc 'Create servers'
-arg_name 'image_id'
-command [:create] do |c|
+module Brightbox
+  desc 'Create servers'
+  arg_name 'image_id'
+  command [:create] do |c|
 
-  c.desc "Number of servers to create"
-  c.default_value 1
-  c.flag [:i, "server-count"]
+    c.desc "Number of servers to create"
+    c.default_value 1
+    c.flag [:i, "server-count"]
 
-  c.desc "Zone to create the servers in"
-  c.flag [:z, "zone"]
+    c.desc "Zone to create the servers in"
+    c.flag [:z, "zone"]
 
-  c.desc "Type of server to create"
-  c.default_value "nano"
-  c.flag [:t, :type]
+    c.desc "Type of server to create"
+    c.default_value "nano"
+    c.flag [:t, :type]
 
-  c.desc "Friendly name of server"
-  c.flag [:n, :name]
+    c.desc "Friendly name of server"
+    c.flag [:n, :name]
 
-  c.desc "Specify user data"
-  c.flag [:m, "user-data"]
+    c.desc "Specify user data"
+    c.flag [:m, "user-data"]
 
-  c.desc "Specify the user data from a local file"
-  c.flag [:f, "user-data-file"]
+    c.desc "Specify the user data from a local file"
+    c.flag [:f, "user-data-file"]
 
-  c.desc "Don't base64 encode the user data"
-  c.switch [:e, :no_base64]
+    c.desc "Don't base64 encode the user data"
+    c.switch [:e, :no_base64]
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    if args.empty?
-      raise "You must specify the image_id as the first argument"
-    end
-
-    if options[:i].to_s !~ /^[0-9]+$/
-      raise "server-count must be a number"
-    end
+      if args.empty?
+        raise "You must specify the image_id as the first argument"
+      end
 
-    options[:i] = options[:i].to_i
+      if options[:i].to_s !~ /^[0-9]+$/
+        raise "server-count must be a number"
+      end
 
-    image_id = args.shift
-    image = Image.find image_id
-    
-    type_id = options[:t]
-    if type_id =~ /^typ\-/
-      type = Type.find type_id
-    else
-      type = Type.find_by_handle type_id
-    end
+      options[:i] = options[:i].to_i
 
-    if options[:z]
-      zone = options[:z]
-      if zone =~ /^typ\-/
-        zone = Zone.find zone
+      image_id = args.shift
+      image = Image.find image_id
+      
+      type_id = options[:t]
+      if type_id =~ /^typ\-/
+        type = Type.find type_id
       else
-        zone = Zone.find_by_handle zone
+        type = Type.find_by_handle type_id
       end
-    end
-
-    user_data = options[:m]
-    user_data_file = options[:f]
 
-    if user_data_file
-      raise "Cannot specify user data on command line and in file at same time" if user_data
-      # 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
+      if options[:z]
+        zone = options[:z]
+        if zone =~ /^typ\-/
+          zone = Zone.find zone
+        else
+          zone = Zone.find_by_handle zone
+        end
       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
+
+      user_data = options[:m]
+      user_data_file = options[:f]
+
+      if user_data_file
+        raise "Cannot specify user data on command line and in file at same time" if user_data
+        # 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
-    end
 
-    if user_data
-      unless options[:e]
-        require 'base64'
-        user_data = Base64.encode64(user_data)
+      if user_data
+        unless options[:e]
+          require 'base64'
+          user_data = Base64.encode64(user_data)
+        end
+        raise "User data too big (>16k)" if user_data.size > 16 * 1024
       end
-      raise "User data too big (>16k)" if user_data.size > 16 * 1024
-    end
 
-    msg = "Creating #{options[:i] > 1 ? options[:i] : 'a'} #{type.handle} (#{type.id})"
-    msg << " server#{options[:i] > 1 ? 's' : ''} with image #{image.name.strip} (#{image.id})"
-    msg << " in zone #{zone.handle} (#{zone})" if zone
-    msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
-    info msg
-    servers = []
-    options[:i].times do
-      servers << Server.create(:image_id => image.id,
-                               :flavor_id => type.id,
-                               :zone_id => zone.to_s,
-                               :name => options[:n],
-                               :user_data => user_data)
+      msg = "Creating #{options[:i] > 1 ? options[:i] : 'a'} #{type.handle} (#{type.id})"
+      msg << " server#{options[:i] > 1 ? 's' : ''} with image #{image.name.strip} (#{image.id})"
+      msg << " in zone #{zone.handle} (#{zone})" if zone
+      msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
+      info msg
+
+      servers = Server.create_servers( options[:i], {
+          :image_id => image.id,
+          :flavor_id => type.id,
+          :zone_id => zone.to_s,
+          :name => options[:n],
+          :user_data => user_data
+        }
+      )
+      render_table(servers, global_options)
     end
-    render_table(servers, global_options)
   end
 end