From 1b4e14f2dfd087a1bbc0244eaee3eed6b5e959d2 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Mon, 27 Jan 2014 11:18:44 -0600 Subject: [PATCH] [rackspace|compute_v2] added key_name and modified key_pair= to take KeyPair objects as well as strings in order to be more compatible with other fog providers. --- lib/fog/rackspace/models/compute_v2/server.rb | 36 +++++++++++++++++-- .../requests/compute_v2/create_server.rb | 8 ++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/lib/fog/rackspace/models/compute_v2/server.rb b/lib/fog/rackspace/models/compute_v2/server.rb index d25978c05..8d32c0975 100644 --- a/lib/fog/rackspace/models/compute_v2/server.rb +++ b/lib/fog/rackspace/models/compute_v2/server.rb @@ -137,10 +137,16 @@ module Fog # @return [String] The image Id. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html attribute :image_id, :aliases => 'image', :squash => 'id' + # @!attribute [r] password # @return [String] Password for system adminstrator account. # @note This value is ONLY populated on server creation. - attr_reader :password + attr_reader :password + + # @!attribute [rw] key_name + # @return [String] The name of the key_pair used for server. + # @note The key_pair/key_name is used to specify the keypair used for server creation. It is not populated by cloud servers. + attribute :key_name def initialize(attributes={}) @@ -170,6 +176,27 @@ module Fog metadata.from_hash(hash) end + # Returns the key pair based on the key_name of the server + # @return [KeyPair] + # @note The key_pair/key_name is used to specify the keypair used for server creation. It is not populated by cloud servers. + def key_pair + requires :key_name + + service.key_pairs.get(key_name) + end + + # Sets the key_pair used by the server. + # @param new_keypair [KeyPair] key_pair object for server + # @note The key_pair/key_name is used to specify the keypair used for server creation. It is not populated by cloud servers. + def key_pair=(new_keypair) + if new_keypair.is_a?(String) + Fog::Logger.deprecation("#key_pair= should be used to set KeyPair objects. Please use #key_name method instead") + self.key_name = new_keypair + else + self.key_name = new_keypair && new_keypair.name + end + end + # Saves the server. # Creates server if it is new, otherwise it will update server attributes name, accessIPv4, and accessIPv6. # @return [Boolean] true if server has started saving @@ -201,11 +228,16 @@ module Fog requires :name, :image_id, :flavor_id modified_options = Marshal.load(Marshal.dump(options)) + if attributes[:keypair] + Fog::Logger.deprecation(":keypair has been depreciated. Please use :key_name instead.") + modified_options[:key_name] = attributes[:keypair] + end + modified_options[:networks] ||= attributes[:networks] modified_options[:disk_config] = disk_config unless disk_config.nil? modified_options[:metadata] = metadata.to_hash unless @metadata.nil? modified_options[:personality] = personality unless personality.nil? - modified_options[:keypair] ||= attributes[:keypair] + modified_options[:key_name] ||= attributes[:key_name] if modified_options[:networks] modified_options[:networks].map! { |id| { :uuid => id } } diff --git a/lib/fog/rackspace/requests/compute_v2/create_server.rb b/lib/fog/rackspace/requests/compute_v2/create_server.rb index d41357b03..a1b9fbcf2 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_server.rb @@ -59,7 +59,13 @@ module Fog { :uuid => '00000000-0000-0000-0000-000000000000' }, { :uuid => '11111111-1111-1111-1111-111111111111' } ] - data['server']['key_name'] = options[:keypair] unless options[:keypair].nil? + + if options[:keypair] + Fog::Logger.deprecation(":keypair has been depreciated. Please use :key_name instead.") + options[:key_name] = options[:keypair] + end + + data['server']['key_name'] = options[:key_name] unless options[:key_name].nil? request( :body => Fog::JSON.encode(data),