bbcloud 0.10.1 → 0.11.0

data/bbcloud.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
 
 	s.add_dependency 'gli', '1.2.5'
 	s.add_dependency 'hirb', '0.3.5'
-	s.add_dependency 'fog', '=0.4.0'
-	s.add_dependency 'excon', '>=0.3.7'
+#	s.add_dependency 'fog', '=0.7.0'
+	s.add_dependency 'excon', '>=0.5.6'
 	s.add_dependency 'ini', '0.1.1'
 
 end

data/lib/bbcloud/api.rb

@@ -14,7 +14,7 @@ module Brightbox
       if @@api
         @@api
       else
-        @@api = Fog::Brightbox::Compute.new CONFIG.to_fog
+        @@api = Fog::Compute.new CONFIG.to_fog
         @@api.oauth_token = CONFIG.oauth_token
         @@api
       end

data/lib/bbcloud/cli.rb

@@ -1,15 +1,17 @@
 os_config = File.join(File.dirname(__FILE__), 'os_config.rb')
 require os_config if File.exist? os_config
 
+vendor_dir = File.join(File.dirname(__FILE__), 'vendor/')
+
 unless defined?(DISABLE_RUBYGEMS)
   require "rubygems" 
 	gem "json", "=1.4.6"
 	gem "json_pure", "=1.4.6"
-  gem "fog", "=0.4.0"
+  gem "fog", "=0.4.0" unless File.exist? vendor_dir + 'fog'
 end
 
 # Add any vendored libraries into search path
-Dir.glob(File.join(File.dirname(__FILE__), 'vendor/*')).each do |f|
+Dir.glob(vendor_dir + '*').each do |f|
   $:.unshift File.join(f, 'lib')
 end
 
@@ -98,6 +100,9 @@ switch [:s, :simple]
 desc "Set the api client to use (named in #{CONFIG.config_filename})"
 flag [:c, :client]
 
+desc "Disable peer SSL certificate verification"
+switch [:k, :insecure]
+
 # Load the command libraries for the current group
 cmd_group_name = File.basename($0).gsub(/brightbox\-/,'')
 cmd_group_files = File.join(File.dirname(__FILE__), "commands/#{cmd_group_name}*.rb")
@@ -107,6 +112,7 @@ end
 
 pre do |global_options,command,options,args|
   CONFIG.client_name = global_options[:c] if global_options[:c]
+  Excon.ssl_verify_peer = false if global_options[:k]
   info "INFO: client_id: #{CONFIG.client_name}" if CONFIG.clients.size > 1
   true
 end

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

@@ -0,0 +1,23 @@
+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?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
+
+    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
+
+    render_table(consoles, global_options.merge(:fields => [:url, :token, :expires]))
+  end
+end

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

@@ -11,6 +11,6 @@ command [:list] do |c|
       end
     end
 
-    render_table(types, global_options)
+    render_table(types.sort, global_options)
   end
 end

data/lib/bbcloud/config.rb

@@ -104,6 +104,7 @@ class BBConfig
       end
     end
     { 
+      :provider => 'Brightbox',
       :brightbox_api_url => c['api_url'],
       :brightbox_auth_url => c['auth_url'] || c['api_url'],
       :brightbox_client_id => c['client_id'],

data/lib/bbcloud/servers.rb

@@ -42,6 +42,10 @@ module Brightbox
       raise Conflict, "Cannot delete server #{id}"
     end
 
+    def activate_console
+      self.class.conn.activate_console_server id
+    end
+
     def self.get(id)
       conn.servers.get id
     end

data/lib/bbcloud/types.rb

@@ -35,5 +35,13 @@ module Brightbox
     def self.default_field_order
       [:id, :name, :handle, :ram, :disk, :cores, :description]
     end
+
+    def <=>(b)
+      if b.is_a? Type
+        self.ram <=> b.ram
+      else
+        self.ram <=> b
+      end
+    end
   end
 end

data/lib/bbcloud/vendor/fog/lib/fog/compute/brightbox.rb

@@ -0,0 +1,162 @@
+module Fog
+  module Brightbox
+    class Compute < Fog::Service
+
+      API_URL = "https://api.gb1.brightbox.com/"
+
+      requires :brightbox_client_id, :brightbox_secret
+      recognizes :brightbox_auth_url, :brightbox_api_url
+      recognizes :provider # remove post deprecation
+
+      model_path 'fog/compute/models/brightbox'
+      model       :account # Singular resource, no collection
+      collection  :servers
+      model       :server
+      collection  :flavors
+      model       :flavor
+      collection  :images
+      model       :image
+      collection  :load_balancers
+      model       :load_balancer
+      collection  :zones
+      model       :zone
+      collection  :cloud_ips
+      model       :cloud_ip
+      collection  :users
+      model       :user
+
+      request_path 'fog/compute/requests/brightbox'
+      request :activate_console_server
+      request :add_listeners_load_balancer
+      request :add_nodes_load_balancer
+      request :create_api_client
+      request :create_cloud_ip
+      request :create_image
+      request :create_load_balancer
+      request :create_server
+      request :destroy_api_client
+      request :destroy_cloud_ip
+      request :destroy_image
+      request :destroy_load_balancer
+      request :destroy_server
+      request :get_account
+      request :get_api_client
+      request :get_cloud_ip
+      request :get_image
+      request :get_interface
+      request :get_load_balancer
+      request :get_server
+      request :get_server_type
+      request :get_user
+      request :get_zone
+      request :list_api_clients
+      request :list_cloud_ips
+      request :list_images
+      request :list_load_balancers
+      request :list_server_types
+      request :list_servers
+      request :list_users
+      request :list_zones
+      request :map_cloud_ip
+      request :remove_listeners_load_balancer
+      request :remove_nodes_load_balancer
+      request :reset_ftp_password_account
+      request :resize_server
+      request :shutdown_server
+      request :snapshot_server
+      request :start_server
+      request :stop_server
+      request :unmap_cloud_ip
+      request :update_account
+      request :update_api_client
+      request :update_image
+      request :update_load_balancer
+      request :update_server
+      request :update_user
+
+      class Mock
+
+        def initialize(options)
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
+          @brightbox_client_id = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
+          @brightbox_secret = options[:brightbox_secret] || Fog.credentials[:brightbox_secret]
+        end
+
+        def request(options)
+          raise "Not implemented"
+        end
+      end
+
+      class Real
+
+        def initialize(options)
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
+          require "json"
+          # Currently authentication and api endpoints are the same but may change
+          @auth_url = options[:brightbox_auth_url] || Fog.credentials[:brightbox_auth_url] || API_URL
+          @api_url = options[:brightbox_api_url] || Fog.credentials[:brightbox_api_url] || API_URL
+          @brightbox_client_id = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
+          @brightbox_secret = options[:brightbox_secret] || Fog.credentials[:brightbox_secret]
+          @connection = Fog::Connection.new(@api_url)
+        end
+
+        def request(params)
+          begin
+            get_oauth_token if @oauth_token.nil?
+            response = authenticated_request(params)
+          rescue Excon::Errors::Unauthorized => e
+            get_oauth_token
+            response = authenticated_request(params)
+          end
+          unless response.body.empty?
+            response = JSON.parse(response.body)
+          end
+        end
+
+        def account
+          Fog::Brightbox::Compute::Account.new(get_account)
+        end
+
+      private
+        def get_oauth_token(options = {})
+          auth_url = options[:brightbox_auth_url] || @auth_url
+
+          connection = Fog::Connection.new(auth_url)
+          @authentication_body = {'client_id' => @brightbox_client_id, 'grant_type' => 'none'}.to_json
+
+          response = connection.request({
+            :path => "/token",
+            :expects  => 200,
+            :headers  => {
+              'Authorization' => "Basic " + Base64.encode64("#{@brightbox_client_id}:#{@brightbox_secret}").chomp,
+              'Content-Type' => 'application/json'
+            },
+            :method   => 'POST',
+            :body     => @authentication_body
+          })
+          @oauth_token = JSON.parse(response.body)["access_token"]
+          return @oauth_token
+        end
+
+        def authenticated_request(options)
+          headers = options[:headers] || {}
+          headers.merge!("Authorization" => "OAuth #{@oauth_token}")
+          options[:headers] = headers
+          @connection.request(options)
+        end
+      end
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/account.rb

@@ -0,0 +1,51 @@
+require 'fog/core/model'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class Account < Fog::Model
+
+        identity :id
+        attribute :resource_type
+        attribute :url
+        attribute :name
+        attribute :status
+        attribute :address_1
+        attribute :address_2
+        attribute :city
+        attribute :county
+        attribute :postcode
+        attribute :country_code
+        attribute :country_name
+        attribute :vat_registration_number
+        attribute :telephone_number
+        attribute :telephone_verified
+        attribute :ram_limit
+        attribute :ram_used
+        attribute :limits_cloudips
+        attribute :library_ftp_host
+        attribute :library_ftp_user
+        # This is always returned as null/nil unless performing a reset_ftp_password request
+        attribute :library_ftp_password
+        attribute :created_at, :type => :time
+
+
+
+        attribute :owner_id, :aliases => "owner", :squash => "id"
+        attribute :clients
+        attribute :images
+        attribute :servers
+        attribute :users
+        attribute :zones
+
+        def reset_ftp_password
+          requires :identity
+          connection.reset_ftp_password_account(identity)["library_ftp_password"]
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/cloud_ip.rb

@@ -0,0 +1,47 @@
+require 'fog/core/model'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class CloudIp < Fog::Model
+
+        identity :id
+
+        attribute :url
+        attribute :name
+        attribute :status
+        attribute :resource_type
+        attribute :description
+
+        attribute :reverse_dns
+        attribute :public_ip
+
+        attribute :account_id, :aliases => "account", :squash => "id"
+        attribute :interface_id, :aliases => "interface", :squash => "id"
+        attribute :server_id, :aliases => "server", :squash => "id"
+
+        def map(interface_to_map)
+          requires :identity
+          connection.map_cloud_ip(identity, :interface => interface_to_map)
+        end
+
+        def mapped?
+          status == "mapped"
+        end
+
+        def unmap
+          requires :identity
+          connection.unmap_cloud_ip(identity)
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_cloud_ip(identity)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/cloud_ips.rb

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/compute/models/brightbox/cloud_ip'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class CloudIps < Fog::Collection
+
+        model Fog::Brightbox::Compute::CloudIp
+
+        def all
+          data = connection.list_cloud_ips
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_cloud_ip(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def allocate
+          data = connection.create_cloud_ip
+          new(data)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/flavor.rb

@@ -0,0 +1,33 @@
+require 'fog/core/model'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class Flavor < Fog::Model
+
+        identity :id
+
+        attribute :url
+        attribute :name
+        attribute :status
+
+        attribute :handle
+
+        attribute :bits
+        attribute :cores
+        attribute :disk, :aliases => "disk_size"
+        attribute :ram
+
+        attribute :resource_type
+        attribute :description
+
+        def bits
+          0 # This is actually based on the Image type used. 32bit or 64bit Images are supported
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/flavors.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/compute/models/brightbox/flavor'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class Flavors < Fog::Collection
+
+        model Fog::Brightbox::Compute::Flavor
+
+        def all
+          data = connection.list_server_types
+          load(data)
+        end
+
+        def get(identifier)
+          data = connection.get_server_type(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/image.rb

@@ -0,0 +1,56 @@
+require 'fog/core/model'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class Image < Fog::Model
+
+        identity :id
+
+        attribute :url
+        attribute :name
+        attribute :status
+        attribute :source
+        attribute :source_type
+
+        attribute :ancestor_id, :aliases => "ancestor", :squash => "id"
+        attribute :owner_id, :aliases => "owner", :squash => "id"
+        attribute :arch
+
+        attribute :resource_type
+        attribute :description
+        attribute :public
+        attribute :official
+        attribute :virtual_size
+        attribute :disk_size
+        attribute :created_at
+
+        def ready?
+          status == "available"
+        end
+
+        def save
+          requires :source, :arch
+          options = {
+            :source => source,
+            :arch => arch,
+            :name => name,
+            :description => description
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_image(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_image(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/images.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/compute/models/brightbox/image'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class Images < Fog::Collection
+
+        model Fog::Brightbox::Compute::Image
+
+        def all
+          data = connection.list_images
+          load(data)
+        end
+
+        def get(identifier)
+          data = connection.get_image(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/load_balancer.rb

@@ -0,0 +1,50 @@
+require 'fog/core/model'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class LoadBalancer < Fog::Model
+
+        identity :id
+
+        attribute :url
+        attribute :name
+        attribute :status
+        attribute :resource_type
+
+        attribute :nodes
+        attribute :policy
+        attribute :healthcheck
+        attribute :listeners
+        attribute :account
+
+        def ready?
+          status == 'active'
+        end
+
+        def save
+          requires :nodes, :listeners, :healthcheck
+          options = {
+            :nodes => nodes,
+            :listeners => listeners,
+            :healthcheck => healthcheck,
+            :policy => policy,
+            :name => name
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_load_balancer(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_load_balancer(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bbcloud/vendor/fog/lib/fog/compute/models/brightbox/load_balancers.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/compute/models/brightbox/load_balancer'
+
+module Fog
+  module Brightbox
+    class Compute
+
+      class LoadBalancers < Fog::Collection
+
+        model Fog::Brightbox::Compute::LoadBalancer
+
+        def all
+          data = connection.list_load_balancers
+          load(data)
+        end
+
+        def get(identifier)
+          data = connection.get_load_balancer(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end