fog 1.35.0 → 1.36.0

data/spec/fog/openstack/network/subnets_crud.yml

@@ -5,16 +5,18 @@ http_interactions:
     uri: http://devstack.openstack.stack:9696/v2.0/networks
     body:
       encoding: UTF-8
-      string: ! '{"network":{"name":"foo-net12","shared":false}}'
+      string: '{"network":{"name":"foo-net12","shared":false}}'
     headers:
       User-Agent:
-      - fog-core/1.32.0
+      - fog-core/1.32.1
+      Proxy-Connection:
+      - Keep-Alive
       Content-Type:
       - application/json
       Accept:
       - application/json
       X-Auth-Token:
-      - 0afbf49d007a4d82850b853b703025d7
+      - 3b58d1663a9a49b2af240e68bfb08081
   response:
     status:
       code: 201
@@ -25,33 +27,43 @@ http_interactions:
       Content-Length:
       - '344'
       X-Openstack-Request-Id:
-      - req-cc7677e6-9700-4215-b16d-d4a867db376b
+      - req-fdcd2d80-b5c1-4c2f-854b-b4723a66b777
       Date:
-      - Thu, 16 Jul 2015 13:30:02 GMT
+      - Thu, 29 Oct 2015 10:19:42 GMT
+      X-Cache:
+      - MISS from i056593-vagrant
+      X-Cache-Lookup:
+      - MISS from i056593-vagrant:3128
+      Via:
+      - 1.1 i056593-vagrant (squid/3.3.8)
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"network": {"status": "ACTIVE", "subnets": [], "name": "foo-net12",
+      encoding: UTF-8
+      string: '{"network": {"status": "ACTIVE", "subnets": [], "name": "foo-net12",
         "provider:physical_network": null, "router:external": false, "tenant_id":
-        "5b1c4e7218d94dc8879d542002ffbc48", "admin_state_up": true, "mtu": 0, "shared":
-        false, "provider:network_type": "vxlan", "id": "0629b827-668a-443c-b73e-1725359350fb",
-        "provider:segmentation_id": 1104}}'
+        "ded5a6e0922c4be59e7c15517cfb89ee", "admin_state_up": true, "mtu": 0, "shared":
+        false, "provider:network_type": "vxlan", "id": "212190ec-9075-45d6-b31e-e0649a79b356",
+        "provider:segmentation_id": 1045}}'
     http_version: 
-  recorded_at: Thu, 16 Jul 2015 13:30:19 GMT
+  recorded_at: Thu, 29 Oct 2015 10:19:38 GMT
 - request:
     method: post
     uri: http://devstack.openstack.stack:9696/v2.0/subnets
     body:
       encoding: UTF-8
-      string: ! '{"subnet":{"network_id":"0629b827-668a-443c-b73e-1725359350fb","cidr":"172.16.0.0/16","ip_version":4,"name":"my-network","gateway_ip":null}}'
+      string: '{"subnet":{"network_id":"212190ec-9075-45d6-b31e-e0649a79b356","cidr":"172.16.0.0/16","ip_version":4,"name":"my-network","gateway_ip":null}}'
     headers:
       User-Agent:
-      - fog-core/1.32.0
+      - fog-core/1.32.1
+      Proxy-Connection:
+      - Keep-Alive
       Content-Type:
       - application/json
       Accept:
       - application/json
       X-Auth-Token:
-      - 0afbf49d007a4d82850b853b703025d7
+      - 3b58d1663a9a49b2af240e68bfb08081
   response:
     status:
       code: 201
@@ -62,34 +74,44 @@ http_interactions:
       Content-Length:
       - '452'
       X-Openstack-Request-Id:
-      - req-295d5e91-514b-4980-85a4-adce351161a8
+      - req-6d6a0167-3c48-49e5-8bf4-10e6aa7f4873
       Date:
-      - Thu, 16 Jul 2015 13:30:02 GMT
+      - Thu, 29 Oct 2015 10:19:42 GMT
+      X-Cache:
+      - MISS from i056593-vagrant
+      X-Cache-Lookup:
+      - MISS from i056593-vagrant:3128
+      Via:
+      - 1.1 i056593-vagrant (squid/3.3.8)
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ! '{"subnet": {"name": "my-network", "enable_dhcp": true, "network_id":
-        "0629b827-668a-443c-b73e-1725359350fb", "tenant_id": "5b1c4e7218d94dc8879d542002ffbc48",
+      encoding: UTF-8
+      string: '{"subnet": {"name": "my-network", "enable_dhcp": true, "network_id":
+        "212190ec-9075-45d6-b31e-e0649a79b356", "tenant_id": "ded5a6e0922c4be59e7c15517cfb89ee",
         "dns_nameservers": [], "gateway_ip": null, "ipv6_ra_mode": null, "allocation_pools":
         [{"start": "172.16.0.1", "end": "172.16.255.254"}], "host_routes": [], "ip_version":
-        4, "ipv6_address_mode": null, "cidr": "172.16.0.0/16", "id": "11bef948-6df8-4fa3-8c21-3fbd3cc4ca6d",
+        4, "ipv6_address_mode": null, "cidr": "172.16.0.0/16", "id": "3d936331-954b-4d47-9531-f27cea2921da",
         "subnetpool_id": null}}'
     http_version: 
-  recorded_at: Thu, 16 Jul 2015 13:30:19 GMT
+  recorded_at: Thu, 29 Oct 2015 10:19:38 GMT
 - request:
     method: delete
-    uri: http://devstack.openstack.stack:9696/v2.0/subnets/11bef948-6df8-4fa3-8c21-3fbd3cc4ca6d
+    uri: http://devstack.openstack.stack:9696/v2.0/subnets/3d936331-954b-4d47-9531-f27cea2921da
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - fog-core/1.32.0
+      - fog-core/1.32.1
+      Proxy-Connection:
+      - Keep-Alive
       Content-Type:
       - application/json
       Accept:
       - application/json
       X-Auth-Token:
-      - 0afbf49d007a4d82850b853b703025d7
+      - 3b58d1663a9a49b2af240e68bfb08081
   response:
     status:
       code: 204
@@ -98,29 +120,39 @@ http_interactions:
       Content-Length:
       - '0'
       X-Openstack-Request-Id:
-      - req-5c4205db-8183-4eeb-a702-e6e156f82db1
+      - req-e44101b5-1474-4796-85e5-2c451aec45b1
       Date:
-      - Thu, 16 Jul 2015 13:30:03 GMT
+      - Thu, 29 Oct 2015 10:19:43 GMT
+      X-Cache:
+      - MISS from i056593-vagrant
+      X-Cache-Lookup:
+      - MISS from i056593-vagrant:3128
+      Via:
+      - 1.1 i056593-vagrant (squid/3.3.8)
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Thu, 16 Jul 2015 13:30:20 GMT
+  recorded_at: Thu, 29 Oct 2015 10:19:38 GMT
 - request:
     method: delete
-    uri: http://devstack.openstack.stack:9696/v2.0/networks/0629b827-668a-443c-b73e-1725359350fb
+    uri: http://devstack.openstack.stack:9696/v2.0/networks/212190ec-9075-45d6-b31e-e0649a79b356
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - fog-core/1.32.0
+      - fog-core/1.32.1
+      Proxy-Connection:
+      - Keep-Alive
       Content-Type:
       - application/json
       Accept:
       - application/json
       X-Auth-Token:
-      - 0afbf49d007a4d82850b853b703025d7
+      - 3b58d1663a9a49b2af240e68bfb08081
   response:
     status:
       code: 204
@@ -129,12 +161,20 @@ http_interactions:
       Content-Length:
       - '0'
       X-Openstack-Request-Id:
-      - req-f21f4c07-2e64-4920-a53d-19f221af0c99
+      - req-c8c52a10-08ea-4e1f-8915-b5fd33e4d874
       Date:
-      - Thu, 16 Jul 2015 13:30:03 GMT
+      - Thu, 29 Oct 2015 10:19:43 GMT
+      X-Cache:
+      - MISS from i056593-vagrant
+      X-Cache-Lookup:
+      - MISS from i056593-vagrant:3128
+      Via:
+      - 1.1 i056593-vagrant (squid/3.3.8)
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Thu, 16 Jul 2015 13:30:20 GMT
+  recorded_at: Thu, 29 Oct 2015 10:19:38 GMT
 recorded_with: VCR 2.9.3

data/spec/fog/openstack/shared_context.rb

@@ -1,6 +1,7 @@
 require 'rspec/core'
 require 'rspec/expectations'
 require 'vcr'
+require 'fog/openstack/core'
 require 'fog/openstack/identity'
 require 'fog/openstack/identity_v3'
 require 'fog/openstack/image'
@@ -73,6 +74,8 @@ RSpec.shared_context 'OpenStack specs with VCR' do
 
     # setup the service object
     VCR.use_cassette('common_setup') do
+      Fog::OpenStack.clear_token_cache
+
       if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3')
         options = {
           :openstack_auth_url     => "#{@os_auth_url}/auth/tokens",
@@ -95,7 +98,8 @@ RSpec.shared_context 'OpenStack specs with VCR' do
           # :openstack_project_domain => ENV['OS_PROJECT_DOMAIN_NAME'] || 'Default',
         }
       end
-      @service = @service_class.new(options) unless @service
+      @service = @service_class.new(options)
+
     end
   end
 

data/tests/helper.rb

@@ -3,6 +3,7 @@ ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
 
 require 'fog'
 require 'fog/bin' # for available_providers and registered_providers
+require 'ostruct'
 
 Excon.defaults.merge!(:debug_request => true, :debug_response => true)
 

data/tests/linode/requests/compute/datacenter_tests.rb

@@ -3,7 +3,8 @@ Shindo.tests('Fog::Compute[:linode] | datacenter requests', ['linode']) do
   @datacenters_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{
       'DATACENTERID'  => Integer,
-      'LOCATION'      => String
+      'LOCATION'      => String,
+      'ABBR'          => String
     }]
   })
 

data/tests/linode/requests/compute/kernel_tests.rb

@@ -4,24 +4,16 @@ Shindo.tests('Fog::Compute[:linode] | kernel requests', ['linode']) do
     'DATA' => [{
       'LABEL'               => String,
       'ISXEN'               => Integer,
+      'ISKVM'               => Integer,
       'ISPVOPS'             => Integer,
       'KERNELID'            => Integer
     }]
   })
 
   tests('success') do
-    @kernel_id = nil
-
     tests('#avail_kernels').formats(@kernels_format) do
       pending if Fog.mocking?
-      data = Fog::Compute[:linode].avail_kernels.body
-      @kernel_id = data['DATA'].first['KERNELID']
-      data
-    end
-
-    tests("@avail_kernels(#{@kernel_id})").formats(@kernels_format) do
-      pending if Fog.mocking?
-      Fog::Compute[:linode].avail_kernels(@kernel_id).body
+      Fog::Compute[:linode].avail_kernels.body
     end
   end
 end

data/tests/linode/requests/compute/linodeplans_tests.rb

@@ -3,12 +3,14 @@ Shindo.tests('Fog::Compute[:linode] | linodeplans requests', ['linode']) do
   @linodeplans_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{
       'AVAIL' => {
-         '2' => Integer,
-         '3' => Integer,
-         '4' => Integer,
-         '6' => Integer,
-         '7' => Integer,
-         '8' => Integer
+         '2'  => Integer,
+         '3'  => Integer,
+         '4'  => Integer,
+         '6'  => Integer,
+         '7'  => Integer,
+         '8'  => Integer,
+         '9'  => Integer,
+         '10' => Integer
       },
       'DISK'    => Integer,
       'PLANID'  => Integer,
@@ -16,7 +18,8 @@ Shindo.tests('Fog::Compute[:linode] | linodeplans requests', ['linode']) do
       'RAM'     => Integer,
       'LABEL'   => String,
       'XFER'    => Integer,
-      'CORES'   => Integer
+      'CORES'   => Integer,
+      'HOURLY'  => Float
     }]
   })
 

data/tests/linode/requests/compute/nodebalancers_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Compute[:linode] | linodenodebalancers requests', ['linode']) do
+
+  @linodenodebalancers_format = Linode::Compute::Formats::BASIC.merge({
+    'DATA' => [{
+      'MONTHLY'     => Float,
+      'HOURLY'      => Float,
+      'CONNECTIONS' => Integer
+    }]
+  })
+
+  tests('success') do
+
+    tests('#avail_nodebalancers').formats(@linodenodebalancers_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:linode].avail_nodebalancers.body
+    end
+
+  end
+
+end

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

@@ -215,6 +215,35 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
 
     end
 
+    tests("#content_encoding") do
+
+      tests("#content_encoding should default to nil").returns(nil) do
+        @instance.save
+        @instance.content_encoding
+      end
+
+      @instance.content_encoding = 'gzip'
+      @instance.save
+      tests("#content_encoding should return the content encoding").returns('gzip') do
+        @instance.content_encoding
+      end
+      @instance.attributes.delete('content_encoding')
+
+      @instance.content_encoding = 'foo'
+      @instance.save
+      tests("#content_encoding= should update content_encoding").returns('bar') do
+        @instance.content_encoding = 'bar'
+        @instance.save
+        @instance.content_encoding
+      end
+
+      tests("#content_encoding= should not blow up on nil") do
+        @instance.content_encoding = nil
+        @instance.save
+      end
+
+    end
+
   end
 
   @directory.destroy

data/tests/rackspace/requests/load_balancers/node_tests.rb

@@ -22,6 +22,13 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
           data
         end
 
+        @lb.wait_for { ready? }
+        tests('#create_node with type').formats(NODES_FORMAT) do
+          data = @service.create_node(@lb.id, '1.1.1.4', 80, 'ENABLED', { :type => 'PRIMARY' }).body
+          @nodes_created << data['nodes'][0]['id']
+          data
+        end
+
         @lb.wait_for { ready? }
         tests("#list_nodes(#{@lb.id})").formats(NODES_FORMAT) do
           @service.list_nodes(@lb.id).body

data/tests/vsphere/models/compute/server_tests.rb

@@ -1,5 +1,4 @@
 Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
-
   servers = Fog::Compute[:vsphere].servers
   server = servers.last
 
@@ -10,6 +9,33 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
         test(action) { server.respond_to? action }
         test("#{action} returns successfully") { server.send(action.to_sym) ? true : false }
       end
+      test('guest_processes') { server.respond_to? 'guest_processes' }
+      test('take_snapshot') do
+        test('responds') { server.respond_to? 'take_snapshot'}
+        test('returns successfully') { server.take_snapshot('name' => 'foobar').kind_of? Hash }
+      end
+      test('snapshots') do
+        test('responds') { server.respond_to? 'snapshots'}
+        test('returns successfully') { server.snapshots.kind_of? Fog::Compute::Vsphere::Snapshots }
+      end
+      test('find_snapshot') do
+        test('responds') { server.respond_to? 'find_snapshot'}
+        test('returns successfully') do
+          server.find_snapshot('snapshot-0101').kind_of? Fog::Compute::Vsphere::Snapshot
+        end
+        test('returns correct snapshot') do
+          server.find_snapshot('snapshot-0101').ref == 'snapshot-0101'
+        end
+      end
+      tests('revert_snapshot') do
+        test('responds') { server.respond_to? 'revert_snapshot'}
+        tests('returns correctly') do
+          test('when correct input given') { server.revert_snapshot('snapshot-0101').kind_of? Hash }
+          test('when incorrect input given') do
+            raises(ArgumentError) { server.revert_snapshot(1) }
+          end
+        end
+      end
     end
     tests('have attributes') do
       model_attribute_hash = server.attributes

data/tests/vsphere/requests/compute/list_child_snapshots_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::Compute[:vsphere] | list_child_snapshots request', ['vsphere']) do
+
+  compute = Fog::Compute[:vsphere]
+
+  tests('The response should') do
+    response = compute.list_child_snapshots('snapshot-0101')
+    test('be a kind of Array') { response.kind_of? Array }
+    test('it should contains Hashes') { response.all? { |i| Hash === i } }
+  end
+end

data/tests/vsphere/requests/compute/list_vm_snapshots_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::Compute[:vsphere] | list_vm_snapshots request', ['vsphere']) do
+
+  compute = Fog::Compute[:vsphere]
+
+  tests('The response should') do
+    response = compute.list_vm_snapshots('5032c8a5-9c5e-ba7a-3804-832a03e16381')
+    test('be a kind of Array') { response.kind_of? Array }
+    test('it should contains Hashes') { response.all? { |i| Hash === i } }
+  end
+end

data/tests/vsphere/requests/compute/revert_to_snapshot_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests('Fog::Compute[:vsphere] | revert_to_snapshot request', ['vsphere']) do
+
+  compute = Fog::Compute[:vsphere]
+
+  tests('The response should') do
+    response = compute.revert_to_snapshot(Fog::Compute::Vsphere::Snapshot.new(service: 1))
+    test('be a kind of Hash') { response.kind_of? Hash }
+    test('should have a task_state key') { response.key? 'state' }
+  end
+
+  tests('The expected options') do
+    raises(ArgumentError, 'raises ArgumentError when input param is missing') { compute.revert_to_snapshot(nil) }
+  end
+
+end