From 7f48b10559525f22728f841cd9582108773a3602 Mon Sep 17 00:00:00 2001 From: geemus Date: Mon, 4 Oct 2010 15:53:58 -0700 Subject: [PATCH] [aws|compute] tweaks for servers --- lib/fog/aws/models/compute/server.rb | 3 +-- spec/aws/models/compute/server_spec.rb | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/fog/aws/models/compute/server.rb b/lib/fog/aws/models/compute/server.rb index aea57c863..a54738e95 100644 --- a/lib/fog/aws/models/compute/server.rb +++ b/lib/fog/aws/models/compute/server.rb @@ -12,7 +12,6 @@ module Fog attribute :ami_launch_index, :aliases => 'amiLaunchIndex' attribute :availability_zone, :aliases => 'availabilityZone' attribute :block_device_mapping, :aliases => 'blockDeviceMapping' - attribute :client_token, :aliases => 'clientToken' attribute :dns_name, :aliases => 'dnsName' attribute :groups attribute :flavor_id, :aliases => 'instanceType' @@ -34,7 +33,7 @@ module Fog attribute :subnet_id, :aliases => 'subnetId' attribute :user_data - attr_accessor :password, :username + attr_accessor :client_token, :password, :username attr_writer :private_key, :private_key_path, :public_key, :public_key_path def initialize(attributes={}) diff --git a/spec/aws/models/compute/server_spec.rb b/spec/aws/models/compute/server_spec.rb index 8fa896ed4..a3ac50761 100644 --- a/spec/aws/models/compute/server_spec.rb +++ b/spec/aws/models/compute/server_spec.rb @@ -23,7 +23,6 @@ describe 'Fog::AWS::Compute::Server' do it "should remap attributes from parser" do server = @servers.new({ 'amiLaunchIndex' => 'ami_launch_index', - 'clientToken' => 'client_token', 'dnsName' => 'dns_name', 'imageId' => 'image_id', 'instanceId' => 'instance_id', @@ -36,7 +35,6 @@ describe 'Fog::AWS::Compute::Server' do 'ramdiskId' => 'ramdisk_id' }) server.ami_launch_index.should == 'ami_launch_index' - server.client_token.should == 'client_token' server.dns_name.should == 'dns_name' server.image_id.should == 'image_id' server.id.should == 'instance_id'