RubyGems - fog - Versions diffs - 0.4.0 → 0.4.1 - Mend

fog 0.4.0 → 0.4.1

Files changed (582) hide show

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'vcloud/spec_helper'
 describe Vcloud do
   it { should be_initialized }

data/spec/vcloud/models/vdc_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Vdc", :type => :mock_vcloud_model do

data/spec/vcloud/requests/get_network_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

data/spec/vcloud/requests/get_organization_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

data/spec/vcloud/requests/get_vdc_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 #
 # WARNING: INCOMPLETE

data/spec/vcloud/requests/get_versions_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 shared_examples_for "real or mock get_versions requests" do

data/spec/vcloud/requests/login_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 shared_examples_for "real or mock login requests" do
   subject { @vcloud }

data/spec/vcloud/spec_helper.rb CHANGED

@@ -19,13 +19,12 @@ end
 #Initialize this to a known seed
 srand 1234
-current_directory = File.dirname(__FILE__)
-require "#{current_directory}/../../lib/fog"
-require "#{current_directory}/../../lib/fog/core/bin"
+require 'fog'
+require 'fog/bin'
 Fog.mock! if ENV['FOG_MOCK']
-require "#{current_directory}/../../lib/fog/vcloud/bin"
+require 'fog/bin/vcloud'
 def arrayify(item)
   item.is_a?(Array) ? item : [ item ]

data/spec/vcloud/terremark/ecloud/models/backup_internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::BackupInternetService", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/backup_internet_services_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetService", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/internet_services_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/ip_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Ip", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/ips_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Ips", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/network_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Network", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/networks_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Networks", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/node_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Node", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/nodes_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/public_ip_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::PublicIp", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/public_ips_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::PublicIps", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/server_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/vdc_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/models/vdcs_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdcs", :type => :mock_tmrk_ecloud_model do

data/spec/vcloud/terremark/ecloud/requests/add_backup_internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/add_node_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   #FIXME: with rspec2

data/spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/configure_network_ip_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 shared_examples_for "a successful configure vapp" do
   specify { after_vapp_data.should == new_vapp_data }

data/spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 #FIXME: Make this more sane with rspec2
 if Fog.mocking?

data/spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   #FIXME: with rspec2

data/spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 shared_examples_for "a failed vapp deletion" do
   it "should not change the mock data" do

data/spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   shared_examples_for "a basic internet service" do

data/spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_network_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_node_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/login_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/power_off_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

data/spec/vcloud/vcloud_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'vcloud/spec_helper'
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

data/tests/compute/requests/brightbox/helper.rb CHANGED

@@ -189,6 +189,7 @@ class Brightbox
         }
         LOAD_BALANCER = {
+          "cloud_ips"       => Array,
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
@@ -202,6 +203,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
+          "listed"          => Fog::Boolean,
           "name"            => String,
           "status"          => String,
           "hostname"        => String,

data/tests/compute/requests/terremark_ecloud/catalog_tests.rb ADDED

@@ -0,0 +1,47 @@
+Shindo.tests('TerremarkEcloud::Compute | catalog requests', ['terremark_ecloud']) do
+  @catalog_format = {
+    'name' => String,
+    'href' => String,
+    'CatalogItems' => [{
+      'href'  => String,
+      'name'  => String,
+      'type'  => String
+    }]
+  }
+  @catalog_item_format = {
+    'name'      => String,
+    'Entity'    => {
+      'href' => String,
+      'name' => String,
+      'type' => String
+    },
+    'href'      => String,
+    'Link'      => {
+      'href' => String,
+      'name' => String,
+      'rel'  => String,
+      'type' => String
+    },
+    'Property'  => {
+      'LicensingCost' => String
+    },
+    'type'      => String,
+  }
+  tests('success') do
+    tests("#get_catalog").formats(@catalog_format) do
+      pending if Fog.mocking?
+      TerremarkEcloud[:compute].get_catalog(TerremarkEcloud::Compute.preferred_catalog['href']).body
+    end
+    tests("#get_catalog_item").formats(@catalog_item_format) do
+      pending if Fog.mocking?
+      TerremarkEcloud[:compute].get_catalog_item(TerremarkEcloud::Compute.preferred_catalog_item['href']).body
+    end
+  end
+end

data/tests/compute/requests/terremark_ecloud/helper.rb ADDED

@@ -0,0 +1,45 @@
+class TerremarkEcloud
+  module Compute
+    def self.vdc_from_list(vdc_list)
+      if matcher = ENV['VDC_NAME_MATCHER']
+        vdc_list.detect {|v| v['name'] =~ /#{Regexp.escape(matcher)}/ }
+      else
+        vdc_list.first
+      end
+    end
+    def self.preferred_vdc
+      @preferred_vdc ||= begin
+        href = vdc_from_list(TerremarkEcloud[:compute].get_organization.body['Link'])['href']
+        TerremarkEcloud[:compute].get_vdc(href).body
+      end
+    end
+    def self.preferred_catalog
+      @preferred_catalog ||= begin
+        catalog_href = preferred_vdc['Link'].detect {|link| link['type'] == 'application/vnd.vmware.vcloud.catalog+xml' }['href']
+        TerremarkEcloud[:compute].get_catalog(catalog_href).body
+      end
+    end
+    def self.preferred_catalog_item
+      @preferred_catalog_item ||= begin
+        catalog_item = preferred_catalog['CatalogItems'].detect do |item|
+          item['name'] == 'Ubuntu Server 10.04 x32'
+        end
+        TerremarkEcloud[:compute].get_catalog_item(catalog_item['href']).body
+      end
+    end
+    def self.preferred_network
+      @preferred_network ||= begin
+        network_href = preferred_vdc['AvailableNetworks'].first['href']
+        TerremarkEcloud[:compute].get_network(network_href).body
+      end
+    end
+  end
+end