fog 1.28.0 → 1.29.0

data/spec/fog/bin/dreamhost_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/dynect_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/powerdns_spec.rb

@@ -0,0 +1,9 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe Fog::PowerDNS do
+  include Fog::BinSpec
+  let(:subject) { PowerDNS }
+end

data/spec/fog/bin_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 
 describe Fog do
@@ -35,6 +34,7 @@ describe Fog do
       assert_equal "OpenStack", Fog.providers[:openstack]
       assert_equal "Openvz", Fog.providers[:openvz]
       assert_equal "Ovirt", Fog.providers[:ovirt]
+      assert_equal "PowerDNS", Fog.providers[:powerdns]
       assert_equal "ProfitBricks", Fog.providers[:profitbricks]
       assert_equal "Rackspace", Fog.providers[:rackspace]
       assert_equal "Rage4", Fog.providers[:rage4]
@@ -85,6 +85,7 @@ describe Fog do
       assert_includes Fog.registered_providers, "OpenStack"
       assert_includes Fog.registered_providers, "Openvz"
       assert_includes Fog.registered_providers, "Ovirt"
+      assert_includes Fog.registered_providers, "PowerDNS"
       assert_includes Fog.registered_providers, "ProfitBricks"
       assert_includes Fog.registered_providers, "Rackspace"
       assert_includes Fog.registered_providers, "Rage4"
@@ -135,6 +136,7 @@ describe Fog do
       assert_includes Fog.available_providers, "OpenStack" if OpenStack.available?
       assert_includes Fog.available_providers, "Openvz" if Openvz.available?
       assert_includes Fog.available_providers, "Ovirt" if Ovirt.available?
+      assert_includes Fog.available_providers, "PowerDNS" if PowerDNS.available?
       assert_includes Fog.available_providers, "ProfitBricks" if ProfitBricks.available?
       assert_includes Fog.available_providers, "Rackspace" if Rackspace.available?
       assert_includes Fog.available_providers, "Rage4" if Rage4.available?

data/spec/fog/cdn_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::CDN do
   Fog::CDN.providers.each do |provider|

data/spec/fog/compute_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Compute do
   Fog::Compute.providers.each do |provider|

data/spec/fog/dns_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::DNS do
   Fog::DNS.providers.each do |provider|

data/spec/fog/identity_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Identity do
   Fog::Identity.providers.each do |provider|

data/spec/fog/image_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Image do
   Fog::Image.providers.each do |provider|

data/spec/fog/metering_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Metering do
   Fog::Metering.providers.each do |provider|

data/spec/fog/monitoring_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Monitoring do
   Fog::Monitoring.providers.each do |provider|

data/spec/fog/network_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Network do
   Fog::Network.providers.each do |provider|

data/spec/fog/orchestration_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Orchestration do
   Fog::Orchestration.providers.each do |provider|

data/spec/fog/storage_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Storage do
   Fog::Storage.providers.each do |provider|

data/spec/fog/support_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Support do
   Fog::Support.providers.each do |provider|

data/spec/fog/volume_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Volume do
   Fog::Volume.providers.each do |provider|

data/spec/fog/vpn_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::VPN do
   Fog::VPN.providers.each do |provider|

data/spec/fog/xml/connection_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 # @note This is going to be part of fog-xml eventually
 describe Fog::XML::Connection do

data/spec/helpers/bin.rb

@@ -23,6 +23,10 @@ module Fog
       assert_respond_to subject, :[]
     end
 
+    it "#[] when unknown service is passed raises ArgumentError" do
+      assert_raises(ArgumentError) { subject[:bad_service] }
+    end
+
     it "responds to services" do
       assert_respond_to subject, :services
     end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+if ENV["COVERAGE"]
+  require "simplecov"
+
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+
+require "minitest/autorun"
+require "minitest/spec"
+require "minitest/stub_const"
+
+$LOAD_PATH.unshift "lib"
+
+require "fog"

data/tests/compute/helper.rb

@@ -107,6 +107,9 @@ def compute_providers
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => true
+    },
+    :xenserver => {
+      :mocked => false
     }
   }
 end

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

@@ -28,7 +28,6 @@ class Glesys
           'server' => {
             'managedhosting'  => String,
             'cost'            => {
-              'amount'      =>  Float,
               'timeperiod'  => String,
               'currency'    => String
             },
@@ -86,6 +85,18 @@ class Glesys
           }
         )
 
+        EDIT = DETAILS.merge(
+          'debug' => {
+            'input' => {
+              'serverid'      => Fog::Nullable::String,
+              'disksize'      => String,
+              'memorysize'    => String,
+              'cpucores'      => String,
+              'bandwidth'     => String
+            }
+          }
+        )
+
         STATUS = {
           'debug' => {
             'input' => {
@@ -115,7 +126,7 @@ class Glesys
               'unit'  => Fog::Nullable::String
             },
             'cpu'       => {
-              'usage' => Fog::Nullable::Integer,
+              'usage' => Fog::Nullable::Float,
               'max'   => Fog::Nullable::Integer,
               'unit'  => Fog::Nullable::String
             },
@@ -229,6 +240,59 @@ class Glesys
           }
         }
       end
+      module SshKeys
+        ADD = {
+          'debug' => {
+            'input' => {
+              'sshkey'      => String,
+              'description' => String
+            }
+          },
+          'sshkey' => {
+            'id'          => Integer,
+            'account'     => String,
+            'description' => String,
+            'data'        => String
+          },
+          'status' => {
+            'timestamp'     => String,
+            'code'          => Integer,
+            'text'          => String,
+            'transactionid' => Fog::Nullable::String
+          }
+        }
+        REMOVE = {
+          'debug' => {
+            'input' => {
+              'sshkeyids' => String,
+            }
+          },
+          'status' => {
+            'timestamp'     => String,
+            'code'          => Integer,
+            'text'          => String,
+            'transactionid' => Fog::Nullable::String
+          }
+        }
+        LIST = {
+          'debug' => {
+            'input' => []
+          },
+          'sshkeys' => [
+            {
+              'id' => Integer,
+              'account' => String,
+              'description' => String,
+              'data' => String,
+            }
+          ],
+          'status' => {
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
+          }
+        }
+      end
       module Templates
         LIST = {
           'debug' => {

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

@@ -4,11 +4,11 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     @hostname = "fog-#{Time.now.to_i}"
 
     @create = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
-    ":datacenter => 'Falkenberg', :platform => 'Xen', :templatename => 'Debian-6 x64', "+
+    ":datacenter => 'Falkenberg', :platform => 'VMware', :templatename => 'Debian 7.0 64-bit', "+
     ":disksize => '10', :memorysize => '512', :cpucores => '1', :transfer => '500', :bandwidth => '10'"
 
     @create_vz = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
-    ":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 6.0 64-bit', "+
+    ":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 7.0 64-bit', "+
     ":disksize => '10', :memorysize => '256', :cpucores => '2', :transfer => '500', :bandwidth => '10'"
 
   tests('success') do
@@ -22,10 +22,11 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
       pending if Fog.mocking?
       vm =  Fog::Compute[:glesys].create(
               :hostname     => @hostname,
+              :description  => "Fog test server",
               :rootpassword => "pw#{Time.now.to_i}",
               :datacenter   => "Falkenberg",
-              :platform     => "Xen",
-              :templatename => "Debian-6 x64",
+              :platform     => "VMware",
+              :templatename => "Debian 7.0 64-bit",
               :disksize     => "10",
               :memorysize   => "512",
               :cpucores     => "1",
@@ -86,18 +87,33 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
               :rootpassword => "pw#{Time.now.to_i}",
               :datacenter   => "Stockholm",
               :platform     => "OpenVZ",
-              :templatename => "Debian 6.0 64-bit",
+              :templatename => "Debian 7.0 64-bit",
               :disksize     => "10",
               :memorysize   => "256",
               :cpucores     => "2",
               :transfer     => "500",
               :bandwidth    => "10"
             )
-
       @serverid = vm.body['response']['server']['serverid']
       vm.body['response']
     end
 
+    unless Fog.mocking?
+      Fog::Compute[:glesys].servers.get(@serverid).wait_for { ready? }
+    end
+
+    tests("#edit #{@serverid}").formats(Glesys::Compute::Formats::Servers::EDIT) do
+      pending if Fog.mocking?
+      vm = Fog::Compute[:glesys].edit(
+        :serverid => @serverid,
+        :disksize => "10",
+        :memorysize => "512",
+        :cpucores => "1",
+        :bandwidth => "10"
+      )
+      vm.body['response']
+    end
+
     tests("#server_details(#{@serverid})").formats(Glesys::Compute::Formats::Servers::DETAILS) do
       pending if Fog.mocking?
       Fog::Compute[:glesys].server_details(@serverid).body['response']

data/tests/glesys/requests/compute/ssh_key_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests("Fog::Compute[:glesys] | ssh_key requests", ["glesys", "compute"]) do
+  @testdescription = "My test key to be removed"
+  @testdata = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDv+r/dCIDv+YazWsyc1WCixR+iOeaswTx1U45h6vh4/ fog-unittest@GleSYS"
+  @testdata_malformed = "ssh-rot13 AAAAthis_is_not_an_ssh_key fog-unittest@GleSYS"
+
+  tests("success") do
+    tests("#ssh_key_add").formats(Glesys::Compute::Formats::SshKeys::ADD) do
+      pending if Fog.mocking?
+      @resp = Fog::Compute[:glesys].ssh_key_add(:description => @testdescription, :sshkey => @testdata)
+      @resp.body["response"]
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:glesys].ssh_keys.destroy(@resp.body["response"]["sshkey"]["id"])
+      @key = Fog::Compute[:glesys].ssh_keys.create(:description => @testdescription, :data => @testdata)
+    end
+
+    tests("#ssh_key_list").formats(Glesys::Compute::Formats::SshKeys::LIST) do
+      pending if Fog.mocking?
+      @resp = Fog::Compute[:glesys].ssh_key_list
+      @resp.body["response"]
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:glesys].ssh_keys.destroy(@key.id)
+      @key = Fog::Compute[:glesys].ssh_keys.create(:description => @testdescription, :data => @testdata)
+    end
+
+    tests("#ssh_key_remove").formats(Glesys::Compute::Formats::SshKeys::REMOVE) do
+      pending if Fog.mocking?
+      @resp = Fog::Compute[:glesys].ssh_key_remove(:sshkeyids => @key.id)
+      @resp.body["response"]
+    end
+  end
+
+  tests("failure") do
+    tests("#ssh_key_add with malformed key data").raises(Excon::Errors::HTTPStatusError) do
+      pending if Fog.mocking?
+      Fog::Compute[:glesys].ssh_key_add(:description => @testdescription, :data => @testdata_malformed)
+    end
+
+    tests("#ssh_key_remove with nonexistent/invalid key id").raises(Excon::Errors::HTTPStatusError) do
+      pending if Fog.mocking?
+      Fog::Compute[:glesys].ssh_key_remove(:id => -1)
+    end
+  end
+end

data/tests/google/credentials_tests.rb

@@ -0,0 +1,73 @@
+require 'google/api_client'
+
+Shindo.tests('Google | credentials', ['google']) do
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    google_key_location = Fog.credentials[:google_key_location]
+    if google_key_location.nil?
+      tests('Needs a :google_key_location credentials key').pending
+    end
+    google_key_string = File.open(File.expand_path(google_key_location), 'rb') { |io| io.read }
+
+    tests("#using_p12_key_file").succeeds do
+      Fog::Compute::Google.new(:google_key_location => google_key_location,
+                               :google_key_string => nil,
+                               :google_json_key_location => nil,
+                               :google_json_key_string => nil)
+    end
+
+    tests("#using_p12_key_string").succeeds do
+      Fog::Compute::Google.new(:google_key_location => nil,
+                               :google_key_string => google_key_string,
+                               :google_json_key_location => nil,
+                               :google_json_key_string => nil)
+    end
+  end
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    google_json_key_location = Fog.credentials[:google_json_key_location]
+    if google_json_key_location.nil?
+      tests('Needs a :google_json_key_location credentials key').pending
+    end
+    google_json_key_string = File.open(File.expand_path(google_json_key_location), 'rb') { |io| io.read }
+
+    tests("#using_json_key_file").succeeds do
+      Fog::Compute::Google.new(:google_key_location => nil,
+                               :google_key_string => nil,
+                               :google_json_key_location => google_json_key_location,
+                               :google_json_key_string => nil)
+    end
+
+    tests("#using_json_key_string").succeeds do
+      Fog::Compute::Google.new(:google_key_location => nil,
+                               :google_key_string => nil,
+                               :google_json_key_location => nil,
+                               :google_json_key_string => google_json_key_string)
+    end
+  end
+
+  tests('failure') do
+    tests("#missing_google_project").raises(ArgumentError, 'raises ArgumentError when google_project is missing') do
+       Fog::Compute::Google.new(:google_project => nil)
+    end
+
+    tests("#missing_google_client_email").raises(ArgumentError, 'raises ArgumentError when google_client_email is missing') do
+      pending if Fog.mocking? # Mock doesn't check google_client_email
+      Fog::Compute::Google.new(:google_client_email => nil,
+                               :google_json_key_location => nil) # JSON key overrides google_client_email
+    end
+
+    tests("#missing_keys").raises(ArgumentError, 'raises ArgumentError when google keys are missing') do
+      pending if Fog.mocking? # Mock doesn't check missing keys
+      Fog::Compute::Google.new(:google_key_location => nil,
+                               :google_key_string => nil,
+                               :google_json_key_location => nil,
+                               :google_json_key_string => nil)
+    end
+  end
+
+end