fog 1.31.0 → 1.37.0

data/spec/fog/openstack/volume_v2/volume_type_read.yml

@@ -0,0 +1,114 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:8776/v2/711f0a64ef5046c084ce904b4445d119/types
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - 3f33d39bc21c47268423f7eb134b78f4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      X-Compute-Request-Id:
+      - req-074af442-54b0-4943-963a-3796e72326e3
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '206'
+      X-Openstack-Request-Id:
+      - req-074af442-54b0-4943-963a-3796e72326e3
+      Date:
+      - Thu, 22 Oct 2015 14:07:48 GMT
+    body:
+      encoding: UTF-8
+      string: '{"volume_types": [{"os-volume-type-access:is_public": true, "extra_specs":
+        {"volume_backend_name": "lvmdriver-1"}, "id": "3637058f-9a35-451b-ab6c-5d5e2425d6ca",
+        "name": "lvmdriver-1", "description": null}]}'
+    http_version: 
+  recorded_at: Thu, 22 Oct 2015 14:07:29 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:8776/v2/711f0a64ef5046c084ce904b4445d119/types/3637058f-9a35-451b-ab6c-5d5e2425d6ca
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - 3f33d39bc21c47268423f7eb134b78f4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      X-Compute-Request-Id:
+      - req-7610f1f3-340d-4299-b3a0-6749ffbe2acf
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '203'
+      X-Openstack-Request-Id:
+      - req-7610f1f3-340d-4299-b3a0-6749ffbe2acf
+      Date:
+      - Thu, 22 Oct 2015 14:07:48 GMT
+    body:
+      encoding: UTF-8
+      string: '{"volume_type": {"os-volume-type-access:is_public": true, "extra_specs":
+        {"volume_backend_name": "lvmdriver-1"}, "id": "3637058f-9a35-451b-ab6c-5d5e2425d6ca",
+        "name": "lvmdriver-1", "description": null}}'
+    http_version: 
+  recorded_at: Thu, 22 Oct 2015 14:07:29 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:8776/v2/711f0a64ef5046c084ce904b4445d119/types?lvmdriver-1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - 3f33d39bc21c47268423f7eb134b78f4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      X-Compute-Request-Id:
+      - req-bc6479fe-8f8e-4ea2-ad0e-41ea0643a47c
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '206'
+      X-Openstack-Request-Id:
+      - req-bc6479fe-8f8e-4ea2-ad0e-41ea0643a47c
+      Date:
+      - Thu, 22 Oct 2015 14:07:48 GMT
+    body:
+      encoding: UTF-8
+      string: '{"volume_types": [{"os-volume-type-access:is_public": true, "extra_specs":
+        {"volume_backend_name": "lvmdriver-1"}, "id": "3637058f-9a35-451b-ab6c-5d5e2425d6ca",
+        "name": "lvmdriver-1", "description": null}]}'
+    http_version: 
+  recorded_at: Thu, 22 Oct 2015 14:07:29 GMT
+recorded_with: VCR 2.9.3

data/tests/compute/helper.rb

@@ -13,12 +13,6 @@ def compute_providers
       },
       :mocked => false
     },
-    :brightbox  => {
-      :server_attributes => {
-        :image_id => Brightbox::Compute::TestSupport.image_id
-      },
-      :mocked => false
-    },
     :cloudstack => {
       :provider_attributes => {
         :cloudstack_host => 'http://host.foo'
@@ -115,9 +109,6 @@ def compute_providers
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => true
-    },
-    :xenserver => {
-      :mocked => false
     }
   }
 end

data/tests/digitalocean/requests/compute_v2/list_flavors_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | list_flavors request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  size_format = {
+    'slug' => String,
+    'memory' => Integer,
+    'vcpus' => Integer,
+    'disk' => Integer,
+    'transfer' => Float,
+    'price_monthly' => Float,
+    'price_hourly' => Float,
+    'regions' => Array,
+    'available' => Fog::Boolean,
+  }
+
+  tests('success') do
+    tests('#list_flavors') do
+      service.list_flavors.body['sizes'].each do |size|
+        tests('format').data_matches_schema(size_format) do
+          size
+        end
+      end
+    end
+  end
+end

data/tests/digitalocean/requests/compute_v2/list_images_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | list_images request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  image_format = {
+    'id' => Integer,
+    'name' => String,
+    'type' => String,
+    'distribution' => String,
+    'slug' => Fog::Nullable::String,
+    'public' => Fog::Boolean,
+    'regions' => Array,
+    'min_disk_size' => Fog::Nullable::Integer,
+    'created_at' => String,
+  }
+
+  tests('success') do
+    tests('#list_images') do
+      service.list_images.body['images'].each do |image|
+        tests('format').data_matches_schema(image_format) do
+          image
+        end
+      end
+    end
+  end
+end

data/tests/digitalocean/requests/compute_v2/list_regions_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | list_regions request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  region_format = {
+    'slug' => String,
+    'name' => String,
+    'sizes' => Array,
+    'available' => Fog::Boolean,
+    'features' => Array,
+  }
+
+  tests('success') do
+    tests('#list_regions') do
+      service.list_regions.body['regions'].each do |region|
+        tests('format').data_matches_schema(region_format) do
+          region
+        end
+      end
+    end
+  end
+end

data/tests/digitalocean/requests/compute_v2/server_tests.rb

@@ -0,0 +1,77 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | create_server request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  server_format = {
+    'id'         => Integer,
+    'name'       => String,
+    'memory'     => Integer,
+    'vcpus'      => Integer,
+    'disk'       => Integer,
+    'locked'     => Fog::Boolean,
+    'created_at' => String,
+  }
+
+  create_server_format = {
+    'droplet' => {
+      'id'           => Integer,
+      'name'         => String,
+      'memory'       => Integer,
+      'vcpus'        => Integer,
+      'disk'         => Integer,
+      'locked'       => Fog::Boolean,
+      'status'       => String,
+      'kernel'       => Hash,
+      "created_at"   => String,
+      "features"     => Array,
+      "backup_ids"   => Array,
+      "snapshot_ids" => Array,
+      "image"        => Hash,
+      "size"         => Hash,
+      "size_slug"    => String,
+      "networks"     => Hash,
+      "region"       => Hash,
+    },
+
+    'links'   => {
+      "actions" => Array,
+    }
+
+  }
+
+  tests('success') do
+
+    server_id   = nil
+    server_name = "fog-#{Time.now.to_i.to_s}"
+    image       = "ubuntu-14-04-x64"
+    region      = "nyc3"
+    size        = "512mb"
+
+    tests("#create_server(#{server_name}, #{size}, #{image}, #{region})").formats(create_server_format) do
+      body      = service.create_server(server_name, size, image, region).body
+      server_id = body['droplet']['id']
+      body
+    end
+
+    test('#get_server_details can retrieve by id') do
+      body = service.get_server_details(server_id).body
+      tests('format').data_matches_schema(server_format) do
+        body['droplet']
+      end
+    end
+
+    server = service.servers.get(server_id)
+    server.wait_for { ready? }
+
+    tests('#delete_server').succeeds do
+      server.delete
+    end
+
+    tests('#list_servers') do
+      service.list_servers.body['droplets'].each do |droplet|
+        tests('format').data_matches_schema(server_format) do
+          droplet
+        end
+      end
+    end
+  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/helpers/mock_helper.rb

@@ -28,6 +28,7 @@ if Fog.mock?
     :clodo_username                   => 'clodo_username',
     :digitalocean_api_key             => 'digitalocean_api_key',
     :digitalocean_client_id           => 'digitalocean_client_id',
+    :digitalocean_token               => 'digitalocean_token',
     :dnsimple_email                   => 'dnsimple_email',
     :dnsimple_password                => 'dnsimple_password',
     :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
@@ -84,10 +85,6 @@ if Fog.mock?
     :dynect_customer                  => 'dynect_customer',
     :dynect_username                  => 'dynect_username',
     :dynect_password                  => 'dynect_password',
-    :vsphere_server                   => 'virtualcenter.lan',
-    :vsphere_username                 => 'apiuser',
-    :vsphere_password                 => 'apipassword',
-    :vsphere_expected_pubkey_hash     => 'abcdef1234567890',
     :cloudsigma_username              => 'csuname',
     :cloudsigma_password              => 'cspass',
     :docker_username                  => 'docker-fan',

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/opennebula/models/compute/flavor_tests.rb

@@ -9,7 +9,6 @@ Shindo.tests('Fog::Compute[:opennebula] | flavor model', ['opennebula']) do
     end
     tests('have attributes') do
       model_attribute_hash = flavor.attributes
-      attributes = 
       tests("The flavor model should respond to") do
         [:name, :id, :to_label, :to_s, :get_cpu, :get_vcpu, :get_memory, :get_raw, :get_disk, :get_os,
           :get_graphics, :get_nic, :get_sched_ds_requirements, :get_sched_ds_rank, :get_sched_requirements,
@@ -31,6 +30,7 @@ Shindo.tests('Fog::Compute[:opennebula] | flavor model', ['opennebula']) do
     test('have a 666 MB memory') { flavor.get_memory == "MEMORY=666\n" }
     test('have a 666 CPUs') { flavor.get_vcpu == "VCPU=666\n" }
 
+    test('raw parsed properly') { flavor.get_raw == %|RAW=["DATA"="<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>", "TYPE"="kvm"]\n| }
   end
 
 end

data/tests/openstack/authenticate_tests.rb

@@ -1,3 +1,7 @@
+require 'fog/openstack/identity'
+require 'fog/openstack/identity_v2'
+require 'fog/openstack/identity_v3'
+
 Shindo.tests('OpenStack | authenticate', ['openstack']) do
   begin
     @old_mock_value = Excon.defaults[:mock]

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

@@ -156,6 +156,32 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
 
     end
 
+    tests("#delete_at") do
+      @delete_at_time = (Time.now + 300).to_i
+
+      tests("#delete_at should default to nil").returns(nil) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = @delete_at_time
+      @instance.save
+      tests("#delete_at should return delete_at attribute").returns(@delete_at_time) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = @delete_at_time
+      @instance.save
+      tests("#delete_at= should update delete_at").returns(@delete_at_time + 100) do
+        @instance.delete_at = @delete_at_time + 100
+        @instance.save
+        @instance.delete_at
+      end
+
+      tests("#delete_at= should not blow up on nil") do
+        @instance.delete_at = nil
+        @instance.save
+      end
+    end
   end
 
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
@@ -189,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/openstack/requests/compute/aggregate_tests.rb

@@ -0,0 +1,59 @@
+Shindo.tests('Fog::Compute[:openstack] | Compute aggregate requests', ['openstack']) do
+  openstack = Fog::Identity[:openstack]
+
+  @aggregate_format = {
+    "availability_zone" => Fog::Nullable::String,
+    "created_at"        => String,
+    "deleted"           => Fog::Boolean,
+    "deleted_at"        => Fog::Nullable::String,
+    "id"                => Integer,
+    "name"              => String,
+    "updated_at"        => Fog::Nullable::String
+  }
+
+  @detailed_aggregate_format = @aggregate_format.merge({
+    'hosts' => Array,
+  })
+
+  @metadata_aggregate_format = @aggregate_format.merge({
+    "metadata"          => Hash,
+  })
+
+  tests('success') do
+    tests('#create_aggregate').data_matches_schema({'aggregate' => @aggregate_format}) do
+      aggregate_body = Fog::Compute[:openstack].create_aggregate('test_aggregate').body
+      @aggregate = aggregate_body['aggregate']
+      aggregate_body
+    end
+
+    tests('#list_aggregates').data_matches_schema({'aggregates' => [@metadata_aggregate_format]}) do
+      Fog::Compute[:openstack].list_aggregates.body
+    end
+
+    tests('#update_aggregate').data_matches_schema({'aggregate' => @aggregate_format}) do
+      aggregate_attributes = {'name' => 'test_aggregate2'}
+      Fog::Compute[:openstack].update_aggregate(@aggregate['id'], aggregate_attributes).body
+    end
+
+    tests('#get_aggregate').data_matches_schema({'aggregate' => @detailed_aggregate_format}) do
+      Fog::Compute[:openstack].get_aggregate(@aggregate['id']).body
+    end
+
+    tests('#add_aggregate_host').succeeds do
+      @host_name =  Fog::Compute[:openstack].hosts.select{ |x| x.service_name == 'compute' }.first.host_name
+      Fog::Compute[:openstack].add_aggregate_host(@aggregate['id'], @host_name)
+    end
+
+    tests('#remove_aggregate_host').succeeds do
+      Fog::Compute[:openstack].remove_aggregate_host(@aggregate['id'], @host_name)
+    end
+
+    tests('#update_aggregate_metadata').succeeds do
+      Fog::Compute[:openstack].update_aggregate_metadata(@aggregate['id'], {'test' => 'test', 'test2' => 'test2'})
+    end
+
+    tests('#delete_aggregate').succeeds do
+      Fog::Compute[:openstack].delete_aggregate(@aggregate['id'])
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+Shindo.tests('Fog::Compute[:openstack] | availability zone requests', ['openstack']) do
+
+  @flavor_format = {
+    'zoneName'    => String,
+    'hosts'       => Fog::Nullable::Hash,
+    'zoneState'   => Hash,
+  }
+
+  tests('success') do
+    tests('#list_zones').data_matches_schema({'availabilityZoneInfo' => [@flavor_format]}) do
+      Fog::Compute[:openstack].list_zones.body
+    end
+
+    tests('#list_zones_detailed').data_matches_schema({'availabilityZoneInfo' => [@flavor_format]}) do
+      Fog::Compute[:openstack].list_zones_detailed.body
+    end
+  end
+end

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

@@ -232,6 +232,18 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
 
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
 
+    tests("#shelve_server(#{@server_id})").succeeds do
+      Fog::Compute[:openstack].shelve_server(@server_id)
+    end
+
+    Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
+
+    tests("#unshelve_server(#{@server_id})").succeeds do
+      Fog::Compute[:openstack].unshelve_server(@server_id)
+    end
+
+    Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
+
     #DELETE
     tests("#delete_server(#{@server_id})").succeeds do
       Fog::Compute[:openstack].delete_server(@server_id)

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

@@ -1,16 +1,18 @@
 Shindo.tests('Fog::Network[:openstack] | port requests', ['openstack']) do
 
   @port_format = {
-    'id'             => String,
-    'name'           => String,
-    'network_id'     => String,
-    'fixed_ips'      => Array,
-    'mac_address'    => String,
-    'status'         => String,
-    'admin_state_up' => Fog::Boolean,
-    'device_owner'   => String,
-    'device_id'      => String,
-    'tenant_id'      => String,
+    'id'                    => String,
+    'name'                  => String,
+    'network_id'            => String,
+    'fixed_ips'             => Array,
+    'mac_address'           => String,
+    'status'                => String,
+    'admin_state_up'        => Fog::Boolean,
+    'device_owner'          => String,
+    'device_id'             => String,
+    'tenant_id'             => String,
+    'security_groups'       => Array,
+    'allowed_address_pairs' => Array
   }
 
   tests('success') do
@@ -19,7 +21,8 @@ Shindo.tests('Fog::Network[:openstack] | port requests', ['openstack']) do
       attributes = {:name => 'port_name', :fixed_ips => [],
                     :mac_address => 'fa:16:3e:62:91:7f', :admin_state_up => true,
                     :device_owner => 'device_owner', :device_id => 'device_id',
-                    :tenant_id => 'tenant_id'}
+                    :tenant_id => 'tenant_id' ,:security_groups => [],
+                    :allowed_address_pairs => [] }
       Fog::Network[:openstack].create_port(network_id, attributes).body
     end
 

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

@@ -38,8 +38,8 @@ Shindo.tests('Fog::Network[:openstack] | subnet requests', ['openstack']) do
     tests('#update_subnet').formats({'subnet' => @subnet_format}) do
       subnet_id = Fog::Network[:openstack].subnets.all.first.id
       attributes = {:name => 'subnet_name', :gateway_ip => '10.2.2.1',
-                    :dns_nameservers => [], :host_routes => [],
-                    :enable_dhcp => true}
+                    :allocation_pools => [], :dns_nameservers => [],
+                    :host_routes => [], :enable_dhcp => true}
       Fog::Network[:openstack].update_subnet(subnet_id, attributes).body
     end