fog 1.3.0 → 1.4.0

data/lib/fog/xenserver/requests/compute/insert_vbd.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def insert_vbd(ref, vdi_ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.insert'}, ref, vdi_ref)
+        end
+
+      end
+
+      class Mock
+
+        def insert_vbd(ref, vdi_ref, extra_args = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/provision_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class XenServer
+      class Real
+        
+        def provision_server( ref )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.provision'}, ref)
+        end
+
+      end
+
+      class Mock
+
+        def provision_server( ref )
+          Fog::Mock.not_implemented
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/reboot_server.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class  XenServer
+
+      class Real
+        
+        def reboot_server( ref, stype = 'clean' )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_shutdown"}, ref)
+        end
+        
+      end
+      
+      class Mock
+        
+        def reboot_server( ref, stype )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/scan_sr.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def scan_sr( ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'SR.scan'}, ref)
+        end
+
+      end
+
+      class Mock
+
+        def scan_sr(ref, extra_args = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/set_affinity.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+        
+        require 'fog/xenserver/parser'
+        
+        def set_affinity( host_ref )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.set_affinity'}, host_ref)
+        end
+        
+      end
+      
+      class Mock
+        
+        def set_affinity( uuid )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/set_attribute.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+        
+        require 'fog/xenserver/parser'
+        
+        def set_attribute( klass, ref, attr_name, *value )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "#{klass}.set_#{attr_name.gsub('-','_')}"}, ref, *value)
+        end
+        
+      end
+      
+      class Mock
+        
+        def set_attribute( klass, ref, attr_name, value )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/shutdown_server.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class  XenServer
+
+      class Real
+        
+        def shutdown_server( vm_ref, stype = 'clean' )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_shutdown"}, vm_ref)
+        end
+        
+      end
+      
+      class Mock
+        
+        def shutdown_server( vm_ref )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/start_server.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+
+    class XenServer
+      class Real
+        
+        def start_server( vm_ref )
+          start_vm( vm_ref )
+        end
+        
+      end
+      
+      class Mock
+        
+        def start_server( vm_ref )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/start_vm.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class  XenServer
+
+      class Real
+        
+        # http://bit.ly/8ZPyCN
+        # VM.start( session, VM_ref, start_paused, force)
+        def start_vm( vm_ref )
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.start'}, vm_ref, false, false)
+        end
+        
+      end
+      
+      class Mock
+        
+        def start_vm( vm_ref )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/unplug_vbd.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def unplug_vbd( vbd_ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.unplug'}, vbd_ref)
+        end
+
+        def unplug_force_vbd(ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.unplug_force'}, ref)
+        end
+
+      end
+
+      class Mock
+
+        def unplug_vbd(ref, extra_args = {})
+          Fog::Mock.not_implemented
+        end
+
+        def unplug_force_vbd(ref, extra_args = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/utilities.rb

@@ -0,0 +1,8 @@
+class Hash
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key)] = delete(key) if key.respond_to?(:to_sym) && !key.is_a?(Fixnum)
+    end
+    self
+  end
+end

data/lib/fog/xenserver.rb

@@ -0,0 +1,56 @@
+module Fog
+  module XenServer 
+
+    class InvalidLogin < Fog::Errors::Error; end
+    class NotFound < Fog::Errors::Error; end
+    class RequestFailed < Fog::Errors::Error; end
+
+    extend Fog::Provider
+    
+    service(:compute, 'xenserver/compute', 'Compute')  
+    
+    class Connection
+      require 'xmlrpc/client'
+    
+      def initialize(host)
+        @factory = XMLRPC::Client.new(host, '/')
+        @factory.set_parser(XMLRPC::XMLParser::REXMLStreamParser.new)
+      end
+    
+      def authenticate( username, password )
+        response = @factory.call('session.login_with_password', username, password )
+        raise Fog::XenServer::InvalidLogin.new unless response["Status"] =~ /Success/
+        @credentials = response["Value"]
+      end
+    
+      def request(options, *params)
+        begin
+          parser   = options.delete(:parser)
+          method   = options.delete(:method)
+          
+          if params.empty?
+            response = @factory.call(method, @credentials)
+          else
+            if params.length.eql?(1) and params.first.is_a?(Hash)
+              response = @factory.call(method, @credentials, params.first)
+            elsif params.length.eql?(2) and params.last.is_a?(Array)
+              response = @factory.call(method, @credentials, params.first, params.last)
+            else
+              response = eval("@factory.call('#{method}', '#{@credentials}', #{params.map {|p|  p.is_a?(String) ? "'#{p}'" : p}.join(',')})")
+            end
+          end
+          raise RequestFailed.new("#{method}: " + response["ErrorDescription"].to_s) unless response["Status"].eql? "Success"
+          if parser
+            parser.parse( response["Value"] )
+            response = parser.response
+          end
+          
+          response
+        end
+      end
+    end
+
+  end
+end
+
+

data/lib/fog/zerigo/dns.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zerigo'))
+require 'fog/zerigo'
 require 'fog/dns'
 
 module Fog

data/lib/fog/zerigo.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Zerigo

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 
 end
@@ -13,6 +13,9 @@ require 'fog/providers'
 require 'fog/terremark'
 
 require 'fog/compute'
+require 'fog/identity'
+require 'fog/image'
+require 'fog/volume'
 require 'fog/cdn'
 require 'fog/dns'
 require 'fog/storage'

data/spec/core/current_machine_spec.rb

@@ -3,10 +3,19 @@ require 'fog/core/current_machine'
 
 describe Fog::CurrentMachine do
   context '#ip_address' do
-    before(:each){ described_class.ip_address = nil }
-
+    around(:each) do |example|
+      old_mock = Excon.defaults[:mock]
+      described_class.ip_address = nil
+      begin
+        Excon.defaults[:mock] = true
+        example.run
+      ensure
+        Excon.defaults[:mock] = false
+        Excon.stubs.clear
+      end
+    end
     it 'should be threadsafe' do
-      Net::HTTP.should_receive(:get_response).once{ Struct.new(:body).new('') }
+      Excon.stub({:method => :get, :path => '/'}, {:body => ''})
 
       (1..10).map {
         Thread.new { described_class.ip_address }
@@ -14,9 +23,10 @@ describe Fog::CurrentMachine do
     end
 
     it 'should remove trailing endline characters' do
-      Net::HTTP.stub(:get_response){ Struct.new(:body).new("192.168.0.1\n") }
+      Excon.stub({:method => :get,  :path => '/'}, {:body => "192.168.0.1\n"})
 
       described_class.ip_address.should == '192.168.0.1'
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 require 'open-uri'
 require 'fog'
 require 'fog/bin'

data/tests/aws/credentials_tests.rb

@@ -0,0 +1,57 @@
+Shindo.tests('AWS | credentials', ['aws']) do
+  old_mock_value = Excon.defaults[:mock]
+  Excon.stubs.clear
+
+  begin
+    Excon.defaults[:mock] = true
+    default_credentials = Fog::Compute::AWS.fetch_credentials({})
+    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 200, :body => 'arole'})
+
+    expires_at = Time.at(Time.now.to_i + 500)
+    credentials = {
+      'AccessKeyId' => 'dummykey',
+      'SecretAccessKey' => 'dummysecret',
+      'Token' => 'dummytoken',
+      'Expiration' => expires_at.xmlschema
+    }
+
+    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+
+
+    tests("#fetch_credentials") do
+      returns({:aws_access_key_id => 'dummykey', 
+                :aws_secret_access_key => 'dummysecret', 
+                :aws_session_token => 'dummytoken', 
+                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+    end
+
+    compute = Fog::Compute::AWS.new(:use_iam_profile => true)
+
+    tests("#refresh_credentials_if_expired") do
+      returns(nil){compute.refresh_credentials_if_expired}
+    end
+
+    credentials['AccessKeyId'] = 'newkey'
+    credentials['SecretAccessKey'] = 'newsecret'
+    credentials['Expiration'] = (expires_at + 10).xmlschema
+
+    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+
+    Fog::Time.now = expires_at + 1
+    tests("#refresh_credentials_if_expired") do
+      returns(true){compute.refresh_credentials_if_expired}
+      returns("newkey"){ compute.instance_variable_get(:@aws_access_key_id)}
+    end
+    Fog::Time.now = Time.now
+
+
+    tests("#fetch_credentials when the url 404s") do
+      Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'})
+      returns(default_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+    end
+
+  ensure
+    Excon.stubs.clear
+    Excon.defaults[:mock] = old_mock_value
+  end
+end

data/tests/aws/models/compute/address_tests.rb

@@ -9,6 +9,13 @@ Shindo.tests("Fog::Compute[:aws] | address", ['aws']) do
       @instance.server = @server
     end
 
+    tests('#server') do
+      test(' == @server') do
+        @server.reload
+        @instance.server.public_ip_address == @instance.public_ip
+      end
+    end
+    
     @server.destroy
 
   end

data/tests/aws/models/compute/dhcp_option_tests.rb

@@ -0,0 +1,4 @@
+Shindo.tests("Fog::Compute[:aws] | dhcp_options", ['aws']) do
+  model_tests(Fog::Compute[:aws].dhcp_options, {'dhcp_configuration_set' => {'domain-name' => 'example.com', 'domain-name-servers' => '10.10.10.10'}}, true)
+end
+

data/tests/aws/models/compute/dhcp_options_tests.rb

@@ -0,0 +1,4 @@
+Shindo.tests("Fog::Compute[:aws] | dhcp_options", ['aws']) do
+  collection_tests(Fog::Compute[:aws].dhcp_options, {'dhcp_configuration_set' => {'domain-name' => 'example.com', 'domain-name-servers' => '10.10.10.10'}}, true)
+end
+

data/tests/aws/models/compute/internet_gateway_tests.rb

@@ -0,0 +1,3 @@
+Shindo.tests("Fog::Compute[:aws] | internet_gateway", ['aws']) do
+  model_tests(Fog::Compute[:aws].internet_gateways , {}, true)
+end

data/tests/aws/models/compute/internet_gateways_tests.rb

@@ -0,0 +1,4 @@
+Shindo.tests("Fog::Compute[:aws] | internet_gateways", ['aws']) do
+  collection_tests(Fog::Compute[:aws].internet_gateways, {}, true)
+end
+

data/tests/aws/models/compute/network_interfaces_test.rb

@@ -0,0 +1,12 @@
+Shindo.tests("Fog::Compute[:aws] | network_interfaces", ['aws']) do
+  @vpc       = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+  @subnet    = Fog::Compute[:aws].subnets.create('vpc_id' => @vpc.id, 'cidr_block' => '10.0.10.16/28')
+  @subnet_id = @subnet.subnet_id
+
+  collection_tests(Fog::Compute[:aws].network_interfaces,
+                   {:description => 'nic_desc', :name => 'nic_name', :subnet_id => @subnet_id},
+                   true)
+  
+  @subnet.destroy
+  @vpc.destroy
+end

data/tests/aws/models/compute/security_group_tests.rb

@@ -31,6 +31,20 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do
       @group.ip_permissions.empty?
     end
 
+    test("authorize port range access by another security group") do
+      @other_group.reload
+      @group.authorize_port_range(5000..6000, {:group => "#{@other_group.owner_id}:#{@other_group.group_id}"})
+      @group.reload
+      @group.ip_permissions.size == 1
+    end
+
+    test("revoke port range access by another security group") do
+      @other_group.reload
+      @group.revoke_port_range(5000..6000, {:group => "#{@other_group.owner_id}:#{@other_group.group_id}"})
+      @group.reload
+      @group.ip_permissions.empty?
+    end
+
     @other_group.destroy
     @group.destroy
   end

data/tests/aws/models/compute/volume_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
 
-  model_tests(Fog::Compute[:aws].volumes, {:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1'}, true) do
+  model_tests(Fog::Compute[:aws].volumes, {:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1', :tags => {"key" => "value"}}, true) do
 
     @instance.wait_for { ready? }
 
@@ -32,6 +32,10 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
 
     @instance.wait_for { ready? }
 
+    tests('@instance.reload.tags').returns({'key' => 'value'}) do
+      @instance.reload.tags
+    end
+
   end
 
   @server.destroy

data/tests/aws/models/dns/record_tests.rb

@@ -8,11 +8,23 @@ Shindo.tests("Fog::Dns[:aws] | record", ['aws', 'dns']) do
   params = { :name => @zone.domain, :type => 'A', :ttl => 3600, :value => ['1.2.3.4'] }
 
   model_tests(@zone.records, params, false) do
+
+    # Newly created records should have a change id
+    tests("#change_id") do
+      returns(true) { @instance.change_id != nil }
+    end
+
+    # Waits for changes to sync to all Route 53 DNS servers.  Usually takes ~30 seconds to complete.
+    tests("#ready? - may take a minute to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
     tests("#modify") do
       new_value = ['5.5.5.5']
       returns(true) { @instance.modify(:value => new_value) }
       returns(new_value) { @instance.value }
     end
+
   end
 
   tests("zones#destroy").succeeds do

data/tests/aws/models/elb/model_tests.rb

@@ -2,6 +2,16 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
   require 'fog'
   @availability_zones = Fog::Compute[:aws].describe_availability_zones('state' => 'available').body['availabilityZoneInfo'].collect{ |az| az['zoneName'] }
   @key_name = 'fog-test-model'
+  @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+  @vpc_id = @vpc.id
+  @subnet = Fog::Compute[:aws].subnets.create({:vpc_id => @vpc_id, :cidr_block => '10.0.10.0/24'})
+  @subnet_id = @subnet.subnet_id
+  @scheme = 'internal'
+  @igw=Fog::Compute[:aws].internet_gateways.create
+  @igw_id = @igw.id
+  @igw.attach(@vpc_id)
+
+
 
   tests('success') do
     tests('load_balancers') do
@@ -46,6 +56,23 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
           tests("params").returns(Fog::AWS[:elb].listeners.new.to_params) { elb.listeners.first.to_params }
         end
       end
+      tests('with vpc') do
+        elb2 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :subnet_ids => [@subnet_id])
+        tests("subnet ids are correct").returns(@subnet_id) { elb2.subnet_ids.first }
+        elb2.destroy
+      end
+      tests('with vpc internal') do
+        elb2 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :subnet_ids => [@subnet_id], :scheme => 'internal')
+        tests("scheme is internal").returns(@scheme) { elb2.scheme }
+        elb2.destroy
+      end
+      if !Fog.mocking?
+        @igw.detach(@vpc_id)
+        @igw.destroy
+        @subnet.destroy
+        sleep 5
+        @vpc.destroy
+     end
 
       tests('with availability zones') do
         azs = @availability_zones[1..-1]
@@ -94,9 +121,16 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       tests("contains elb").returns(true) { elb_ids.include? elb_id }
     end
 
+    if Fog.mocking?
+      tests('all marker support') do
+        extra_elb_ids = (1..1000).map {|n| Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-extra-#{n}").id }
+        tests('returns all elbs').returns(true) { (extra_elb_ids - Fog::AWS[:elb].load_balancers.all.map {|e| e.id }).empty? }
+      end
+    end
+
     tests('get') do
-      elb_get = Fog::AWS[:elb].load_balancers.get(elb_id)
-      tests('ids match').returns(elb_id) { elb_get.id }
+      tests('ids match').returns(elb_id) { Fog::AWS[:elb].load_balancers.get(elb_id).id }
+      tests('nil id').returns(nil) { Fog::AWS[:elb].load_balancers.get(nil) }
     end
 
     tests('creating a duplicate elb') do