openstack-compute 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/openstack/compute.rb

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

data/lib/openstack/compute/address.rb

@@ -7,7 +7,7 @@ module Compute
       if index.class == Symbol then
         self.each do |address|
           if address.label == index.to_s then
-            addresses << address.address
+            addresses << address
           end
         end
         addresses

data/lib/openstack/compute/connection.rb

@@ -203,7 +203,7 @@ module Compute
     #   => "NewServerSHMGpvI"
     def create_server(options)
       raise OpenStack::Compute::Exception::MissingArgument, "Server name, flavorRef, and imageRef, must be supplied" unless (options[:name] && options[:flavorRef] && options[:imageRef])
-      options[:personality] = get_personality(options[:personality])
+      options[:personality] = Personalities.get_personality(options[:personality])
       data = JSON.generate(:server => options)
       response = csreq("POST",svrmgmthost,"#{svrmgmtpath}/servers",svrmgmtport,svrmgmtscheme,{'content-type' => 'application/json'},data)
       OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
@@ -330,23 +330,6 @@ module Compute
       end
     end
     
-    # Handles parsing the Personality hash to load it up with Base64-encoded data.
-    def get_personality(options)
-      return if options.nil?
-      require 'base64'
-      data = []
-      itemcount = 0
-      options.each do |localpath,svrpath|
-        raise OpenStack::Compute::Exception::TooManyPersonalityItems, "Personality files are limited to a total of #{MAX_PERSONALITY_ITEMS} items" if itemcount >= MAX_PERSONALITY_ITEMS
-        raise OpenStack::Compute::Exception::PersonalityFilePathTooLong, "Server-side path of #{svrpath} exceeds the maximum length of #{MAX_SERVER_PATH_LENGTH} characters" if svrpath.size > MAX_SERVER_PATH_LENGTH
-        raise OpenStack::Compute::Exception::PersonalityFileTooLarge, "Local file #{localpath} exceeds the maximum size of #{MAX_PERSONALITY_FILE_SIZE} bytes" if File.size(localpath) > MAX_PERSONALITY_FILE_SIZE
-        b64 = Base64.encode64(IO.read(localpath))
-        data.push({:path => svrpath, :contents => b64})
-        itemcount += 1
-      end
-      data
-    end
-        
   end
 end
 end

data/lib/openstack/compute/image.rb

@@ -28,7 +28,6 @@ module Compute
     def initialize(connection,id)
       @id = id
       @connection = connection
-      @metadata  = OpenStack::Compute::ImageMetadata.new(connection, id)
       populate
     end
     
@@ -38,7 +37,8 @@ module Compute
     #   >> image.populate
     #   => true
     def populate
-      response = @connection.csreq("GET",@connection.svrmgmthost,"#{@connection.svrmgmtpath}/images/#{URI.escape(self.id.to_s)}",@connection.svrmgmtport,@connection.svrmgmtscheme)
+      path = "/images/#{URI.escape(self.id.to_s)}"
+      response = @connection.req("GET", path)
       OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
       data = JSON.parse(response.body)['image']
       @id = data['id']
@@ -48,6 +48,7 @@ module Compute
          @updated = DateTime.parse(data['updated'])
       end
       @created = DateTime.parse(data['created'])
+      @metadata = OpenStack::Compute::Metadata.new(@connection, path, data['metadata'])
       @status = data['status']
       @minDisk = data['minDisk']
       @minRam = data['minRam']

data/lib/openstack/compute/metadata.rb

@@ -1,51 +1,110 @@
 module OpenStack
 module Compute
 
-  class AbstractMetadata
+  class Metadata
 
-    def initialize(connection, server_id)
+    def initialize(connection, parent_url, metadata=nil)
       @connection = connection
-      @server_id  = server_id
+      @base_url = "#{parent_url}/metadata"
+      @metadata = metadata
     end
 
-    def get_item(key)
-      response = @connection.req('GET', "#{@base_url}/#{key}")
-      return JSON.parse(response.body)['meta'][key]
+    def [](key)
+      refresh if @metadata.nil?
+      @metadata[key]
     end
 
-    def set_item(key, value)
-      json = JSON.generate(:meta => { key => value })
-      @connection.req('PUT', "#{@base_url}/#{key}", :data => json)
+    def []=(key, value)
+      @metadata = {} if @metadata.nil?
+      @metadata[key] = value
     end
 
-    def delete_item(key)
-      @connection.req('DELETE', "#{@base_url}/#{key}")
+    def store(key, value)
+      @metadata = {} if @metadata.nil?
+      @metadata[key] = value
     end
 
-    def get_data()
-      response = @connection.req('GET', @base_url)
-      return JSON.parse(response.body)['metadata']
+    def each_pair
+      @metadata = {} if @metadata.nil?
+      @metadata.each_pair do |k,v|
+          yield k, v
+      end
     end
 
-    def set_data(data = {})
-      json = JSON.generate(:metadata => data)
-      @connection.req('POST', @base_url, :data => json)
+    def each
+      refresh if @metadata.nil?
+      @metadata.each
     end
 
-  end
+    def save
+      return if @metadata.nil?
+      json = JSON.generate(:metadata => @metadata)
+      response = @connection.req('PUT', @base_url, :data => json)
+      @metadata = JSON.parse(response.body)['metadata']
+    end
 
-  class ServerMetadata < AbstractMetadata
-    def initialize(connection, server_id)
-      super(connection, server_id)
-      @base_url = "/servers/#{@server_id}/metadata"
+    def update(keys=nil)
+      return if @metadata.nil?
+      if keys.nil?
+        json = JSON.generate(:metadata => @metadata)
+        response = @connection.req('POST', @base_url, :data => json)
+        @metadata = JSON.parse(response.body)['metadata']
+      else
+        keys.each { |key|
+          next if not @metadata.has_key?(key)
+          json = JSON.generate(:meta => { key => @metadata[key] })
+          @connection.req('PUT', "#{@base_url}/#{key}", :data => json)
+        }
+      end
+    end
+
+    def refresh(keys=nil)
+      if keys.nil?
+        response = @connection.req('GET', @base_url)
+        @metadata = JSON.parse(response.body)['metadata']
+      else
+        @metadata = {} if @metadata == nil
+        keys.each { |key|
+          response = @connection.req('GET', "#{@base_url}/#{key}")
+          next if response.code == "404"
+          meta = JSON.parse(response.body)['meta']
+          meta.each { |k, v| @metadata[k] = v }
+        }
+      end
+    end
+
+    def delete(keys)
+      return if @metadata.nil?
+      keys.each { |key|
+        @metadata.delete(key)
+      }
     end
-  end
 
-  class ImageMetadata < AbstractMetadata
-    def initialize(connection, server_id)
-      super(connection, server_id)
-      @base_url = "/images/#{@server_id}/metadata"
+    def delete!(keys)
+      keys.each { |key|
+        @connection.req('DELETE', "#{@base_url}/#{key}")
+        @metadata.delete(key) if not @metadata.nil?
+      }
     end
+
+    def clear
+      if @metadata.nil?
+        @metadata = {}
+      else
+        @metadata.clear
+      end
+    end
+
+    def clear!
+      clear
+      save
+    end
+
+    def has_key?(key)
+      return False if @metadata.nil?
+      return @metadata.has_key?(key)
+    end
+
   end
 
 end

data/lib/openstack/compute/personalities.rb

@@ -0,0 +1,23 @@
+module OpenStack
+  module Compute
+    module Personalities
+    
+      # Handles parsing the Personality hash to load it up with Base64-encoded data.
+      def self.get_personality(options)
+        return if options.nil?
+        require 'base64'
+        data = []
+        itemcount = 0
+        options.each do |localpath,svrpath|
+          raise OpenStack::Compute::Exception::TooManyPersonalityItems, "Personality files are limited to a total of #{MAX_PERSONALITY_ITEMS} items" if itemcount >= MAX_PERSONALITY_ITEMS
+          raise OpenStack::Compute::Exception::PersonalityFilePathTooLong, "Server-side path of #{svrpath} exceeds the maximum length of #{MAX_SERVER_PATH_LENGTH} characters" if svrpath.size > MAX_SERVER_PATH_LENGTH
+          raise OpenStack::Compute::Exception::PersonalityFileTooLarge, "Local file #{localpath} exceeds the maximum size of #{MAX_PERSONALITY_FILE_SIZE} bytes" if File.size(localpath) > MAX_PERSONALITY_FILE_SIZE
+          b64 = Base64.encode64(IO.read(localpath))
+          data.push({:path => svrpath, :contents => b64})
+          itemcount += 1
+          end
+        data
+      end
+    end
+  end
+end

data/lib/openstack/compute/server.rb

@@ -45,16 +45,19 @@ module Compute
     #
     #  >> server.refresh
     #  => true
-    def populate
-      response = @connection.csreq("GET",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(@id.to_s)}",@svrmgmtport,@svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      data = JSON.parse(response.body)["server"]
+    def populate(data=nil)
+      path = "/servers/#{URI.encode(@id.to_s)}"
+      if data.nil? then
+          response = @connection.req("GET", path)
+          OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+          data = JSON.parse(response.body)["server"]
+      end
       @id        = data["id"]
       @name      = data["name"]
       @status    = data["status"]
       @progress  = data["progress"]
       @addresses = get_addresses(data["addresses"])
-      @metadata  = OpenStack::Compute::ServerMetadata.new(@connection, @id)
+      @metadata  = OpenStack::Compute::Metadata.new(@connection, path, data["metadata"])
       @hostId    = data["hostId"]
       @image   = data["image"]
       @flavor  = data["flavor"]
@@ -145,9 +148,13 @@ module Compute
     #   >> server.rebuild!
     #   => true
     def rebuild!(options)
+      options[:personality] = Personalities.get_personality(options[:personality])
       json = JSON.generate(:rebuild => options)
-      @connection.req('POST', "/servers/#{@id}/action", :data => json)
-      self.populate
+      response = @connection.req('POST', "/servers/#{@id}/action", :data => json)
+      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      data = JSON.parse(response.body)['server']
+      self.populate(data)
+      self.adminPass = data['adminPass']
       true
     end
     
@@ -160,10 +167,10 @@ module Compute
     # The image is saved as a backup, of which there are only three available slots.  If there are no backup slots available, 
     # A OpenStack::Compute::Exception::OpenStackComputeFault will be raised.
     #
-    #   >> image = server.create_image("My Rails Server")
+    #   >> image = server.create_image(:name => "My Rails Server")
     #   => 
-    def create_image(name)
-      data = JSON.generate(:createImage => {:name => name})
+    def create_image(options)
+      data = JSON.generate(:createImage => options)
       response = @connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
       OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
       image_id = response["Location"].scan(/.*\/(.*)/).flatten

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstack-compute
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 -04:00
+date: 2011-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/openstack/compute/flavor.rb
 - lib/openstack/compute/image.rb
 - 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