fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/tests/openstack/requests/compute/helper.rb

@@ -35,3 +35,8 @@ def set_password_enabled
   pw_enabled = ENV['OPENSTACK_SET_PASSWORD_ENABLED'] || "true"
   return pw_enabled == "true"
 end
+
+def get_security_group_ref
+  compute = Fog::Compute[:openstack]
+  ENV['OPENSTACK_SECURITY_GROUP_REF'] || compute.list_security_groups.body['security_groups'].first['name']
+end

data/tests/openstack/requests/compute/server_tests.rb

@@ -49,6 +49,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     @image_id = get_image_ref
     @snapshot_id = nil
     @flavor_id = get_flavor_ref
+    @security_group_name = get_security_group_ref
 
     tests('#create_server("test", #{@image_id} , 19)').formats(@create_format, false) do
       data = Fog::Compute[:openstack].create_server("test", @image_id, @flavor_id).body['server']
@@ -112,6 +113,16 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
       Fog::Compute[:openstack].update_server(@server_id, :name => 'fogupdatedserver')
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
+    
+    #ADD SECURITY GROUP
+    tests("#add_security_group(#{@server_id}, #{@security_group_name})").succeeds do
+      Fog::Compute[:openstack].add_security_group(@server_id, @security_group_name)
+    end
+
+    #REMOVE SECURITY GROUP
+    tests("#remove_security_group(#{@server_id}, #{@security_group_name})").succeeds do
+      Fog::Compute[:openstack].remove_security_group(@server_id, @security_group_name)
+    end
 
     #CREATE IMAGE WITH METADATA
     tests("#create_image(#{@server_id}, 'fog')").formats('image' => @image_format) do

data/tests/openstack/requests/network/security_group_rule_tests.rb

@@ -0,0 +1,58 @@
+Shindo.tests('Fog::Network[:openstack] | security_grouprule requests', ['openstack']) do
+
+  @security_group_rule_format = {
+    "id"                    => String,
+    "remote_group_id"       => Fog::Nullable::String,
+    "direction"             => String,
+    "remote_ip_prefix"      => Fog::Nullable::String,
+    "protocol"              => Fog::Nullable::String,
+    "ethertype"             => String,
+    "port_range_max"        => Fog::Nullable::Integer,
+    "port_range_min"        => Fog::Nullable::Integer,
+    "security_group_id"     => String,
+    "tenant_id"             => String
+  }
+
+  tests('success') do
+    attributes          = {:name => "my_security_group", :description => "tests group"}
+    data                = Fog::Network[:openstack].create_security_group(attributes).body["security_group"]
+    @sec_group_id       = data["id"]
+    @sec_group_rule_id  = nil
+
+    tests("#create_security_group_rule(#{@sec_group_id}, 'ingress', attributes)").formats(@security_group_rule_format) do
+      attributes = {
+        :remote_ip_prefix => "0.0.0.0/0",
+        :protocol         => "tcp",
+        :port_range_min   => 22,
+        :port_range_max   => 22
+      }
+      data = Fog::Network[:openstack].create_security_group_rule(@sec_group_id, 'ingress', attributes).body["security_group_rule"]
+      @sec_group_rule_id = data["id"]
+      data
+    end
+
+    tests("#get_security_group_rule('#{@sec_group_rule_id}')").formats(@security_group_rule_format) do
+      Fog::Network[:openstack].get_security_group_rule(@sec_group_rule_id).body["security_group_rule"]
+    end
+
+    tests("#list_security_group_rules").formats("security_group_rules" => [@security_group_rule_format]) do
+      Fog::Network[:openstack].list_security_group_rules.body
+    end
+
+    tests("#delete_security_group_rule('#{@sec_group_rule_id}')").succeeds do
+      Fog::Network[:openstack].delete_security_group_rule(@sec_group_rule_id)
+    end
+
+  end
+
+  tests('failure') do
+    tests('#get_security_group_rule(0)').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_security_group_rule(0)
+    end
+
+    tests('#delete_security_group_rule(0)').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_security_group_rule(0)
+    end
+  end
+  Fog::Network[:openstack].delete_security_group(@sec_group_id)
+end

data/tests/openstack/requests/network/security_group_tests.rb

@@ -0,0 +1,43 @@
+Shindo.tests('Fog::Network[:openstack] | security_group requests', ['openstack']) do
+
+  @security_group_format = {
+    "id"                    => String,
+    "name"                  => String,
+    "description"           => String,
+    "tenant_id"             => String,
+    "security_group_rules"  => [Hash]
+  }
+
+  tests('success') do
+    @sec_group_id = nil
+
+    tests("#create_security_group('fog_security_group', 'tests group')").formats(@security_group_format) do
+      attributes    = {:name => "fog_security_group", :description => "tests group"}
+      data          = Fog::Network[:openstack].create_security_group(attributes).body["security_group"]
+      @sec_group_id = data["id"]
+      data
+    end
+
+    tests("#get_security_group('#{@sec_group_id}')").formats(@security_group_format) do
+      Fog::Network[:openstack].get_security_group(@sec_group_id).body["security_group"]
+    end
+
+    tests("#list_security_groups").formats('security_groups' => [@security_group_format]) do
+      Fog::Network[:openstack].list_security_groups.body
+    end
+
+    tests("#delete_security_group('#{@sec_group_id}')").succeeds do
+      Fog::Network[:openstack].delete_security_group(@sec_group_id)
+    end
+  end
+
+  tests('failure') do
+    tests("#get_security_group(0)").raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_security_group(0)
+    end
+
+    tests("#delete_security_group(0)").raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_security_group(0)
+    end
+  end
+end

data/tests/rackspace/identity_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
 
   tests('current authentication') do
-    pending if Fog.mocking?
-
     tests('variables populated').returns(200)  do
       @service = Fog::Rackspace::Identity.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
       returns(true, "auth token populated") { !@service.auth_token.nil? }
@@ -14,8 +12,6 @@ Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
   end
 
   tests('reauthentication') do
-    pending if Fog.mocking?
-
     tests('should reauth with valid credentials') do
       @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
       returns(true, "auth token populated") { !@service.auth_token.nil? }

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -198,30 +198,58 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
   end
 
   tests('#setup') do
-    perform_setup = lambda { |attributes|
+    ATTRIBUTES = {
+      :name => "foo",
+      :image_id => 42,
+      :flavor_id => 42
+    }
+
+    create_server = lambda { |attributes|
+      service = Fog::Compute::RackspaceV2.new
+      attributes.merge!(:service => service)
+
       Fog::SSH::Mock.data.clear
 
       server = Fog::Compute::RackspaceV2::Server.new(attributes)
+      server.save(attributes)
 
-      address = 123
+      @address = 123
 
-      server.ipv4_address = address
+      server.ipv4_address = @address
       server.identity = "bar"
       server.public_key = "baz"
 
       server.setup
 
-      Fog::SSH::Mock.data[address].first[:commands]
+      server
+    }
+
+    commands = lambda { 
+      Fog::SSH::Mock.data[@address].first[:commands] 
     }
 
     test("leaves user unlocked only when requested") do
-      perform_setup.call(:service => service, :no_passwd_lock => true)
-                   .none? { |c| c =~ /passwd\s+-l\s+root/ } 
+      create_server.call(ATTRIBUTES.merge(:no_passwd_lock => true))
+      commands.call.none? { |c| c =~ /passwd\s+-l\s+root/ } 
+    end
+
+    test("provide a password when the passed isn't locked") do
+      pwd = create_server.call(
+        ATTRIBUTES.merge(:no_passwd_lock => true)
+      ).password
+
+      # shindo expects a boolean not truthyness :-(
+      !!pwd
     end
 
     test("locks user by default") do
-      perform_setup.call(:service => service)
-                   .one? { |c| c =~ /passwd\s+-l\s+root/ }
+      create_server.call(ATTRIBUTES)
+      commands.call.one? { |c| c =~ /passwd\s+-l\s+root/ }
+    end
+
+    test("nils password when password is locked") do
+      pwd = create_server.call(ATTRIBUTES).password
+      pwd.nil?
     end
   end
 

data/tests/rackspace/models/queues/claim_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -17,7 +15,7 @@ Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
   }
 
   begin
-    model_tests(queue.claims, params, false) do
+    model_tests(queue.claims, params) do
       tests('#messages') do
         returns(1) { @instance.messages.length }
         returns('body') { @instance.messages.first.body['random'] }

data/tests/rackspace/models/queues/claims_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -16,7 +14,7 @@ Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
   }
 
   begin
-    collection_tests(queue.claims, params, false)
+    collection_tests(queue.claims, params)
 
     tests('creating claims when there are no messages') do
 

data/tests/rackspace/models/queues/message_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_instance_#{Time.now.to_i.to_s}",
@@ -11,7 +9,7 @@ Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
     :body => { :key => 'value' }
   }
   begin
-    model_tests(queue.messages, options, false) do
+    model_tests(queue.messages, options) do
       tests('#href').returns(true) do
         !@instance.href.nil?
       end

data/tests/rackspace/models/queues/messages_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -12,7 +10,7 @@ Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
     :body => "blah"
   }
 
-  collection_tests(queue.messages, options, false)
+  collection_tests(queue.messages, options)
 
   queue.destroy
 end

data/tests/rackspace/models/queues/queue_tests.rb

@@ -1,12 +1,10 @@
 Shindo.tests('Fog::Rackspace::Queues | queue', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
-  model_tests(service.queues, options, false) do
+  model_tests(service.queues, options) do
 
     tests('#stats').formats(QUEUE_STATS_FORMAT['messages']) do
       @instance.stats

data/tests/rackspace/models/queues/queues_tests.rb

@@ -1,10 +1,8 @@
 Shindo.tests('Fog::Rackspace::Queues | queues', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
-  collection_tests(service.queues, options, false)
+  collection_tests(service.queues, options)
 end

data/tests/rackspace/models/storage/account_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Storage | account', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @account = Fog::Storage[:rackspace].account
 
   tests('load') do

data/tests/rackspace/models/storage/directories_tests.rb

@@ -1,10 +1,7 @@
 Shindo.tests('Fog::Rackspace::Storage | directories', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @service = Fog::Storage[:rackspace]
 
-
   begin
     @name = "fog-directories-test-#{Time.now.to_i.to_s}"
     @filename = 'lorem.txt'    

data/tests/rackspace/models/storage/directory_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Storage | directory', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @service = Fog::Storage[:rackspace]
   
   def container_meta_attributes
@@ -92,9 +90,8 @@ Shindo.tests('Fog::Rackspace::Storage | directory', ['rackspace']) do
 
    directory_attributes[:metadata] = {:draft => 'true'}
 
-   tests('metadata')  do
-     pending if Fog.mocking?
-     
+   tests('metadata') do
+
      model_tests(@service.directories, directory_attributes, Fog.mocking?) do
        tests('sets metadata on create').returns('true') do
          @instance.metadata.data

data/tests/rackspace/models/storage/file_tests.rb

@@ -30,8 +30,6 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
     end
   end
 
-  pending if Fog.mocking?
-
   def object_attributes(file=@instance)
     @instance.service.head_object(@directory.key, file.key).headers
   end
@@ -280,6 +278,55 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
 
     end
 
+    tests("#delete_at") do
+      tests("#delete_at should default to nil").returns(nil) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = 1
+      @instance.save
+      tests("#delete_at should return delete_at attribute").returns(1) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = 1
+      @instance.save
+      tests("#delete_at= should update delete_at").returns(2) do
+        @instance.delete_at = 2
+        @instance.save
+        @instance.delete_at
+      end
+
+      tests("#delete_at= should not blow up on nil") do
+        @instance.delete_at = nil
+        @instance.save
+      end
+    end
+
+    tests("#delete_after") do
+      tests("#delete_after should default to nil").returns(nil) do
+        @instance.delete_after
+      end
+
+      @instance.delete_after = 1
+      @instance.save
+      tests("#delete_after should return delete_after attribute").returns(1) do
+        @instance.delete_after
+      end
+
+      @instance.delete_after = 1
+      @instance.save
+      tests("#delete_after= should update delete_after").returns(2) do
+        @instance.delete_after = 2
+        @instance.save
+        @instance.delete_after
+      end
+
+      tests("#delete_after= should not blow up on nil") do
+        @instance.delete_after = nil
+        @instance.save
+      end
+    end
   end
 
 

data/tests/rackspace/models/storage/files_tests.rb

@@ -12,8 +12,7 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do
 
 
   tests('success') do
-    pending if Fog.mocking?
-    collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, false)
+    collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, Fog.mocking?)
 
     @service = Fog::Storage.new :provider => 'rackspace', :rackspace_temp_url_key => "my_secret"
 
@@ -25,13 +24,11 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do
     end
 
     tests("#get_http_url('#{@directory.key}')").succeeds do
-      pending if Fog.mocking?
       expire_time = Time.now + 3600
       @directory.files.get_http_url(@file.key, expire_time)
     end
 
     tests("#get_https_url('#{@directory.key}', '#{@file.key}')").succeeds do
-      pending if Fog.mocking?
       expire_time = Time.now + 3600
       @directory.files.get_https_url(@file.key, expire_time)
     end