Revert "[aws|compute] tweaks for servers"
clientToken is returned by describe_instances, so it should be an
attribute
This reverts commit 7f48b10559
.
This commit is contained in:
parent
e923e3c959
commit
5573dda98b
|
@ -12,6 +12,7 @@ module Fog
|
||||||
attribute :ami_launch_index, :aliases => 'amiLaunchIndex'
|
attribute :ami_launch_index, :aliases => 'amiLaunchIndex'
|
||||||
attribute :availability_zone, :aliases => 'availabilityZone'
|
attribute :availability_zone, :aliases => 'availabilityZone'
|
||||||
attribute :block_device_mapping, :aliases => 'blockDeviceMapping'
|
attribute :block_device_mapping, :aliases => 'blockDeviceMapping'
|
||||||
|
attribute :client_token, :aliases => 'clientToken'
|
||||||
attribute :dns_name, :aliases => 'dnsName'
|
attribute :dns_name, :aliases => 'dnsName'
|
||||||
attribute :groups
|
attribute :groups
|
||||||
attribute :flavor_id, :aliases => 'instanceType'
|
attribute :flavor_id, :aliases => 'instanceType'
|
||||||
|
@ -33,7 +34,7 @@ module Fog
|
||||||
attribute :subnet_id, :aliases => 'subnetId'
|
attribute :subnet_id, :aliases => 'subnetId'
|
||||||
attribute :user_data
|
attribute :user_data
|
||||||
|
|
||||||
attr_accessor :client_token, :password, :username
|
attr_accessor :password, :username
|
||||||
attr_writer :private_key, :private_key_path, :public_key, :public_key_path
|
attr_writer :private_key, :private_key_path, :public_key, :public_key_path
|
||||||
|
|
||||||
def initialize(attributes={})
|
def initialize(attributes={})
|
||||||
|
|
|
@ -23,6 +23,7 @@ describe 'Fog::AWS::Compute::Server' do
|
||||||
it "should remap attributes from parser" do
|
it "should remap attributes from parser" do
|
||||||
server = @servers.new({
|
server = @servers.new({
|
||||||
'amiLaunchIndex' => 'ami_launch_index',
|
'amiLaunchIndex' => 'ami_launch_index',
|
||||||
|
'clientToken' => 'client_token',
|
||||||
'dnsName' => 'dns_name',
|
'dnsName' => 'dns_name',
|
||||||
'imageId' => 'image_id',
|
'imageId' => 'image_id',
|
||||||
'instanceId' => 'instance_id',
|
'instanceId' => 'instance_id',
|
||||||
|
@ -35,6 +36,7 @@ describe 'Fog::AWS::Compute::Server' do
|
||||||
'ramdiskId' => 'ramdisk_id'
|
'ramdiskId' => 'ramdisk_id'
|
||||||
})
|
})
|
||||||
server.ami_launch_index.should == 'ami_launch_index'
|
server.ami_launch_index.should == 'ami_launch_index'
|
||||||
|
server.client_token.should == 'client_token'
|
||||||
server.dns_name.should == 'dns_name'
|
server.dns_name.should == 'dns_name'
|
||||||
server.image_id.should == 'image_id'
|
server.image_id.should == 'image_id'
|
||||||
server.id.should == 'instance_id'
|
server.id.should == 'instance_id'
|
||||||
|
|
Loading…
Reference in New Issue