brightbox-cli 0.13.1 → 0.14.0

data/lib/brightbox-cli/vendor/fog/tests/aws/models/auto_scaling/activities_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('AWS::AutoScaling | activities', ['aws', 'auto_scaling_m']) do
 
   pending # FIXME: activity#save is not implemented
-  collection_tests(AWS[:auto_scaling].activities, {}, false)
+  collection_tests(Fog::AWS[:auto_scaling].activities, {}, false)
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/auto_scaling/configuration_test.rb

@@ -6,7 +6,7 @@ Shindo.tests('AWS::AutoScaling | configuration', ['aws', 'auto_scaling_m']) do
     :instance_type => 't1.micro'
   }
 
-  model_tests(AWS[:auto_scaling].configurations, params, false) do
+  model_tests(Fog::AWS[:auto_scaling].configurations, params, false) do
     @instance.wait_for { ready? }
   end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/models/auto_scaling/configurations_tests.rb

@@ -6,6 +6,6 @@ Shindo.tests('AWS::AutoScaling | configurations', ['aws', 'auto_scaling_m']) do
     :instance_type => 't1.micro'
   }
 
-  collection_tests(AWS[:auto_scaling].configurations, params, false)
+  collection_tests(Fog::AWS[:auto_scaling].configurations, params, false)
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/auto_scaling/instances_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('AWS::AutoScaling | instances', ['aws', 'auto_scaling_m']) do
 
   pending # FIXME: instance#save is not defined
-  #collection_tests(AWS[:auto_scaling].instances, {}, false)
+  #collection_tests(Fog::AWS[:auto_scaling].instances, {}, false)
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/cloud_watch/metric_statistics_tests.rb

@@ -12,7 +12,7 @@ Shindo.tests("AWS::CloudWatch | metric_statistics", ['aws', 'cloudwatch']) do
     statisticTypes = ['Minimum','Maximum','Sum','SampleCount','Average']
     
     tests("#all").succeeds do
-      @statistics = AWS[:cloud_watch].metric_statistics.all({'Statistics' => statisticTypes, 'StartTime' => startTime, 'EndTime' => endTime, 'Period' => period, 'MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => [{'Name' => 'InstanceId', 'Value' => instanceId}]})
+      @statistics = Fog::AWS[:cloud_watch].metric_statistics.all({'Statistics' => statisticTypes, 'StartTime' => startTime, 'EndTime' => endTime, 'Period' => period, 'MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => [{'Name' => 'InstanceId', 'Value' => instanceId}]})
     end
     
     tests("#all_not_empty").returns(true) do
@@ -26,11 +26,11 @@ Shindo.tests("AWS::CloudWatch | metric_statistics", ['aws', 'cloudwatch']) do
       :unit => 'None'
     }
     tests('#new').returns(new_attributes) do
-      AWS[:cloud_watch].metric_statistics.new(new_attributes).attributes
+      Fog::AWS[:cloud_watch].metric_statistics.new(new_attributes).attributes
     end
     
     tests('#create').returns(new_attributes) do
-      AWS[:cloud_watch].metric_statistics.create(new_attributes).attributes
+      Fog::AWS[:cloud_watch].metric_statistics.create(new_attributes).attributes
     end
     
     stats_set_attributes = {
@@ -44,7 +44,7 @@ Shindo.tests("AWS::CloudWatch | metric_statistics", ['aws', 'cloudwatch']) do
       :unit => 'None'
     }
     tests('#create_stats_set').returns(stats_set_attributes) do
-      AWS[:cloud_watch].metric_statistics.create(stats_set_attributes).attributes
+      Fog::AWS[:cloud_watch].metric_statistics.create(stats_set_attributes).attributes
     end
   end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/models/cloud_watch/metrics_tests.rb

@@ -3,13 +3,13 @@ Shindo.tests("AWS::CloudWatch | metrics", ['aws', 'cloudwatch']) do
   tests('success') do
     pending # FIXME: the hardcoded instance id won't be available
     tests("#all").succeeds do
-      AWS[:cloud_watch].metrics.all
+      Fog::AWS[:cloud_watch].metrics.all
     end
     instanceId = 'i-fd713391'
     metricName = 'CPUUtilization'
     namespace = 'AWS/EC2'
     tests("#get").returns({:dimensions=>[{"Name"=>"InstanceId", "Value"=>instanceId}], :name=>metricName, :namespace=>namespace}) do
-      AWS[:cloud_watch].metrics.get(namespace, metricName, {'InstanceId' => instanceId}).attributes
+      Fog::AWS[:cloud_watch].metrics.get(namespace, metricName, {'InstanceId' => instanceId}).attributes
     end
     
   end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elb/model_tests.rb

@@ -5,13 +5,13 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
   tests('success') do
     tests('load_balancers') do
       tests('getting a missing elb') do
-        returns(nil) { AWS[:elb].load_balancers.get('no-such-elb') }
+        returns(nil) { Fog::AWS[:elb].load_balancers.get('no-such-elb') }
       end
     end
 
     tests('listeners') do
       tests("default attributes") do
-        listener = AWS[:elb].listeners.new
+        listener = Fog::AWS[:elb].listeners.new
         tests('instance_port is 80').returns(80) { listener.instance_port }
         tests('lb_port is 80').returns(80) { listener.lb_port }
         tests('protocol is HTTP').returns('HTTP') { listener.protocol }
@@ -20,7 +20,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
 
       tests("specifying attributes") do
         attributes = {:instance_port => 2000, :lb_port => 2001, :protocol => 'SSL', :policy_names => ['fake'] }
-        listener = AWS[:elb].listeners.new(attributes)
+        listener = Fog::AWS[:elb].listeners.new(attributes)
         tests('instance_port is 2000').returns(2000) { listener.instance_port }
         tests('lb_port is 2001').returns(2001) { listener.lb_port }
         tests('protocol is SSL').returns('SSL') { listener.protocol }
@@ -33,27 +33,27 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
 
     tests('create') do
       tests('without availability zones') do
-        elb = AWS[:elb].load_balancers.create(:id => elb_id)
+        elb = Fog::AWS[:elb].load_balancers.create(:id => elb_id)
         tests("availability zones are correct").returns(@availability_zones.sort) { elb.availability_zones.sort }
         tests("dns names is set").returns(true) { elb.dns_name.is_a?(String) }
         tests("created_at is set").returns(true) { Time === elb.created_at }
         tests("policies is empty").returns([]) { elb.policies }
         tests("default listener") do
           tests("1 listener").returns(1) { elb.listeners.size }
-          tests("params").returns(AWS[:elb].listeners.new.to_params) { elb.listeners.first.to_params }
+          tests("params").returns(Fog::AWS[:elb].listeners.new.to_params) { elb.listeners.first.to_params }
         end
       end
 
       tests('with availability zones') do
         azs = @availability_zones[1..-1]
-        elb2 = AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :availability_zones => azs)
+        elb2 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :availability_zones => azs)
         tests("availability zones are correct").returns(azs.sort) { elb2.availability_zones.sort }
         elb2.destroy
       end
 
       # Need to sleep here for IAM changes to propgate
       tests('with ListenerDescriptions') do
-        @certificate = AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT_PUBLIC_KEY, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
+        @certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT_PUBLIC_KEY, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
         sleep(8) unless Fog.mocking?
         listeners = [{
             'Listener' => {
@@ -67,7 +67,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
             },
             'PolicyNames' => []
           }]
-        elb3 = AWS[:elb].load_balancers.create(:id => "#{elb_id}-3", 'ListenerDescriptions' => listeners)
+        elb3 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-3", 'ListenerDescriptions' => listeners)
         tests('there are 2 listeners').returns(2) { elb3.listeners.count }
         tests('instance_port is 2030').returns(2030) { elb3.listeners.first.instance_port }
         tests('lb_port is 2030').returns(2030) { elb3.listeners.first.lb_port }
@@ -81,23 +81,23 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
           'Listener' => {
           'LoadBalancerPort' => 443, 'InstancePort' => 80, 'Protocol' => 'HTTPS', "SSLCertificateId" => "fakecert"}
         }]
-        AWS[:elb].load_balancers.create(:id => "#{elb_id}-4", "ListenerDescriptions" => listeners)
+        Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-4", "ListenerDescriptions" => listeners)
       end
     end
 
     tests('all') do
-      elb_ids = AWS[:elb].load_balancers.all.map{|e| e.id}
+      elb_ids = Fog::AWS[:elb].load_balancers.all.map{|e| e.id}
       tests("contains elb").returns(true) { elb_ids.include? elb_id }
     end
 
     tests('get') do
-      elb_get = AWS[:elb].load_balancers.get(elb_id)
+      elb_get = Fog::AWS[:elb].load_balancers.get(elb_id)
       tests('ids match').returns(elb_id) { elb_get.id }
     end
 
     tests('creating a duplicate elb') do
       raises(Fog::AWS::ELB::IdentifierTaken) do
-        AWS[:elb].load_balancers.create(:id => elb_id, :availability_zones => ['us-east-1d'])
+        Fog::AWS[:elb].load_balancers.create(:id => elb_id, :availability_zones => ['us-east-1d'])
       end
     end
 
@@ -246,6 +246,6 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       elb.destroy
     end
 
-    AWS[:iam].delete_server_certificate(@key_name)
+    Fog::AWS[:iam].delete_server_certificate(@key_name)
   end
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/parameter_group_tests.rb

@@ -4,7 +4,7 @@ Shindo.tests("AWS::RDS | parameter_group", ['aws', 'rds']) do
   params = {:id => group_name, :family => 'mysql5.1', :description => group_name}
 
   pending if Fog.mocking?
-  model_tests(AWS[:rds].parameter_groups, params, false) do
+  model_tests(Fog::AWS[:rds].parameter_groups, params, false) do
     tests('#parameters') do
       #search for a sample parameter
       tests 'contains parameters' do

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/parameter_groups_tests.rb

@@ -4,5 +4,5 @@ Shindo.tests("AWS::RDS | parameter_groups", ['aws', 'rds']) do
   params = {:id => group_name, :family => 'mysql5.1', :description => group_name}
 
   pending if Fog.mocking?
-  collection_tests(AWS[:rds].parameter_groups, params, false)
+  collection_tests(Fog::AWS[:rds].parameter_groups, params, false)
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/security_group_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests("AWS::RDS | security_group", ['aws', 'rds']) do
   params = {:id => group_name, :description => 'fog test'}
 
   pending if Fog.mocking?
-  model_tests(AWS[:rds].security_groups, params, false) do
+  model_tests(Fog::AWS[:rds].security_groups, params, false) do
 
     tests("#description").returns('fog test') { @instance.description }
 

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/security_groups_tests.rb

@@ -2,5 +2,5 @@ Shindo.tests("AWS::RDS | security groups", ['aws', 'rds']) do
   params = {:id => 'fog-test', :description => 'fog test'}
 
   pending if Fog.mocking?
-  collection_tests(AWS[:rds].security_groups, params, false)
+  collection_tests(Fog::AWS[:rds].security_groups, params, false)
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/server_tests.rb

@@ -2,9 +2,9 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
 
   pending if Fog.mocking?
 
-  model_tests(AWS[:rds].servers, rds_default_server_params, false) do
+  model_tests(Fog::AWS[:rds].servers, rds_default_server_params, false) do
     # We'll need this later; create it early to avoid waiting
-    @instance_with_final_snapshot = AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test"), :backup_retention_period => 1))
+    @instance_with_final_snapshot = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test"), :backup_retention_period => 1))
 
     @instance.wait_for(20*60) { ready? }
 
@@ -26,10 +26,10 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
 
     tests("#modify").succeeds do
       orig_parameter_group = @instance.db_parameter_groups.first['DBParameterGroupName']
-      parameter_group = AWS[:rds].parameter_groups.create(:id => uniq_id, :family => 'mysql5.1', :description => 'fog-test')
+      parameter_group = Fog::AWS[:rds].parameter_groups.create(:id => uniq_id, :family => 'mysql5.1', :description => 'fog-test')
 
       orig_security_groups = @instance.db_security_groups.map{|h| h['DBSecurityGroupName']}
-      security_group = AWS[:rds].security_groups.create(:id => uniq_id, :description => 'fog-test')
+      security_group = Fog::AWS[:rds].security_groups.create(:id => uniq_id, :description => 'fog-test')
 
       modify_options = {
         'DBParameterGroupName' => parameter_group.id,
@@ -92,7 +92,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       @instance_with_final_snapshot.wait_for { ready? }
       @instance_with_final_snapshot.destroy(final_snapshot_id)
       returns(true, "Final snapshot created") do
-        @final_snapshot = AWS[:rds].snapshots.get(final_snapshot_id)
+        @final_snapshot = Fog::AWS[:rds].snapshots.get(final_snapshot_id)
         !@final_snapshot.nil?
       end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/servers_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests("AWS::RDS | servers", ['aws', 'rds']) do
 
   pending if Fog.mocking?
 
-  collection_tests(AWS[:rds].servers, rds_default_server_params, false) do
+  collection_tests(Fog::AWS[:rds].servers, rds_default_server_params, false) do
     @instance.wait_for { ready? }
   end
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/snapshot_tests.rb

@@ -2,11 +2,11 @@ Shindo.tests("AWS::RDS | snapshot", ['aws', 'rds']) do
 
   pending if Fog.mocking?
 
-  @server = AWS[:rds].servers.create(rds_default_server_params)
+  @server = Fog::AWS[:rds].servers.create(rds_default_server_params)
   @server.wait_for { ready? }
 
   params = {:id => uniq_id, :instance_id => @server.id}
-  model_tests(AWS[:rds].snapshots, params, false) do
+  model_tests(Fog::AWS[:rds].snapshots, params, false) do
     @instance.wait_for { ready? }
   end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/models/rds/snapshots_tests.rb

@@ -2,11 +2,11 @@ Shindo.tests("AWS::RDS | snapshots", ['aws', 'rds']) do
 
   pending if Fog.mocking?
 
-  @server = AWS[:rds].servers.create(rds_default_server_params)
+  @server = Fog::AWS[:rds].servers.create(rds_default_server_params)
   @server.wait_for { ready? }
 
   params = {:id => uniq_id, :instance_id => @server.id}
-  collection_tests(AWS[:rds].snapshots, params, false) do
+  collection_tests(Fog::AWS[:rds].snapshots, params, false) do
     @instance.wait_for { ready? }
   end
 

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/auto_scaling/auto_scaling_tests.rb

@@ -6,75 +6,75 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
     pending if Fog.mocking?
 
     tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do
-      AWS[:auto_scaling].describe_adjustment_types.body
+      Fog::AWS[:auto_scaling].describe_adjustment_types.body
     end
     tests("#describe_metric_collection_types").formats(AWS::AutoScaling::Formats::DESCRIBE_METRIC_COLLECTION_TYPES) do
-      AWS[:auto_scaling].describe_metric_collection_types.body
+      Fog::AWS[:auto_scaling].describe_metric_collection_types.body
     end
     tests("#describe_scaling_process_types").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_PROCESS_TYPES) do
-      AWS[:auto_scaling].describe_scaling_process_types.body
+      Fog::AWS[:auto_scaling].describe_scaling_process_types.body
     end
 
     tests("#create_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do
       image_id = 'ami-8c1fece5'
       instance_type = 't1.micro'
       #listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'http'}]
-      AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name).body
+      Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name).body
     end
 
     tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do
-      AWS[:auto_scaling].describe_launch_configurations().body
+      Fog::AWS[:auto_scaling].describe_launch_configurations().body
     end
     tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do
-      AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body
+      Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body
     end
     tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do
-      AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => [@lc_name]).body
+      Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => [@lc_name]).body
     end
 
     tests("#create_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do
       zones = ['us-east-1d']
       max_size = 0
       min_size = 0
-      AWS[:auto_scaling].create_auto_scaling_group(@asg_name, zones, @lc_name, max_size, min_size).body
+      Fog::AWS[:auto_scaling].create_auto_scaling_group(@asg_name, zones, @lc_name, max_size, min_size).body
     end
 
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
-      AWS[:auto_scaling].describe_auto_scaling_groups().body
+      Fog::AWS[:auto_scaling].describe_auto_scaling_groups().body
     end
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
-      AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => @asg_name).body
+      Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => @asg_name).body
     end
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
-      AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => [@asg_name]).body
+      Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => [@asg_name]).body
     end
 
     tests("#describe_auto_scaling_instances").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_INSTANCES) do
-      AWS[:auto_scaling].describe_auto_scaling_instances().body
+      Fog::AWS[:auto_scaling].describe_auto_scaling_instances().body
     end
 
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
-      AWS[:auto_scaling].describe_scaling_activities().body
+      Fog::AWS[:auto_scaling].describe_scaling_activities().body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
-      AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body
+      Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
-      AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body
+      Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body
     end
     tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
-      AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body
+      Fog::AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body
     end
 
     tests("#set_desired_capacity").formats(AWS::AutoScaling::Formats::BASIC) do
       desired_capacity = 0
-      AWS[:auto_scaling].set_desired_capacity(@asg_name, desired_capacity).body
+      Fog::AWS[:auto_scaling].set_desired_capacity(@asg_name, desired_capacity).body
     end
     tests("#delete_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do
-      AWS[:auto_scaling].delete_auto_scaling_group(@asg_name).body
+      Fog::AWS[:auto_scaling].delete_auto_scaling_group(@asg_name).body
     end
     tests("#delete_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do
-      AWS[:auto_scaling].delete_launch_configuration(@lc_name).body
+      Fog::AWS[:auto_scaling].delete_launch_configuration(@lc_name).body
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/auto_scaling/model_tests.rb

@@ -8,55 +8,55 @@ Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
 
     tests('configurations') do
       tests('getting a missing configuration') do
-        returns(nil) { AWS[:auto_scaling].configurations.get('fog-no-such-lc') }
+        returns(nil) { Fog::AWS[:auto_scaling].configurations.get('fog-no-such-lc') }
       end
 
       tests('create configuration') do
-        lc = AWS[:auto_scaling].configurations.create(:id => lc_id, :image_id => 'ami-8c1fece5', :instance_type => 't1.micro')
+        lc = Fog::AWS[:auto_scaling].configurations.create(:id => lc_id, :image_id => 'ami-8c1fece5', :instance_type => 't1.micro')
         #tests("dns names is set").returns(true) { lc.dns_name.is_a?(String) }
         tests("created_at is set").returns(true) { Time === lc.created_at }
         #tests("policies is empty").returns([]) { lc.policies }
       end
 
       tests('all configurations') do
-        lc_ids = AWS[:auto_scaling].configurations.all.map{|e| e.id}
+        lc_ids = Fog::AWS[:auto_scaling].configurations.all.map{|e| e.id}
         tests("contains lc").returns(true) { lc_ids.include? lc_id }
       end
 
       tests('get configuration') do
-        lc2 = AWS[:auto_scaling].configurations.get(lc_id)
+        lc2 = Fog::AWS[:auto_scaling].configurations.get(lc_id)
         tests('ids match').returns(lc_id) { lc2.id }
       end
 
       tests('creating a duplicate configuration') do
         raises(Fog::AWS::AutoScaling::IdentifierTaken) do
-          AWS[:auto_scaling].configurations.create(:id => lc_id, :image_id => 'ami-8c1fece5', :instance_type => 't1.micro')
+          Fog::AWS[:auto_scaling].configurations.create(:id => lc_id, :image_id => 'ami-8c1fece5', :instance_type => 't1.micro')
         end
       end
     end
 
     tests('groups') do
       tests('getting a missing group') do
-        returns(nil) { AWS[:auto_scaling].groups.get('fog-no-such-asg') }
+        returns(nil) { Fog::AWS[:auto_scaling].groups.get('fog-no-such-asg') }
       end
 
       asg = nil
       asg_id = 'fog-model-asg'
 
       tests('create') do
-        asg = AWS[:auto_scaling].groups.create(:id => asg_id, :availability_zones => ['us-east-1d'], :launch_configuration_name => lc_id)
+        asg = Fog::AWS[:auto_scaling].groups.create(:id => asg_id, :availability_zones => ['us-east-1d'], :launch_configuration_name => lc_id)
         #tests("dns names is set").returns(true) { asg.dns_name.is_a?(String) }
         tests("created_at is set").returns(true) { Time === asg.created_at }
         #tests("policies is empty").returns([]) { asg.policies }
       end
 
       tests('all') do
-        asg_ids = AWS[:auto_scaling].groups.all.map{|e| e.id}
+        asg_ids = Fog::AWS[:auto_scaling].groups.all.map{|e| e.id}
         tests("contains asg").returns(true) { asg_ids.include? asg_id }
       end
 
       tests('get') do
-        asg2 = AWS[:auto_scaling].groups.get(asg_id)
+        asg2 = Fog::AWS[:auto_scaling].groups.get(asg_id)
         tests('ids match').returns(asg_id) { asg2.id }
       end
 
@@ -72,7 +72,7 @@ Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
 
       tests('creating a duplicate group') do
         raises(Fog::AWS::AutoScaling::IdentifierTaken) do
-          AWS[:auto_scaling].groups.create(:id => asg_id, :availability_zones => ['us-east-1d'], :launch_configuration_name => lc_id)
+          Fog::AWS[:auto_scaling].groups.create(:id => asg_id, :availability_zones => ['us-east-1d'], :launch_configuration_name => lc_id)
         end
       end
 
@@ -97,7 +97,7 @@ Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
       end
     end
 
-    #server = AWS[:compute].servers.create
+    #server = Fog::AWS[:compute].servers.create
     #tests('register instance') do
     #  begin
     #    elb.register_instances(server.id)