openstack-compute 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/openstack/compute/authentication.rb

@@ -22,7 +22,7 @@ module Compute
         raise OpenStack::Compute::Exception::Connection, "Unable to connect to #{server}"
       end
       response = server.get(path,hdrhash)
-      if (response.code == "204")
+      if (response.code =~ /^20./)
         connection.authtoken = response["x-auth-token"]
         connection.svrmgmthost = URI.parse(response["x-server-management-url"]).host
         connection.svrmgmtpath = URI.parse(response["x-server-management-url"]).path

data/lib/openstack/compute/connection.rb

@@ -79,7 +79,7 @@ module Compute
       retry
     rescue OpenStack::Compute::Exception::ExpiredAuthToken
       raise OpenStack::Compute::Exception::Connection, "Authentication token expired and you have requested not to retry" if @retry_auth == false
-      CloudFiles::Authentication.new(self)
+      OpenStack::Compute::Authentication.new(self)
       retry
     end
     
@@ -228,47 +228,6 @@ module Compute
     end
     alias :flavor :get_flavor
     
-    # Returns an array of hashes for all Shared IP Groups that are available.  The :id key can be used to find that specific object.
-    #
-    # You can also provide :limit and :offset parameters to handle pagination.
-    #
-    #   >> cs.list_shared_ip_groups
-    #   => [{:name=>"New Group", :id=>127}]
-    def list_shared_ip_groups(options = {})
-      path = OpenStack::Compute.paginate(options).empty? ? "#{svrmgmtpath}/shared_ip_groups/detail" : "#{svrmgmtpath}/shared_ip_groups/detail?#{OpenStack::Compute.paginate(options)}"
-      response = csreq("GET",svrmgmthost,path,svrmgmtport,svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      OpenStack::Compute.symbolize_keys(JSON.parse(response.body)['sharedIpGroups'])
-    end
-    alias :shared_ip_groups :list_shared_ip_groups
-    
-    # Returns a OpenStack::Compute::SharedIPGroup object for the IP group identified by the provided ID.
-    #
-    #   >> sig = cs.get_shared_ip_group(127)
-    #   => #<OpenStack::Compute::SharedIPGroup:0x10153ca30  ...>
-    def get_shared_ip_group(id)
-      OpenStack::Compute::SharedIPGroup.new(self,id)
-    end
-    alias :shared_ip_group :get_shared_ip_group
-    
-    # Creates a new Shared IP group.  Takes a hash as an argument.  
-    #
-    # Valid hash keys are :name (required) and :server (optional), which indicates the one server to place into this group by default.
-    #
-    #   >> sig = cs.create_shared_ip_group(:name => "Production Web", :server => 110917) 
-    #   => #<OpenStack::Compute::SharedIPGroup:0x101501d18 ...>
-    #   >> sig.name
-    #   => "Production Web"
-    #   >> sig.servers
-    #   => [110917]
-    def create_shared_ip_group(options)
-      data = JSON.generate(:sharedIpGroup => options)
-      response = csreq("POST",svrmgmthost,"#{svrmgmtpath}/shared_ip_groups",svrmgmtport,svrmgmtscheme,{'content-type' => 'application/json'},data)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      ip_group = JSON.parse(response.body)['sharedIpGroup']
-      OpenStack::Compute::SharedIPGroup.new(self,ip_group['id'])
-    end
-    
     # Returns the current state of the programatic API limits.  Each account has certain limits on the number of resources
     # allowed in the account, and a rate of API operations.
     #
@@ -322,7 +281,7 @@ module Compute
           end
           @http[server].start
         rescue
-          raise ConnectionException, "Unable to connect to #{server}"
+          raise OpenStack::Compute::Exception::Connection, "Unable to connect to #{server}"
         end
       end
     end

data/lib/openstack/compute/image.rb

@@ -38,7 +38,9 @@ module Compute
       @id = data['id']
       @name = data['name']
       @serverId = data['serverId']
-      @updated = DateTime.parse(data['updated'])
+      if data['updated'] then
+         @updated = DateTime.parse(data['updated'])
+      end
       @created = DateTime.parse(data['created'])
       @status = data['status']
       @progress = data['progress']

data/lib/openstack/compute/server.rb

@@ -11,7 +11,6 @@ module Compute
     attr_reader   :hostId
     attr_reader   :imageId
     attr_reader   :flavorId
-    attr_reader   :metadata
     attr_accessor :adminPass
     
     # This class is the representation of a single Server object.  The constructor finds the server identified by the specified
@@ -55,7 +54,6 @@ module Compute
       @hostId    = data["hostId"]
       @imageId   = data["imageId"]
       @flavorId  = data["flavorId"]
-      @metadata  = data["metadata"]
       true
     end
     alias :refresh :populate
@@ -216,72 +214,6 @@ module Compute
       true
     end
     
-    # Provides information about the backup schedule for this server.  Returns a hash of the form 
-    # {"weekly" => state, "daily" => state, "enabled" => boolean}
-    #
-    #   >> server.backup_schedule
-    #   => {"weekly"=>"THURSDAY", "daily"=>"H_0400_0600", "enabled"=>true}
-    def backup_schedule
-      response = @connection.csreq("GET",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(@id.to_s)}/backup_schedule",@svrmgmtport,@svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      JSON.parse(response.body)['backupSchedule']
-    end
-    
-    # Updates the backup schedule for the server.  Takes a hash of the form: {:weekly => state, :daily => state, :enabled => boolean} as an argument.
-    # All three keys (:weekly, :daily, :enabled) must be provided or an exception will get raised.
-    #
-    #   >> server.backup_schedule=({:weekly=>"THURSDAY", :daily=>"H_0400_0600", :enabled=>true})
-    #   => {:weekly=>"THURSDAY", :daily=>"H_0400_0600", :enabled=>true}
-    def backup_schedule=(options)
-      data = JSON.generate('backupSchedule' => options)
-      response = @connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/backup_schedule",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      true
-    end
-    
-    # Removes the existing backup schedule for the server, setting the backups to disabled.
-    #
-    # Returns true if the API call succeeds.
-    #
-    #   >> server.disable_backup_schedule!
-    #   => true
-    def disable_backup_schedule!
-      response = @connection.csreq("DELETE",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/backup_schedule",@svrmgmtport,@svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      true
-    end
-
-    # Share IP between servers in Shared IP group.
-    # Takes a hash of the form: {:sharedIpGroupId => "1234", :ipAddress => "67.23.10.132", :configureServer => false} as an argument.
-    # The :sharedIpGroupId key is required.
-    # The :ipAddress key is required.
-    # The :configureServer key is optional and defaults to false.
-    #
-    #   >> server.share_ip(:sharedIpGroupId => 100, :ipAddress => "67.23.10.132")
-    #   => true
-    def share_ip(options)
-      raise OpenStack::Compute::Exception::MissingArgument, "Shared IP Group ID must be supplied" unless options[:sharedIpGroupId]
-      raise OpenStack::Compute::Exception::MissingArgument, "Ip Address must be supplied" unless options[:ipAddress]
-      options[:configureServer] = false if options[:configureServer].nil?
-      data = JSON.generate(:shareIp => {:sharedIpGroupId => options[:sharedIpGroupId], :configureServer => options[:configureServer]})
-      response = @connection.csreq("PUT",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/ips/public/#{options[:ipAddress]}",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      true
-    end
-
-    # Unshare an IP address.
-    # Takes a hash of the form: {:ipAddress => "67.23.10.132"} as an argument.
-    # The :ipAddress key is required.
-    #
-    #   >> server.unshare_ip(:ipAddress => "67.23.10.132")
-    #   => true
-    def unshare_ip(options)
-      raise OpenStack::Compute::Exception::MissingArgument, "Ip Address must be supplied" unless options[:ipAddress]
-      response = @connection.csreq("DELETE",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/ips/public/#{options[:ipAddress]}",@svrmgmtport,@svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      true
-    end
- 
   end
 end
 end

data/lib/openstack/compute.rb

@@ -32,7 +32,6 @@ module Compute
   require 'compute/server'
   require 'compute/image'
   require 'compute/flavor'
-  require 'compute/shared_ip_group'
   require 'compute/exception'
   
   # Constants that set limits on server creation

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstack-compute
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -05:00
+date: 2011-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,10 @@ files:
 - lib/openstack/compute.rb
 - lib/openstack/compute/authentication.rb
 - lib/openstack/compute/connection.rb
-- lib/openstack/compute/entity_manager.rb
 - lib/openstack/compute/exception.rb
 - lib/openstack/compute/flavor.rb
 - lib/openstack/compute/image.rb
 - lib/openstack/compute/server.rb
-- lib/openstack/compute/shared_ip_group.rb
 has_rdoc: true
 homepage: https://launchpad.net/ruby-openstack-compute
 licenses: []

data/lib/openstack/compute/entity_manager.rb

@@ -1,6 +0,0 @@
-module OpenStack
-module Compute
-  class EntityManager
-  end
-end
-end

data/lib/openstack/compute/shared_ip_group.rb

@@ -1,54 +0,0 @@
-module OpenStack
-module Compute
-  class SharedIPGroup
-    
-    attr_reader :id
-    attr_reader :name
-    attr_reader :servers
-    
-    # Creates a new Shared IP Group object, with information on the group identified by the ID number.  Will most likely be called 
-    # by the get_shared_ip_group method on a OpenStack::Compute::Connection object.
-    #
-    #   >> sig = cs.get_shared_ip_group(127)
-    #   => #<OpenStack::Compute::SharedIPGroup:0x101513798 ...>
-    #   >> sig.name
-    #   => "New Group"
-    def initialize(connection,id)
-      @connection = connection
-      @id = id
-      populate
-    end
-    
-    # Makes the API call that populates the OpenStack::Compute::SharedIPGroup object with information on the group.  Can also be called directly on
-    # an existing object to update its information.
-    # 
-    # Returns true if the API call succeeds.
-    #
-    #   >> sig.populate
-    #   => true
-    def populate
-      response = @connection.csreq("GET",@connection.svrmgmthost,"#{@connection.svrmgmtpath}/shared_ip_groups/#{URI.escape(self.id.to_s)}",@connection.svrmgmtport,@connection.svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      data = JSON.parse(response.body)['sharedIpGroup']
-      @id = data['id']
-      @name = data['name']
-      @servers = data['servers']
-      true
-    end
-    alias :refresh :populate
-    
-    # Deletes the Shared IP Group identified by the current object.
-    #
-    # Returns true if the API call succeeds.
-    #
-    #   >> sig.delete!
-    #   => true
-    def delete!
-      response = @connection.csreq("DELETE",@connection.svrmgmthost,"#{@connection.svrmgmtpath}/shared_ip_groups/#{URI.escape(self.id.to_s)}",@connection.svrmgmtport,@connection.svrmgmtscheme)
-      OpenStack::Compute::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      true
-    end
-    
-  end
-end
-end