brightbox-cli 0.17.5 → 0.18.0

data/brightbox-cli.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
   s.add_dependency('hirb','~> 0.6.0')
 
   s.add_development_dependency('rake', '~> 0.8.0')
-  s.add_development_dependency('vcr')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('vcr', '~> 1.11.3')
+  s.add_development_dependency('rspec', '~> 2.8.0')
   s.add_development_dependency('mocha')
 end
 

data/lib/brightbox-cli/cloud_ips.rb

@@ -8,15 +8,33 @@ module Brightbox
       conn.cloud_ips
     end
 
-    def self.create
-      r = conn.create_cloud_ip
+    def self.create(options = {})
+      create_options = {}
+      if options[:t]
+        create_options[:port_translators] = format_translators_for_api(options[:t])
+      end
+
+      if options[:n] && !options[:name].empty?
+        create_options[:name] = options[:n]
+      end
+      r = conn.create_cloud_ip(create_options)
       new(r["id"])
     end
 
+    def self.format_translators_for_api(translators)
+      translators.split(",").map do |t|
+        incoming,outgoing,protocol = t.split(":")
+        raise "translator #{t} is invalid" if incoming.nil? || outgoing.nil? || protocol.nil?
+        {:incoming => incoming, :outgoing => outgoing, :protocol => protocol}
+      end
+    end
+
     def attributes
       a = fog_model.attributes
       if(lb_id = a[:load_balancer] || a["load_balancer"])
         a[:destination] = lb_id
+      elsif(server_group_id = a[:server_group] || a["server_group"])
+        a[:destination] = server_group
       else
         a[:destination] = a[:server_id]
       end
@@ -24,15 +42,25 @@ module Brightbox
     end
 
     def to_row
-      attributes
+      o = attributes
+      o[:port_translators] = translators(o)
+      o
     end
 
     def mapped?
       status == 'mapped'
     end
 
+    def translators(raw_attributes)
+      if translators = (raw_attributes[:port_translators] || raw_attributes['port_translators'])
+        translators.map {|t| [t['incoming'],t['outgoing'],t['protocol']].join(":") }
+      else
+        nil
+      end
+    end
+
     def self.default_field_order
-      [:id, :status, :public_ip, :destination, :reverse_dns]
+      [:id, :status, :public_ip, :destination, :reverse_dns, :name]
     end
 
     def <=>(b)
@@ -40,7 +68,24 @@ module Brightbox
     end
 
     def update(options)
-      self.class.conn.update_cloud_ip(id, options)
+      params = {}
+      if options[:r]
+        params[:reverse_dns] = options[:r]
+      end
+
+      if options[:"delete-reverse-dns"]
+        params[:reverse_dns] = ""
+      end
+
+      if options[:n] && !options[:name].empty?
+        params[:name] = options[:n]
+      end
+
+      if options[:t]
+        params[:port_translators] = CloudIP.format_translators_for_api(options[:t])
+      end
+
+      self.class.conn.update_cloud_ip(id, params)
       self.reload
       self
     end

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

@@ -1,10 +1,16 @@
 module Brightbox
-  desc 'Create a new cloud ip'
+  desc 'Create a new Cloud IP address'
   command [:create] do |c|
-    c.desc "Number of cloud ips to create"
+    c.desc "Number of Cloud IPs to create"
     c.default_value 1
     c.flag [:i, "count"]
 
+    c.desc "Friendly name of the Cloud IP"
+    c.flag [:n, :name]
+
+    c.desc "Cloud IP translators. Format: in-port:out-port:protocol. Comma separate multiple translators. Protocol can be tcp or udp."
+    c.flag [:t, :'port-translators']
+
     c.action do |global_options, options, args|
 
       if options[:i].to_s !~ /^[0-9]+$/
@@ -15,7 +21,7 @@ module Brightbox
 
       ips = []
       options[:i].times do
-        ips << CloudIP.create
+        ips << CloudIP.create(options)
       end
       render_table(ips, global_options)
     end

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

@@ -2,24 +2,24 @@ module Brightbox
   desc 'destroy Cloud IPs'
   arg_name '[cloudip-id...]'
   command [:destroy] do |c|
-    c.desc "Unmap mapped ips before destroying them"
+    c.desc "Unmap mapped IPs before destroying them"
     c.switch [:u, "unmap"]
 
     c.action do |global_options,options,args|
 
       if args.empty?
-        raise "You must specify the cloud ips you want to destroy"
+        raise "You must specify the Cloud IPs you want to destroy"
       end
 
       ips = CloudIP.find_or_call(args) do |id|
-        raise "Couldn't find cloud ip #{id}"
+        raise "Couldn't find Cloud IP #{id}"
       end
 
       ips.each do |ip|
 
         if ip.mapped?
           if options[:u]
-            info "Unmapping cloud ip #{ip}"
+            info "Unmapping Cloud IP #{ip}"
             ip.unmap
             3.times do
               break unless ip.mapped?
@@ -27,10 +27,10 @@ module Brightbox
               ip.reload
             end
           else
-            raise "Cannot destroy mapped cloud ip #{ip}"
+            raise "Cannot destroy mapped Cloud IP #{ip}"
           end
         end
-        info "Destroying cloud ip #{ip}"
+        info "Destroying Cloud IP #{ip}"
         ip.destroy
       end
 

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

@@ -1,5 +1,5 @@
 module Brightbox
-  desc 'List CloudIPs'
+  desc 'List Cloud IPs'
   arg_name '[cloudip-id...]'
   command [:list] do |c|
 
@@ -9,7 +9,7 @@ module Brightbox
         ips = CloudIP.find(:all)
       else
         ips = CloudIP.find_or_call(args) do |id|
-          warn "Couldn't find cloud ip #{id}"
+          warn "Couldn't find Cloud IP #{id}"
         end
       end
 

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

@@ -2,7 +2,7 @@ module Brightbox
   desc 'map Cloud IPs'
   arg_name 'cloudip-id destination'
   command [:map] do |c|
-    c.desc "Unmap mapped ips before remapping them"
+    c.desc "Unmap mapped IPs before remapping them"
     c.switch [:u, "unmap"]
 
     c.action do |global_options,options,args|
@@ -28,6 +28,9 @@ module Brightbox
       when /^lba\-/
         lb = LoadBalancer.find destination_id
         info "Mapping #{ip} to load balancer #{lb}"
+      when /grp\-/
+        group = ServerGroup.find destination_id
+        info "Mapping #{ip} to server group #{group}"
       else
         raise "Unknown destination '#{destination_id}'"
       end
@@ -41,7 +44,7 @@ module Brightbox
             ip.reload
           end
         else
-          raise "Refusing to map already mapped ip #{ip}"
+          raise "Refusing to map already mapped IP #{ip}"
         end
       end
 

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

@@ -10,10 +10,10 @@ module Brightbox
       end
 
       ips = CloudIP.find_or_call(args) do |id|
-        warn "Couldn't find cloud ip #{id}"
+        warn "Couldn't find Cloud IP #{id}"
       end
 
-      fields = [:id, :status, :public_ip, :reverse_dns, :destination, :interface_id]
+      fields = [:id, :name, :reverse_dns, :status, :public_ip, :reverse_dns, :destination, :interface_id, :port_translators]
 
       render_table(ips.compact, global_options.merge({ :vertical => true, :fields => fields}))
     end

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

@@ -6,20 +6,20 @@ module Brightbox
     c.action do |global_options,options,args|
 
       if args.empty?
-        raise "You must specify the cloud ips you want to unmap"
+        raise "You must specify the Cloud IPs you want to unmap"
       end
 
       ips = CloudIP.find_or_call(args) do |id|
-        raise "Couldn't find cloud ip #{id}"
+        raise "Couldn't find Cloud IP #{id}"
       end
 
       ips.each do |ip|
         if ip.mapped?
-          info "Unmapping cloud ip #{ip}"
+          info "Unmapping Cloud IP #{ip}"
           ip.unmap
           ip.reload
         else
-          warn "Cloud ip #{ip} already unmapped"
+          warn "Cloud IP #{ip} already unmapped"
         end
       end
 

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

@@ -2,15 +2,21 @@ module Brightbox
   desc 'update Cloud IPs'
   arg_name 'cloudip-id'
   command [:update] do |c|
-    c.desc "Set reverse DNS for this cloud ip"
+    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.desc "Friendly name of the Cloud IP"
+    c.flag [:n, :name]
+
+    c.desc "Cloud IP translators. Format: in-port:out-port:protocol. Comma separate multiple translators. Protocol can be tcp or udp."
+    c.flag [:t, :'port-translators']
+
     c.action do |global_options,options,args|
       cip_id = args.shift
-      raise "You must specify the cloud ip id as the first argument" unless cip_id =~ /^cip-/
+      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"
@@ -18,16 +24,8 @@ module Brightbox
 
       cip = CloudIP.find cip_id
 
-      params = {}
-      if options[:r]
-        params[:reverse_dns] = options[:r]
-      end
-
-      if options[:"delete-reverse-dns"]
-        params[:reverse_dns] = ""
-      end
 
-      cip.update(params)
+      cip.update(options)
       cip.reload
 
       render_table([cip], global_options)

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

@@ -5,8 +5,17 @@ module Brightbox
     c.desc "Show all public images from all accounts"
     c.switch [:a, "show-all"]
 
+    c.desc "Show only images of a given type"
+    c.flag [:t, :type]
+
+    c.desc "Show only images of a given status"
+    c.flag [:s, :status]
+
+    c.desc "Show only images for a given account identifier"
+    c.flag [:l, :account]
+
     c.action do |global_options, options, args|
-      
+
       if args.empty?
         images = Image.find(:all)
       else
@@ -15,20 +24,8 @@ module Brightbox
         end
       end
 
-      snapshots = images.select { |i| i.source_type == 'snapshot' }
-
-      images = images - snapshots
-
-      unless options[:a]
-        account = Account.conn_account
-        images.reject! { |i| !i.official and i.owner_id != account.id  }
-      end
-
-      images.sort! { |a, b| a.default_sort_fields <=> b.default_sort_fields }
-
-      snapshots.sort! { |a, b| a.created_at <=> b.created_at }
-
-      render_table(images + snapshots, global_options)
+      images = Image.filter_images(images, options)
+      render_table(images, global_options)
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Brightbox
     c.default_value "least-connections"
     c.flag [:p, :policy]
 
-    c.desc "Listeners. Format: in-port:out-port:type:timeout. Comma separate multiple listeners. Protocols can be tcp, http or http+ws and timeouts are in milliseconds."
+    c.desc "Listeners. Format: in-port:out-port:type:timeout. Comma separated multiple listeners. Protocols can be tcp, http or http+ws and timeouts are in milliseconds."
     c.default_value "80:80:http:50000,443:443:tcp:50000"
     c.flag [:l, :listeners]
 

data/lib/brightbox-cli/commands/servers-activate-console.rb

@@ -17,7 +17,8 @@ module Brightbox
         info "Activating console for server #{s}"
         r = s.activate_console
         url = "#{r["console_url"]}/?password=#{r["console_token"]}"
-        consoles << { :url => url, :token => r["console_token"], :expires => r["console_token_expires"] }
+        expires = Time.parse(r["console_token_expires"])
+        consoles << { :url => url, :token => r["console_token"], :expires => expires.localtime.to_s }
       end
 
       render_table(consoles, global_options.merge(:fields => [:url, :token, :expires], :resize => false))

data/lib/brightbox-cli/images.rb

@@ -18,30 +18,72 @@ module Brightbox
       [:id, :owner, :type, :created_on, :status, :size, :name]
     end
 
+    # Filter out images that are not of the right type, account or status if the option is passed
+    def self.filter_images(images, options={})
+      # Remove images that don't match the given type
+      if options[:t]
+        images.reject! { |i| i.type != options[:t] }
+      end
+
+      # Remove statuses that don't match the argument
+      if options[:s]
+        images.reject! { |i| i.status != options[:s] }
+      end
+
+      # Remove images that don't belong to the specified owner id
+      if options[:l]
+        if options[:l] == 'brightbox'
+          images.reject! { |i| !i.official }
+        else
+          images.reject! { |i| i.owner_id != options[:l] }
+        end
+      end
+
+      snapshots = images.select { |i| i.source_type == 'snapshot' }
+      images = images - snapshots
+
+      unless options[:a]
+        account = Account.conn_account
+        images.reject! { |i| !i.official and i.owner_id != account.id  }
+      end
+
+      images.sort! { |a, b| a.default_sort_fields <=> b.default_sort_fields }
+      snapshots.sort! { |a, b| a.created_at <=> b.created_at }
+      images + snapshots
+    end
+
     def update options
       self.class.conn.update_image(id, options)
       self.reload
       self
     end
 
+    def type
+      if official
+        "official"
+      else
+        source_type
+      end
+    end
+
+    def status
+      if fog_model.attributes[:status] == "available"
+        public ? 'public' : 'private'
+      else
+        fog_model.attributes[:status]
+      end
+    end
+
     def to_row
       o = fog_model.attributes
       o[:id] = fog_model.id
-      if status == "available"
-        o[:status] = (public ? 'public' : 'private')
-      else
-        o[:status] = status
-      end
+      o[:status] = status
       o[:username] = username
       o[:arch] = arch
       o[:name] = name.to_s + " (#{arch})"
       o[:owner] = owner_id
-      if official
-        o[:type] = "official"
-        o[:owner] = "brightbox"
-      else
-        o[:type] = source_type
-      end
+      o[:owner] = "brightbox" if official
+      o[:type] = type
       o[:created_at] = created_at
       o[:created_on] = created_at.to_s.split('T').first
       o[:description] = description if description

data/lib/brightbox-cli/ruby_core_ext.rb

@@ -1,6 +1,6 @@
 class Time
   def rfc8601
-    self.strftime("%Y-%m-%dT%H:%M")
+    self.strftime(self.utc? ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M")
   end
 
   def to_s

data/lib/brightbox-cli/vendor/fog/lib/fog/brightbox/compute.rb

@@ -183,6 +183,7 @@ module Fog
           @connection.request(options)
         end
       end
+
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/brightbox/models/compute/cloud_ip.rb

@@ -22,6 +22,9 @@ module Fog
         attribute :interface_id, :aliases => "interface", :squash => "id"
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
+        attribute :server_group, :alias => "server_group", :squash => "id"
+        attribute :port_translators
+        attribute :name
 
         def map(destination)
           requires :identity

data/lib/brightbox-cli/vendor/fog/lib/fog/brightbox/requests/compute/create_cloud_ip.rb

@@ -3,11 +3,11 @@ module Fog
     class Brightbox
       class Real
 
-        def create_cloud_ip
-          request("post", "/1.0/cloud_ips", [201])
+        def create_cloud_ip(options = nil)
+          request("post", "/1.0/cloud_ips", [201],options)
         end
 
       end
     end
   end
-end
+end

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/helper.rb

@@ -76,6 +76,11 @@ class Brightbox
           "threshold_up"    => Integer,
           "threshold_down"  => Integer
         }
+        PORT_TRANSLATOR = {
+          "incoming"        => Integer,
+          "outgoing"        => Integer,
+          "protocol"        => String
+        }
       end
 
       module Nested
@@ -102,6 +107,7 @@ class Brightbox
           "url"             => String,
           "public_ip"       => String,
           "status"          => String,
+          "name"            => Fog::Nullable::String,
           "reverse_dns"     => String
         }
 
@@ -232,9 +238,11 @@ class Brightbox
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String,
+          "name"            => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "interface"       => Fog::Brightbox::Nullable::Interface,
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::PORT_TRANSLATOR],
           "server"          => Fog::Brightbox::Nullable::Server
         }
 
@@ -428,9 +436,11 @@ class Brightbox
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String,
+          "name"            => Fog::Nullable::String,
           "account"         => Fog::Brightbox::Nullable::Account,
           "interface"       => Fog::Brightbox::Nullable::Interface,
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::PORT_TRANSLATOR],
           "server"          => Fog::Brightbox::Nullable::Server
         }
 

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "0.17.5" unless defined?(Brightbox::VERSION)
+  VERSION = "0.18.0" unless defined?(Brightbox::VERSION)
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-cli
 version: !ruby/object:Gem::Version 
-  hash: 81
   prerelease: false
   segments: 
   - 0
-  - 17
-  - 5
-  version: 0.17.5
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - John Leach
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 +00:00
+date: 2012-04-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 5
@@ -38,11 +35,9 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,11 +47,9 @@ dependencies:
   name: excon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -68,11 +61,9 @@ dependencies:
   name: formatador
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
@@ -84,11 +75,9 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,11 +87,9 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 2
         - 1
@@ -114,11 +101,9 @@ dependencies:
   name: net-scp
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -130,11 +115,9 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -146,11 +129,9 @@ dependencies:
   name: ruby-hmac
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -160,11 +141,9 @@ dependencies:
   name: hirb
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -176,11 +155,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 8
@@ -192,39 +169,37 @@ dependencies:
   name: vcr
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 11
+        - 3
+        version: 1.11.3
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
+        - 8
         - 0
-        version: "0"
+        version: 2.8.0
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -2651,27 +2626,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: brightbox-cli
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The Brightbox cloud management system