openstack-compute 1.1.6 → 1.1.7

data/README.rdoc

@@ -61,7 +61,7 @@ See the class definitions for documentation on specific methods and operations.
 
 == Authors
 
-By Dan Prince <dan.prince@rackspace.com>, Naveed Massjouni <naveedm9@gmail.com>
+By Dan Prince <dprince@redhat.com>, Naveed Massjouni <naveedm9@gmail.com>
 
 Based on the Rackspace Cloud Servers Ruby API.
 

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/openstack/compute/authentication.rb

@@ -7,6 +7,7 @@ module Compute
     # If it succeeds, it sets the svrmgmthost, svrmgtpath, svrmgmtport,
     # svrmgmtscheme, authtoken, and authok variables on the connection.
     # If it fails, it raises an exception.
+    
     def self.init(conn)
       if conn.auth_path =~ /.*v2.0\/?$/
         AuthV20.new(conn)
@@ -19,6 +20,7 @@ module Compute
 
   private
   class AuthV20
+    attr_reader :uri
     
     def initialize(connection)
       begin
@@ -31,6 +33,8 @@ module Compute
       rescue
         raise OpenStack::Compute::Exception::Connection, "Unable to connect to #{server}"
       end
+      
+      @uri = String.new
 
       auth_data = JSON.generate({ "auth" =>  { "passwordCredentials" => { "username" => connection.authuser, "password" => connection.authkey }, "tenantName" => connection.authtenant}})
       response = server.post(connection.auth_path.chomp("/")+"/tokens", auth_data, {'Content-Type' => 'application/json'})
@@ -38,26 +42,31 @@ module Compute
         resp_data=JSON.parse(response.body)
         connection.authtoken = resp_data['access']['token']['id']
         resp_data['access']['serviceCatalog'].each do |service|
-          if service['type'] == connection.service_name
-            uri = String.new
+          if connection.service_name
+            check_service_name = connection.service_name
+          else
+            check_service_name = service['name']
+          end
+          if service['type'] == connection.service_type and service['name'] == check_service_name
             endpoints = service["endpoints"]
             if connection.region
               endpoints.each do |ep|
-                if ep["region"].upcase == connection.region.upcase
-                  uri = URI.parse(ep["publicURL"])
+                if ep["region"] and ep["region"].upcase == connection.region.upcase
+                  @uri = URI.parse(ep["publicURL"])
                 end
               end
-              if uri == ''
-                raise OpenStack::Compute::Exception::Authentication, "No API endpoint for region #{connection.region}"
-              end
             else
-              uri = URI.parse(endpoints[0]["publicURL"])
+              @uri = URI.parse(endpoints[0]["publicURL"])
+            end
+            if @uri == ""
+              raise OpenStack::Compute::Exception::Authentication, "No API endpoint for region #{connection.region}"
+            else
+              connection.svrmgmthost = @uri.host
+              connection.svrmgmtpath = @uri.path
+              connection.svrmgmtport = @uri.port
+              connection.svrmgmtscheme = @uri.scheme
+              connection.authok = true
             end
-            connection.svrmgmthost = uri.host
-            connection.svrmgmtpath = uri.path
-            connection.svrmgmtport = uri.port
-            connection.svrmgmtscheme = uri.scheme
-            connection.authok = true
           end
         end
       else
@@ -88,9 +97,6 @@ module Compute
         uri = URI.parse(response["x-server-management-url"])
         connection.svrmgmthost = uri.host
         connection.svrmgmtpath = uri.path
-        # Force the path into the v1.1 URL space
-        connection.svrmgmtpath.sub!(/\/.*\/?/, '/v1.1/')
-        connection.svrmgmtpath += connection.authtenant
         connection.svrmgmtport = uri.port
         connection.svrmgmtscheme = uri.scheme
         connection.authok = true

data/lib/openstack/compute/connection.rb

@@ -15,7 +15,8 @@ module Compute
     attr_reader   :auth_port
     attr_reader   :auth_scheme
     attr_reader   :auth_path
-    attr_accessor :service_name
+    attr_reader   :service_name
+    attr_reader   :service_type
     attr_reader   :proxy_host
     attr_reader   :proxy_port
     attr_reader   :region
@@ -28,7 +29,8 @@ module Compute
     #   :tenant - Your Openstack tenant *required*. Defaults to username.
     #   :api_key - Your Openstack API key *required*
     #   :auth_url - Configurable auth_url endpoint.
-    #   :service_name - (Optional for v2.0 auth only). The name of the compute service to use. Defaults to 'compute'.
+    #   :service_name - (Optional for v2.0 auth only). The optional name of the compute service to use.
+    #   :service_type - (Optional for v2.0 auth only). Defaults to "compute"
     #   :region - (Optional for v2.0 auth only). The specific service region to use. Defaults to first returned region.
     #   :retry_auth - Whether to retry if your auth token expires (defaults to true)
     #   :proxy_host - If you need to connect through a proxy, supply the hostname here
@@ -40,7 +42,8 @@ module Compute
       @authkey = options[:api_key] || (raise Exception::MissingArgument, "Must supply an :api_key")
       @auth_url = options[:auth_url] || (raise Exception::MissingArgument, "Must supply an :auth_url")
       @authtenant = options[:authtenant] || @authuser
-      @service_name = options[:service_name] || "compute"
+      @service_name = options[:service_name] || nil
+      @service_type = options[:service_type] || "compute"
       @region = options[:region] || @region = nil
       @is_debug = options[:is_debug]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstack-compute
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 -05:00
-default_executable: 
+date: 2012-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -54,7 +53,6 @@ files:
 - lib/openstack/compute/metadata.rb
 - lib/openstack/compute/personalities.rb
 - lib/openstack/compute/server.rb
-has_rdoc: true
 homepage: https://launchpad.net/ruby-openstack-compute
 licenses: []
 
@@ -84,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: OpenStack Compute Ruby API