openstack 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/openstack/compute/server.rb

@@ -54,15 +54,15 @@ module Compute
           OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
           data = JSON.parse(response.body)["server"]
       end
-      @id        = data["uuid"]
+      @id        = data["id"] || data["uuid"]
       @name      = data["name"]
       @status    = data["status"]
       @progress  = data["progress"]
       @addresses = get_addresses(data["addresses"])
       @metadata  = OpenStack::Compute::Metadata.new(@compute, path, data["metadata"])
       @hostId    = data["hostId"]
-      @image   = data["image"]
-      @flavor  = data["flavor"]
+      @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
       @security_groups = (data["security_groups"] || []).inject([]){|res, c| res << c["id"]  ; res}
       true

data/lib/openstack/connection.rb

@@ -100,7 +100,6 @@ class Connection
 
     #specialised from of csreq for PUT object... uses body_stream if possible
     def put_object(server,path,port,scheme,headers = {},data = nil,attempts = 0) # :nodoc:
-      start = Time.now
       if data.respond_to? :read
         headers['Transfer-Encoding'] = 'chunked'
         hdrhash = headerprep(headers)
@@ -139,7 +138,6 @@ class Connection
 
     # This method actually makes the HTTP REST calls out to the server
     def csreq(method,server,path,port,scheme,headers = {},data = nil,attempts = 0, &block) # :nodoc:
-      start = Time.now
       hdrhash = headerprep(headers)
       start_http(server,path,port,scheme,hdrhash)
       request = Net::HTTP.const_get(method.to_s.capitalize).new(path,hdrhash)
@@ -304,7 +302,7 @@ class AuthV20
       connection.authtoken = false
       raise OpenStack::Exception::Authentication, "Authentication failed with response code #{response.code}"
     end
-    server.finish
+    server.finish if server.started?
   end
 end
 
@@ -448,7 +446,7 @@ class Exception
   # "404 Not Found\n\nThe resource could not be found.\n\n   "
   # which doesn't parse. Deal with such cases here if possible (JSON::ParserError)
   def self.deal_with_faulty_error(response, parse_error)
-  case response.code
+    case response.code
     when "404"
       klass = self.const_get("ItemNotFound")
       msg = "The resource could not be found"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json