openstack-compute 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/openstack/compute/address.rb

@@ -0,0 +1,38 @@
+module OpenStack
+module Compute
+
+  class AddressList < Array
+    def [](index)
+      addresses = Array.new
+      if index.class == Symbol then
+        self.each do |address|
+          if address.label == index.to_s then
+            addresses << address.address
+          end
+        end
+        addresses
+      else
+        super
+      end
+    end
+  end
+
+  class Address
+
+    attr_reader :address
+    attr_reader :label
+    attr_reader :version
+
+    def initialize(label, address, version = 4)
+      @label = label
+      if address.class == Hash then
+        @address = address["addr"]
+        @version = address["version"]
+      else
+        @address = address
+        @version = version
+      end
+    end
+  end
+end
+end

data/lib/openstack/compute/authentication.rb

@@ -32,23 +32,35 @@ module Compute
         raise OpenStack::Compute::Exception::Connection, "Unable to connect to #{server}"
       end
 
-      auth_data = JSON.generate({ "passwordCredentials" => { "username" => connection.authuser, "password" => connection.authkey }})
+      auth_data = JSON.generate({ "auth" =>  { "passwordCredentials" => { "username" => connection.authuser, "password" => connection.authkey }}})
       response = server.post(connection.auth_path.chomp("/")+"/tokens", auth_data, {'Content-Type' => 'application/json'})
       if (response.code =~ /^20./)
         resp_data=JSON.parse(response.body)
-        connection.authtoken = resp_data['auth']['token']['id']
-        if resp_data['auth']['serviceCatalog'] and resp_data['auth']['serviceCatalog'][connection.service_name] and resp_data['auth']['serviceCatalog'][connection.service_name][0] then
-          uri = URI.parse(resp_data['auth']['serviceCatalog'][connection.service_name][0]['publicURL'])
-          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
-        else
-          connection.authok = false
+        connection.authtoken = resp_data['access']['token']['id']
+        resp_data['access']['serviceCatalog'].each do |service|
+          if service['type'] == connection.service_name
+            uri = String.new
+            endpoints = service["endpoints"]
+            if connection.region
+              endpoints.each do |ep|
+                if 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"])
+            end
+            connection.svrmgmthost = uri.host
+            connection.svrmgmtpath = uri.path
+            connection.svrmgmtport = uri.port
+            connection.svrmgmtscheme = uri.scheme
+            connection.authok = true
+          else
+            connection.authok = false
+          end
         end
       else
         connection.authtoken = false

data/lib/openstack/compute/connection.rb

@@ -18,6 +18,7 @@ module Compute
     attr_accessor :service_name
     attr_reader   :proxy_host
     attr_reader   :proxy_port
+    attr_reader   :region
     
     # Creates a new OpenStack::Compute::Connection object.  Uses OpenStack::Compute::Authentication to perform the login for the connection.
     #
@@ -27,7 +28,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 'nova'.
+    #   :service_name - (Optional for v2.0 auth only). The name of the compute service to use. 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
     #   :proxy_port - If you need to connect through a proxy, supply the port here
@@ -38,7 +40,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] || "nova"
+      @service_name = options[:service_name] || "compute"
+      @region = options[:region] || @region = nil
       @is_debug = options[:is_debug]
 
       auth_uri=nil
@@ -341,7 +344,7 @@ module Compute
         data.push({:path => svrpath, :contents => b64})
         itemcount += 1
       end
-      return data
+      data
     end
         
   end

data/lib/openstack/compute/server.rb

@@ -8,6 +8,8 @@ module Compute
     attr_reader   :name
     attr_reader   :status
     attr_reader   :progress
+    attr_reader   :accessipv4
+    attr_reader   :accessipv6
     attr_reader   :addresses
     attr_reader   :hostId
     attr_reader   :image
@@ -51,7 +53,7 @@ module Compute
       @name      = data["name"]
       @status    = data["status"]
       @progress  = data["progress"]
-      @addresses = OpenStack::Compute.symbolize_keys(data["addresses"])
+      @addresses = get_addresses(data["addresses"])
       @metadata  = OpenStack::Compute::ServerMetadata.new(@connection, @id)
       @hostId    = data["hostId"]
       @image   = data["image"]
@@ -222,6 +224,19 @@ module Compute
       @adminPass = password
     end
 
+    def get_addresses(address_info)
+      address_list = OpenStack::Compute::AddressList.new
+      address_info.each do |label, addr|
+        addr.each do |address|
+          address_list << OpenStack::Compute::Address.new(label,address)
+          if address_list.last.version == 4 && (!@accessipv4 || accessipv4 == "") then
+            @accessipv4 = address_list.last.address
+          end
+        end
+      end
+      address_list
+    end
+
   end
 end
 end

data/lib/openstack/compute.rb

@@ -33,6 +33,7 @@ module Compute
   require 'compute/image'
   require 'compute/flavor'
   require 'compute/exception'
+  require 'compute/address'
   
   # Constants that set limits on server creation
   MAX_PERSONALITY_ITEMS = 5

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstack-compute
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -04:00
+date: 2011-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - README.rdoc
 - VERSION
 - lib/openstack/compute.rb
+- lib/openstack/compute/address.rb
 - lib/openstack/compute/authentication.rb
 - lib/openstack/compute/connection.rb
 - lib/openstack/compute/exception.rb