openstack 1.0.8 → 1.0.9

data/README.rdoc

@@ -44,6 +44,16 @@ Other parameters for the create method:
   irb(main):006:0> os.containers
     => ["herpy_Foo_container", "derpy_bar_bucket"]
 
+  irb(main):003:0> os.connection.regions_list
+    => {"region-a.geo-1" => [ {:service=>"object-store", :versionId=>"1.0"}, {:service=>"identity", :versionId=>"2.0"}],
+        "region-b.geo-1"=>[{:service=>"identity", :versionId=>"2.0"}],
+        "az-2.region-a.geo-1"=>[{:service=>"image", :versionId=>"1.0"}, {:service=>"volume", :versionId=>"1.1"}, {:service=>"compute", :versionId=>"1.1"}],
+        "az-1.region-a.geo-1"=>[{:service=>"image", :versionId=>"1.0"}, {:service=>"volume", :versionId=>"1.1"}, {:service=>"compute", :versionId=>"1.1"}]}
+
+  irb(main):005:0> os.connection.regions_list["region-a.geo-1"]
+    => [{:service=>"object-store", :versionId=>"1.0"}, {:service=>"identity", :versionId=>"2.0"}]
+
+
 == Examples
 
 == For Compute:

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/openstack/compute/server.rb

@@ -17,6 +17,7 @@ module Compute
     attr_reader   :metadata
     attr_accessor :adminPass
     attr_reader   :key_name
+    attr_reader   :created
     attr_reader   :security_groups
 
     # This class is the representation of a single Server object.  The constructor finds the server identified by the specified
@@ -64,6 +65,7 @@ module Compute
       @image   = data["image"] || data["imageId"]
       @flavor  = data["flavor"] || data["flavorId"]
       @key_name = data["key_name"] # if provider uses the keys API extension for accessing servers
+      @created = data["created"]
       @security_groups = (data["security_groups"] || []).inject([]){|res, c| res << c["id"]  ; res}
       true
     end
@@ -177,7 +179,7 @@ module Compute
       data = JSON.generate(:createImage => options)
       response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      image_id = response["Location"].scan(/.*\/(.*)/).flatten
+      image_id = response["Location"].split("/images/").last
       OpenStack::Compute::Image.new(@compute, image_id)
     end
 

data/lib/openstack/connection.rb

@@ -21,6 +21,7 @@ class Connection
     attr_reader   :proxy_host
     attr_reader   :proxy_port
     attr_reader   :region
+    attr_reader   :regions_list #e.g. os.connection.regions_list == {"region-a.geo-1" => [ {:service=>"object-store", :versionId=>"1.0"}, {:service=>"identity", :versionId=>"2.0"}], "region-b.geo-1"=>[{:service=>"identity", :versionId=>"2.0"}] }
 
     attr_reader   :http
     attr_reader   :is_debug
@@ -83,6 +84,7 @@ class Connection
       @service_name = options[:service_name] || nil
       @service_type = options[:service_type] || "compute"
       @region = options[:region] || @region = nil
+      @regions_list = {} # this is populated during authentication - from the returned service catalogue
       @is_debug = options[:is_debug]
       auth_uri=nil
       begin
@@ -282,7 +284,16 @@ class AuthV20
       raise OpenStack::Exception::NotImplemented.new("The requested service: \"#{connection.service_type}\" is not present " +
         "in the returned service catalogue.", 501, "#{resp_data["access"]["serviceCatalog"]}") unless implemented_services.include?(connection.service_type)
       resp_data['access']['serviceCatalog'].each do |service|
-        if service['type'] == connection.service_type
+        service["endpoints"].each do |endpoint|
+          connection.regions_list[endpoint["region"]] ||= []
+          connection.regions_list[endpoint["region"]] << {:service=>service["type"], :versionId => endpoint["versionId"]}
+        end
+        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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha