brightbox-cli 0.14.1 → 0.15.0

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

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def update_server(server_id, options = {})
+          request(
+            :body     => MultiJson.encode({ 'server' => options }),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "servers/#{server_id}.json"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_server(server_id, options)
+          response = Excon::Response.new
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
+            if options['name']
+              server['name'] = options['name']
+            end
+            response.status = 200
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+
+module Fog
+  module OpenStack
+    extend Fog::Provider
+
+    module Errors
+      class ServiceError < Fog::Errors::Error
+        attr_reader :response_data
+
+        def self.slurp(error)
+          if error.response.body.empty?
+            data = nil
+            message = nil
+          else
+            data = MultiJson.decode(error.response.body)
+            message = data['message']
+          end
+
+          new_error = super(error, message)
+          new_error.instance_variable_set(:@response_data, data)
+          new_error
+        end
+      end
+
+      class InternalServerError < ServiceError; end
+      class Conflict < ServiceError; end
+      class NotFound < ServiceError; end
+      class ServiceUnavailable < ServiceError; end
+
+      class BadRequest < ServiceError
+        attr_reader :validation_errors
+
+        def self.slurp(error)
+          new_error = super(error)
+          unless new_error.response_data.nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['validationErrors'])
+          end
+          new_error
+        end
+      end
+    end
+
+    service(:compute,         'openstack/compute',        'Compute')
+
+    # legacy v1.0 style auth
+    def self.authenticate_v1(options, connection_options = {})
+      openstack_auth_url = options[:openstack_auth_url]
+      uri = URI.parse(openstack_auth_url)
+      connection = Fog::Connection.new(openstack_auth_url, false, connection_options)
+      @openstack_api_key  = options[:openstack_api_key]
+      @openstack_username = options[:openstack_username]
+      response = connection.request({
+        :expects  => [200, 204],
+        :headers  => {
+          'X-Auth-Key'  => @openstack_api_key,
+          'X-Auth-User' => @openstack_username
+        },
+        :host     => uri.host,
+        :method   => 'GET',
+        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
+      })
+
+      return {
+        :token => response.headers['X-Auth-Token'],
+        :server_management_url => response.headers['X-Server-Management-Url'] 
+      } 
+
+    end
+
+   # keystone style auth
+   def self.authenticate_v2(options, connection_options = {})
+      openstack_auth_url = options[:openstack_auth_url]
+      uri = URI.parse(openstack_auth_url)
+      connection = Fog::Connection.new(openstack_auth_url, false, connection_options)
+      @openstack_api_key  = options[:openstack_api_key]
+      @openstack_username = options[:openstack_username]
+      @openstack_tenant = options[:openstack_tenant]
+      @compute_service_name = options[:openstack_compute_service_name]
+
+      req_body= {
+        'passwordCredentials'  => {
+          'username' => @openstack_username,
+          'password' => @openstack_api_key
+        }
+      }
+      req_body['tenantId'] = @openstack_tenant if @openstack_tenant
+
+      response = connection.request({
+        :expects  => [200, 204],
+        :headers => {'Content-Type' => 'application/json'},
+        :body  => MultiJson.encode(req_body),
+        :host     => uri.host,
+        :method   => 'POST',
+        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
+      })
+      body=MultiJson.decode(response.body)
+     
+      if body['auth']['serviceCatalog'] and body['auth']['serviceCatalog'][@compute_service_name] and body['auth']['serviceCatalog'][@compute_service_name][0] then
+        mgmt_url = body['auth']['serviceCatalog'][@compute_service_name][0]['publicURL']
+        token = body['auth']['token']['id']
+        return {
+          :token => token,
+          :server_management_url => mgmt_url
+        } 
+      else
+        raise "Unable to parse service catalog."
+      end
+ 
+    end
+
+  end
+end

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

@@ -14,6 +14,7 @@ require 'fog/local'
 require 'fog/new_servers'
 require 'fog/ninefold'
 require 'fog/rackspace'
+require 'fog/openstack'
 require 'fog/slicehost'
 require 'fog/storm_on_demand'
 require 'fog/vcloud'

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/dns.rb

@@ -36,6 +36,31 @@ module Fog
       request :add_records
 
       class Mock
+
+        def initialize(options={})
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          @connection_options = options[:connection_options] || {}
+        end
+
+        def self.data
+          @data ||= {
+          }
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def data
+          self.class.data
+        end
+
+        def reset_data
+          self.class.reset
+        end
+
       end
 
       class Real

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/requests/dns/callback.rb

@@ -2,14 +2,15 @@ module Fog
   module DNS
     class Rackspace
       class Real
-        def callback(job_id)
+        def callback(job_id, show_details=true)
 
           validate_path_fragment :job_id, job_id
 
           request(
             :expects  => [200, 202, 204],
             :method   => 'GET',
-            :path     => "status/#{job_id}"
+            :path     => "status/#{job_id}",
+            :query    => "showDetails=#{show_details}"
           )
         end
       end

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

@@ -42,11 +42,11 @@ module Fog
       end
     end
 
-    service(:cdn,             'rackspace/cdn')
-    service(:compute,         'rackspace/compute')
-    service(:dns,             'rackspace/dns')
-    service(:storage,         'rackspace/storage')
-    service(:load_balancers,  'rackspace/load_balancers')
+    service(:cdn,             'rackspace/cdn',            'CDN')
+    service(:compute,         'rackspace/compute',        'Compute')
+    service(:dns,             'rackspace/dns',            'DNS')
+    service(:storage,         'rackspace/storage',        'Storage')
+    service(:load_balancers,  'rackspace/load_balancers', 'LoadBalancers')
 
     def self.authenticate(options, connection_options = {})
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/{parsers/dns/slicehost → requests/dns}/create_record.rb

@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * record_type<~String> - type of DNS record to create (A, CNAME, etc)
         # * zone_id<~Integer> - ID of the zone to update
-        # * name<~String> - host name this DNS record is for 
+        # * name<~String> - host name this DNS record is for
         # * data<~String> - data for the DNS record (ie for an A record, the IP address)
         # * options<~Hash> - extra parameters that are not mandatory
         #   * ttl<~Integer> - time to live in seconds
@@ -36,7 +36,7 @@ module Fog
               optional_tags+= "<aux>#{value}</aux>"
             end
           }
-          
+
           request(
             :body     => %Q{<?xml version="1.0" encoding="UTF-8"?><record><record_type>#{record_type}</record_type><zone_id type="integer">#{zone_id}</zone_id><name>#{name}</name><data>#{data}</data>#{optional_tags}</record>},
             :expects  => 201,

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/{parsers/dns/slicehost → requests/dns}/create_zone.rb

@@ -30,7 +30,7 @@ module Fog
               optional_tags+= "<active>#{value}</active>"
             end
           }
-          
+
           request(
             :body     => %Q{<?xml version="1.0" encoding="UTF-8"?><zone><origin>#{origin}</origin>#{optional_tags}</zone>},
             :expects  => 201,

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/{parsers/dns/slicehost → requests/dns}/get_record.rb

@@ -5,14 +5,14 @@ module Fog
 
         require 'fog/slicehost/parsers/dns/get_record'
 
-        # Get an individual DNS record from the specified zone 
+        # Get an individual DNS record from the specified zone
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'record_type'<~String> - type of DNS record to create (A, CNAME, etc)
         #     * 'zone_id'<~Integer> - ID of the zone to update
-        #     * 'name'<~String> - host name this DNS record is for 
+        #     * 'name'<~String> - host name this DNS record is for
         #     * 'data'<~String> - data for the DNS record (ie for an A record, the IP address)
         #     * 'ttl'<~Integer> - time to live in seconds
         #     * 'active'<~String> - whether this record is active or not ('Y' or 'N')

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/{parsers/dns/slicehost → requests/dns}/get_records.rb

@@ -5,7 +5,7 @@ module Fog
 
         require 'fog/slicehost/parsers/dns/get_records'
 
-        # Get all the DNS records across all the DNS zones for this account 
+        # Get all the DNS records across all the DNS zones for this account
         #
         # ==== Returns
         # * response<~Excon::Response>:

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

@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'slicehost/compute')
-    service(:dns,     'slicehost/dns')
+    service(:compute, 'slicehost/compute',  'Compute')
+    service(:dns,     'slicehost/dns',      'DNS')
 
   end
 end

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'storm_on_demand/compute')
+    service(:compute, 'storm_on_demand/compute', 'Compute')
 
   end
 end

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'vcloud/compute')
+    service(:compute, 'vcloud/compute', 'Compute')
 
   end
 end

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'virtual_box/compute')
+    service(:compute, 'virtual_box/compute', 'Compute')
 
   end
 end

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

@@ -15,13 +15,13 @@ module Fog
 
           filter={} if filter.nil?
           unless filter.has_key?(:name)
-            vm_names=::Fission::VM.all
-            vm_names.each do |vm_name|
-              data << { :raw => ::Fission::VM.new(vm_name)}
+            vms=::Fission::VM.all
+            vms.each do |vm|
+              data << { :raw => vm}
             end
           else
-              data << { :raw => ::Fission::VM.new(filter[:name])}
-           end
+            data << { :raw => ::Fission::VM.new(filter[:name])}
+          end
 
           load(data)
 
@@ -34,4 +34,4 @@ module Fog
       end
     end
   end
- end
+end

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'vmfusion/compute')
+    service(:compute, 'vmfusion/compute', 'Compute')
 
   end
 end

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

@@ -6,7 +6,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'voxel/compute')
+    service(:compute, 'voxel/compute', 'Compute')
 
     def self.create_signature(secret, options)
       to_sign = options.keys.map { |k| k.to_s }.sort.map { |k| "#{k}#{options[k.to_sym]}" }.join("")

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

@@ -68,14 +68,12 @@ module Fog
         include Shared
 
         def initialize(options={})
-          require 'mocha'
           @vsphere_username = options[:vsphere_username]
           @vsphere_password = 'REDACTED'
           @vsphere_server   = options[:vsphere_server]
           @vsphere_expected_pubkey_hash = options[:vsphere_expected_pubkey_hash]
           @vsphere_is_vcenter = true
           @vsphere_rev = '4.0'
-          @connection = Mocha::Mock.new
         end
 
       end

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

@@ -11,7 +11,7 @@ module Fog
       class NotFound < ServiceError; end
     end
 
-    service(:compute, 'vsphere/compute')
+    service(:compute, 'vsphere/compute', 'Compute')
 
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/dns.rb

@@ -34,7 +34,7 @@ module Fog
 
         def self.data
           @data ||= Hash.new do |hash, key|
-            hash[key] = {}
+            hash[key] = key == :zones ? [] : {}
           end
         end
 
@@ -48,13 +48,24 @@ module Fog
         end
 
         def data
-          self.class.data[@zerigo_email]
+          self.class.data
         end
 
         def reset_data
-          self.class.data.delete(@zerigo_email)
+          self.class.reset
         end
 
+        def find_by_zone_id(zone_id)
+          self.data[:zones].find { |z| z['id'] == zone_id }
+        end
+
+        def find_by_domain(domain)
+          self.data[:zones].find { |z| z['domain'] == domain }
+        end
+
+        def find_host(host_id)
+          self.data[:zones].collect { |z| z['hosts'].find { |h| h['id'] == host_id } }.compact.first
+        end
       end
 
       class Real

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/models/dns/record.rb

@@ -48,7 +48,7 @@ module Fog
             connection.create_host(@zone.id, type, value, options)
           else
             options[:host_type] = type
-            options[:data]      = data
+            options[:data]      = value
             connection.update_host(identity, options)
           end
           merge_attributes(data.body)

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/models/dns/records.rb

@@ -34,6 +34,11 @@ module Fog
           super({ :zone => zone }.merge!(attributes))
         end
 
+        def find(fqdn)
+          hosts = connection.find_hosts(fqdn, zone.id).body['hosts']
+          hosts.collect { |host| new(host) }
+        end
+
       end
 
     end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/models/dns/zones.rb

@@ -14,8 +14,8 @@ module Fog
           load(data)
         end
 
-        def get(zone_id)
-          data = connection.get_zone(zone_id).body
+        def get(zone_id_or_domain)
+          data = connection.get_zone(zone_id_or_domain).body
           zone = new(data)
           zone.records.load(data['hosts'])
           zone

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/count_hosts.rb

@@ -13,7 +13,7 @@ module Fog
         #   * body<~Hash>
         #     * 'count'<~Integer> 
         #   * 'status'<~Integer> - 200 indicates success
-        def count_hosts( zone_id)
+        def count_hosts(zone_id)
           request(
             :expects  => 200,
             :method   => 'GET',
@@ -23,6 +23,25 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def count_hosts(zone_id)
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          if zone
+            response.status = 200
+            response.body = {
+              'count' => zone['hosts'].size
+            }
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/count_zones.rb

@@ -13,7 +13,7 @@ module Fog
         #   * body<~Hash>
         #     * 'count'<~Integer> 
         #   * 'status'<~Integer> - 200 indicates success
-        def count_zones()
+        def count_zones
           request(
             :expects  => 200,
             :method   => 'GET',
@@ -23,6 +23,17 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def count_zones
+          response = Excon::Response.new
+
+          response.status = 200
+          response.body = { 'count' => self.data[:zones].size }
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/create_host.rb

@@ -11,7 +11,7 @@ module Fog
         # * zone_id<~Integer>
         # * host_type<~String>
         # * data<~String>
-        # * options<~Hash> - optional paramaters
+        # * options<~Hash> - optional parameters
         #   * hostname<~String> - Note: normally this is set/required!!
         #   * notes<~String>
         #   * priority<~Integer> - Note: required for MX or SRV records
@@ -57,6 +57,72 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def valid_host_types
+          %w[A AAAA CNAME GEO MX NS SPF SRV TXT URL PTR CNAME NS]
+        end
+
+        def create_host(zone_id, host_type, data, options = {})
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          # Handle error cases.
+
+          # Zone doesn't exist.
+          unless zone
+            response.status = 404
+            return response
+          end
+
+          # Bad host type.
+          unless valid_host_types.include?(host_type)
+            response.status = 422
+            response.body = {
+              'errors' => [
+                'error' => 'Host type is not included in the list'
+              ]
+            }
+
+            return response
+          end
+
+          # Missing or bad priority value for MX or SRV records.
+          if %w[MX SRV].include?(host_type) && options['priority'].to_s !~ /\d+/
+            response.status = 422
+            response.body = {
+              'errors' => [
+                'error' => 'Priority is not a number'
+              ]
+            }
+
+            return response
+          end
+
+          # Successful case.
+          now = Time.now
+          host = {
+            'id'            => rand(10000000),
+            'fqdn'          => options[:hostname] ? "#{options[:hostname]}.#{zone['domain']}" : zone['domain'],
+            'data'          => data,
+            'hostname'      => options[:hostname],
+            'ttl'           => options[:ttl].to_i,
+            'host-type'     => host_type,
+            'created-at'    => now,
+            'updated-at'    => now,
+            'notes'         => options[:notes],
+            'priority'      => options[:priority].to_i,
+            'zone-id'       => zone_id
+          }
+
+          zone['hosts'] << host
+          response.status = 201
+          response.body = host
+
+          response
+        end
+      end
     end
   end
 end