brightbox-cli 0.14.1 → 0.15.0

data/.gitignore

@@ -3,3 +3,10 @@ local
 pkg/
 spec/brightbox/config
 spec/brightbox/cache/
+.bundle/
+.rbenv-version
+.rbx/
+*.patch
+*.html
+*.gem
+

data/bin/brightbox-firewall-policies

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+begin
+  require "brightbox_cli"
+rescue LoadError
+  brightbox_cli_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(brightbox_cli_path)
+  require "brightbox_cli"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
+end

data/bin/brightbox-firewall-rules

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+begin
+  require "brightbox_cli"
+rescue LoadError
+  brightbox_cli_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(brightbox_cli_path)
+  require "brightbox_cli"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
+end

data/bin/brightbox-groups

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+begin
+  require "brightbox_cli"
+rescue LoadError
+  brightbox_cli_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(brightbox_cli_path)
+  require "brightbox_cli"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
+end

data/lib/brightbox-cli/api.rb

@@ -56,6 +56,7 @@ module Brightbox
       options = {
         :order => :created_at,
       }.merge options
+
       objects = nil
       object = nil
       # get the data from the Api
@@ -114,7 +115,7 @@ module Brightbox
     end
 
     def self.cached_get(id)
-      @cache = {} if @cache.nil?
+      @cache ||= {}
       value = @cache[id]
       if value
         value

data/lib/brightbox-cli/cloud_ips.rb

@@ -19,8 +19,8 @@ module Brightbox
 
     def attributes
       a = fog_model.attributes
-      if a["load_balancer"]
-        a[:destination] = a["load_balancer"]["id"]
+      if(lb_id = a[:load_balancer] || a["load_balancer"])
+        a[:destination] = lb_id
       else
         a[:destination] = a[:server_id]
       end

data/lib/brightbox-cli/command_generator.rb

@@ -4,9 +4,12 @@ module Brightbox
       'brightbox-accounts',
       'brightbox-cloudips',
       'brightbox-config',
+      'brightbox-groups',
       'brightbox-images',
       'brightbox-lbs',
       'brightbox-servers',
+      'brightbox-firewall-policies',
+      'brightbox-firewall-rules',
       'brightbox-types',
       'brightbox-users',
       'brightbox-zones'

data/lib/brightbox-cli/commands/cloudips-update.rb

@@ -5,7 +5,7 @@ module Brightbox
     c.desc "Set reverse DNS for this cloud ip"
     c.flag [:r, "reverse-dns"]
 
-    c.desc "Delete the reverse dns for this cloud ip"
+    c.desc "Delete the reverse DNS for this cloud ip"
     c.switch ["delete-reverse-dns"]
 
     c.action do |global_options,options,args|
@@ -13,7 +13,7 @@ module Brightbox
       raise "You must specify the cloud ip id as the first argument" unless cip_id =~ /^cip-/
 
       if options[:r] && options[:r] != "" && options[:"delete-reverse-dns"]
-        raise "You must either specify a reverse dns record or --delete-reverse-dns"
+        raise "You must either specify a reverse DNS record or --delete-reverse-dns"
       end
 
       cip = CloudIP.find cip_id

data/lib/brightbox-cli/commands/config-client-list.rb

@@ -8,7 +8,7 @@ module Brightbox
 
       clients = CONFIG.clients.collect do |cid|
         c = CONFIG[cid]
-        calias = c['alias']
+        calias = c['alias'] || cid
         calias = calias + "*" if CONFIG.client_name == cid and CONFIG.clients.size > 1
         {
           :alias => calias,

data/lib/brightbox-cli/commands/firewall-policies-apply.rb

@@ -0,0 +1,31 @@
+module Brightbox
+  desc 'Apply firewall policy to a server group'
+  arg_name 'firewall-policy-id server-group-id'
+
+  command [:apply] do |c|
+    c.action do |global_options, options,args|
+      if args.size != 2
+        raise "You must specify firewall_policy_id and server_group_id as arguments"
+      end
+
+      firewall_policy_id = args.shift
+      raise "Invalid firewall policy id" unless firewall_policy_id[/^fwp-/]
+      server_group_id = args.shift
+      raise "Invalid Server Group id" unless server_group_id[/^grp-/]
+
+      firewall_policy = FirewallPolicy.find(firewall_policy_id)
+
+      unless firewall_policy
+        raise "Could not find firewall policy with #{firewall_policy_id}"
+      end
+
+
+      server_group = ServerGroup.find(server_group_id)
+      unless server_group
+        raise "Can\'t find group with #{options[:g]}"
+      end
+      firewall_policy.apply_to(server_group.id)
+      render_table([firewall_policy],global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-policies-create.rb

@@ -0,0 +1,39 @@
+module Brightbox
+  desc 'Create Firewall Policy'
+  arg_name '[server-group-id...]'
+  command [:create] do |c|
+    c.desc "Name of firewall policy"
+    c.flag [:n, :name]
+
+    c.desc "Description of firewall policy"
+    c.flag [:d, :description]
+
+    c.action do |global_options, options, args|
+      server_group_id = nil
+      server_group = nil
+
+      unless args.empty?
+        server_group_id = args.shift
+      end
+
+      if server_group_id && !server_group_id.empty?
+        server_group = ServerGroup.find(server_group_id)
+      end
+
+
+      name = options[:n]
+      description = options[:d]
+
+      firewall_options = {
+        :name => name, :description => description
+      }
+
+      if server_group
+        firewall_options.update(:server_group_id => server_group.id)
+      end
+
+      firewall_policy = FirewallPolicy.create(firewall_options)
+      render_table([firewall_policy], global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-policies-destroy.rb

@@ -0,0 +1,24 @@
+module Brightbox
+  desc 'Destroy Firewall Policy'
+  arg_name '[firewall-policy-id...]'
+  command [:destroy] do |c|
+    c.action do |global_options, options, args|
+
+      raise "You must specify firewall-policy-id to destroy" if args.empty?
+
+      firewall_policies = FirewallPolicy.find_or_call(args) do |id|
+        raise "Couldn't find Firewall Policy #{id}"
+      end
+
+      firewall_policies.each do |firewall_policy|
+        info "Destroying firewall policy #{firewall_policy}"
+        begin
+          firewall_policy.destroy
+        rescue Brightbox::Api::Conflict => e
+          error "Could not destroy #{firewall_policy}"
+        end
+      end
+
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-policies-list.rb

@@ -0,0 +1,17 @@
+module Brightbox
+  desc 'List Firewall Policies'
+  arg_name '[firewall-policy-id...]'
+  command [:list] do |c|
+    c.action do |global_options,options,args|
+
+      if args.empty?
+        firewall_policies = FirewallPolicy.find(:all)
+      else
+        firewall_policies = FirewallPolicy.find_or_call(args) do |id|
+          warn "Couldn't find firewall policy #{id}"
+        end
+      end
+      render_table(firewall_policies, global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-policies-remove.rb

@@ -0,0 +1,31 @@
+module Brightbox
+  desc "Disassociate firewall policy from given server group"
+  arg_name 'firewall-policy-id server-group-id'
+
+  command [:remove] do |c|
+    c.action do |global_options, options,args|
+      if args.size != 2
+        raise "You must specify firewall_policy_id and server_group_id as arguments"
+      end
+
+      firewall_policy_id = args.shift
+      raise "Invalid firewall policy id" unless firewall_policy_id[/^fwp-/]
+      server_group_id = args.shift
+      raise "Invalid Server Group id" unless server_group_id[/^grp-/]
+
+      firewall_policy = FirewallPolicy.find(firewall_policy_id)
+
+      unless firewall_policy
+        raise "Could not find firewall policy with #{firewall_policy_id}"
+      end
+
+
+      server_group = ServerGroup.find(server_group_id)
+      unless server_group
+        raise "Can\'t find group with #{options[:g]}"
+      end
+      firewall_policy.remove(server_group.id)
+      render_table([firewall_policy],global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-policies-show.rb

@@ -0,0 +1,19 @@
+module Brightbox
+  desc 'Show Firewall Policy'
+  arg_name 'firewall-policy-id'
+  command [:show] do |c|
+    c.action do |global_options, options, args|
+      raise "You must specify server groups to show" if args.empty?
+
+      policies = FirewallPolicy.find_or_call(args) do |id|
+        raise "Couldn't find Firewall Policy #{id}"
+      end
+
+      table_opts = global_options.update(:vertical => true,
+                                  :fields => [:id, :server_group, :default,:name, :description])
+
+      render_table(policies, table_opts)
+    end
+  end
+end
+

data/lib/brightbox-cli/commands/firewall-rules-create.rb

@@ -0,0 +1,51 @@
+module Brightbox
+  desc 'Create Firewall Rule'
+  arg_name '[firewall-policy-id...]'
+
+  command [:create] do |c|
+    c.desc "Protocol - [tcp/udp/icmp/Protocol numbers]"
+    c.flag [:p, :protocol]
+
+    c.desc "Source - IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
+    c.flag [:s, :source]
+
+    c.desc "Source Port"
+    c.flag [:t, :sport]
+
+    c.desc "Destination. IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
+    c.flag [:d, :destination]
+
+    c.desc "Destination Port"
+    c.flag [:e, :dport]
+
+    c.desc "Icmp Type name"
+    c.flag [:i, :icmptype]
+
+    c.action do |global_options, options, args|
+      if args && args.empty?
+        raise "You must specify the firewall_policy_id as the first argument"
+      end
+
+      firewall_policy_id = args.shift
+      raise "Invalid firewall policy id" unless firewall_policy_id[/^fwp-/]
+
+      firewall_policy = FirewallPolicy.find(firewall_policy_id)
+
+      unless firewall_policy
+        raise "Could not find firewall policy with #{firewall_policy_id}"
+      end
+
+      create_options = {}
+      create_options[:source_port] = options[:t] if options[:t]
+      create_options[:source] = options[:s] if options[:s]
+      create_options[:destination] = options[:d] if options[:d]
+      create_options[:destination_port] = options[:e] if options[:e]
+      create_options[:icmp_type_name] = options[:i] if options[:i]
+      create_options[:protocol] = options[:p]
+
+      create_options[:firewall_policy_id] = firewall_policy.id
+      firewall_rule = FirewallRule.create(create_options)
+      render_table([firewall_rule],global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-rules-destroy.rb

@@ -0,0 +1,24 @@
+module Brightbox
+  desc 'Destroy Firewall Rule'
+  arg_name '[firewall-rule-id...]'
+  command [:destroy] do |c|
+    c.action do |global_options, options, args|
+
+      raise "You must specify firewall-rule-id to destroy" if args.empty?
+
+      firewall_rules = FirewallRule.find_or_call(args) do |id|
+        raise "Couldn't find Firewall Rule #{id}"
+      end
+
+      firewall_rules.each do |firewall_rule|
+        info "Destroying firewall rule #{firewall_rule}"
+        begin
+          firewall_rule.destroy
+        rescue Brightbox::Api::Conflict => e
+          error "Could not destroy #{firewall_rule}"
+        end
+      end
+
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-rules-list.rb

@@ -0,0 +1,19 @@
+module Brightbox
+  desc 'List Firewall Rules'
+  arg_name '[firewall-policy-id...]'
+  command [:list] do |c|
+    c.action do |global_options,options,args|
+      if args.empty?
+        raise "You must specify the firewall policy id as the first argument"
+      end
+
+      firewall_policy_id = args.shift
+      raise "Invalid firewall policy id" unless firewall_policy_id =~ /^fwp-/
+
+      firewall_policy = FirewallPolicy.find_or_call([firewall_policy_id]) do |id|
+        raise "Couldn't find firewall policy #{id}"
+      end
+      render_table(FirewallRules.from_policy(firewall_policy.first), global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/firewall-rules-show.rb

@@ -0,0 +1,22 @@
+module Brightbox
+  desc 'Show Firewall Rule'
+  arg_name 'firewall-rule-id'
+  command [:show] do |c|
+    c.action do |global_options, options, args|
+      raise "You must specify server groups to show" if args.empty?
+
+      policies = FirewallRule.find_or_call(args) do |id|
+        raise "Couldn't find Firewall Rule #{id}"
+      end
+
+      display_options = { :fields => [
+          :id, :protocol,:source, :sport,:destination, :dport, :icmp_type, :firewall_policy
+        ],
+        :vertical => true
+      }
+      table_opts = global_options.update(display_options)
+      render_table(policies, table_opts)
+    end
+  end
+end
+

data/lib/brightbox-cli/commands/groups-add-server.rb

@@ -0,0 +1,23 @@
+module Brightbox
+  desc 'Add servers to a server group'
+  arg_name 'grp-id [srv-id...]'
+  command [:add_servers] do |c|
+
+    c.action do |global_options, options, args|
+      grp_id = args.shift
+      raise "You must specify the server group and the server ids to add" unless grp_id && grp_id[/^grp-/] && !args.empty?
+
+      sg = ServerGroup.find grp_id
+
+      servers = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
+
+      info "Adding #{servers.size} servers to server group #{sg}"
+      sg.add_servers servers
+      sg.reload
+      render_table([sg], global_options)
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/groups-create.rb

@@ -0,0 +1,22 @@
+module Brightbox
+  desc 'Create a server group'
+  command [:create] do |c|
+    c.desc "Name of Server Group"
+    c.flag [:n, :name]
+
+    c.desc "Server group description"
+    c.flag [:d, :description]
+
+    c.action do |global_options, options, args|
+      params = {}
+
+      params[:name] = options[:n] if options[:n]
+      params[:description] = options[:d] if options[:d]
+
+      info "Creating a new server group"
+      sg = ServerGroup.create(params)
+      render_table([sg], global_options)
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/groups-destroy.rb

@@ -0,0 +1,23 @@
+module Brightbox
+  desc 'Destroy server groups'
+  arg_name 'grp-id...'
+
+  # todo: add option to remove all servers from group before destroying
+
+  command [:destroy] do |c|
+
+    c.action do |global_options, options, args|
+      raise "You must specify the server groups to destroy" if args.empty?
+
+      sgs = ServerGroup.find_or_call(args) do |id|
+        raise "Couldn't find server group #{id}"
+      end
+
+      sgs.each do |sg|
+        info "Destroying server group #{sg}"
+        sg.destroy
+      end
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/groups-list.rb

@@ -0,0 +1,16 @@
+module Brightbox
+  desc 'List server groups'
+  command [:list] do |c|
+    c.action do |global_options,options,args|
+
+      if args.empty?
+        server_groups = ServerGroup.find(:all)
+      else
+        server_groups = ServerGroup.find_or_call(args) do |id|
+          warn "Couldn't find server group #{id}"
+        end
+      end
+      render_table(server_groups, global_options)
+    end
+  end
+end

data/lib/brightbox-cli/commands/groups-move_servers.rb

@@ -0,0 +1,39 @@
+module Brightbox
+  desc 'Move servers from one server group to another'
+  arg_name 'srv-id ...'
+  command [:move_servers] do |c|
+    c.desc "Source Server Group"
+    c.flag [:f, :from]
+
+    c.desc "Target Server Group"
+    c.flag [:t, :to]
+
+
+    c.action do |global_options, options, args|
+      unless args && !args.empty?
+        raise "You must specify server ids to move"
+      end
+
+      source_id = options[:f]
+      destination_id = options[:t]
+
+      unless source_id && source_id[/^grp-/] && destination_id && destination_id[/^grp-/]
+        raise "You must specify the source server group and destination server group"
+      end
+
+      source_group = ServerGroup.find source_id
+      destination_group = ServerGroup.find destination_id
+
+      servers = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
+
+      info "Moving #{servers.size} servers from server group #{source_group} to server group #{destination_group}"
+      source_group.move_servers servers, destination_group
+      source_group.reload
+      destination_group.reload
+      render_table([source_group, destination_group], global_options)
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/groups-remove-servers.rb

@@ -0,0 +1,35 @@
+module Brightbox
+  desc 'Remove servers from a server group'
+  arg_name 'grp-id [srv-id...]'
+  command [:remove_servers] do |c|
+
+    c.desc "Remove all servers from group"
+    c.switch [:a, :all]
+
+    c.action do |global_options, options, args|
+      grp_id = args.shift
+      raise "You must specify the server group and the server ids to remove" unless grp_id && grp_id[/^grp-/] && (!args.empty? || options[:a])
+
+      sg = ServerGroup.find grp_id
+
+      servers = if options[:a]
+        sg.server_ids
+      else
+        Server.find_or_call(args) do |id|
+          raise "Couldn't find server #{id}"
+        end
+      end
+
+      if servers.empty?
+        info "Server group #{sg} already contains zero servers"
+      else
+        info "Removing#{" all" if options[:a]} #{servers.size} servers from server group #{sg}"
+        sg.remove_servers servers
+      end
+
+      sg.reload
+      render_table([sg], global_options)
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/groups-show.rb

@@ -0,0 +1,14 @@
+module Brightbox
+  desc 'Show detailed server group info'
+  arg_name '[grp-id..]'
+  command [:show] do |c|
+    c.action do |global_options, options, args|
+      raise "You must specify server groups to show" if args.empty?
+
+      sgs = DetailedServerGroup.find_or_call(args) do |id|
+        raise "Couldn't find server group #{id}"
+      end
+      render_table(sgs, :vertical => true)
+    end
+  end
+end

data/lib/brightbox-cli/commands/groups-update.rb

@@ -0,0 +1,38 @@
+module Brightbox
+  desc 'Update a server group'
+  arg_name 'grp-id'
+  # arg_name 'grp-id [srv-ids...]'
+  command [:update] do |c|
+
+    c.desc "Friendly name of server group"
+    c.flag [:n, :name]
+
+    c.desc "Server group description"
+    c.flag [:d, :description]
+
+    c.action do |global_options, options, args|
+      grp_id = args.shift
+      raise "You must specify the server group to update as the first argument" unless grp_id =~ /^grp-/
+
+      params = {}
+
+      # unless args.empty?
+      #   params[:servers] = args.collect { |a| { :server => a } }
+      # end
+
+      if options[:n]
+        params[:name] = options[:n]
+      end
+
+      if options[:d]
+        params[:description] = options[:d]
+      end
+
+      sg = ServerGroup.find grp_id
+      info "Updating server group #{sg}"
+      sg = sg.update(params)
+      render_table([sg], global_options)
+    end
+
+  end
+end

data/lib/brightbox-cli/commands/images-register.rb

@@ -5,6 +5,9 @@ module Brightbox
     c.desc "Name to give the image"
     c.flag [:n, "name"]
 
+    c.desc "Image Username"
+    c.flag [:u, "username"]
+
     c.desc "Archtecture of the image (i686 or x86_64)"
     c.flag [:a, "arch"]
 
@@ -41,9 +44,14 @@ module Brightbox
         public_flag = false
       end
 
-      image = Image.register :name => options[:n], :arch => options[:a],
-      :source => options[:s], :compatibility_mode => compatibility_flag,
-      :description => options[:d], :public => public_flag
+      image_options = {
+        :name => options[:n], :arch => options[:a],
+        :username => options[:u], :source => options[:s],
+        :compatibility_mode => compatibility_flag,
+        :description => options[:d], :public => public_flag
+      }
+
+      image = Image.register(image_options)
 
       render_table([image])