fog 0.5.2 → 0.5.3

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::BackupInternetService }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :name, :id, :protocol, :enabled, :description, :timeout, :redirect_url, :monitor] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :name, :id, :protocol, :enabled, :description, :timeout, :redirect_url, :monitor]) }
     end
 
     context "with no uri" do
@@ -23,7 +23,7 @@ if Fog.mocking?
 
       let(:composed_service_data) { @vcloud.vdcs[0].backup_internet_services[0].send(:_compose_service_data) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::BackupInternetService }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::BackupInternetService) }
 
       its(:href)                  { should == @mock_backup_service.href }
       its(:identity)              { should == @mock_backup_service.href }
@@ -45,5 +45,4 @@ if Fog.mocking?
       specify { composed_service_data[:timeout].should == subject.timeout.to_s }
     end
   end
-else
 end

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

@@ -5,7 +5,7 @@ if Fog.mocking?
     context "as an attribute of a VDC" do
       subject { @vcloud.vdcs[0] }
 
-      it { should respond_to :backup_internet_services }
+      it { should respond_to(:backup_internet_services) }
 
       describe :class do
         subject { @vcloud.vdcs[0].backup_internet_services.class }
@@ -15,15 +15,14 @@ if Fog.mocking?
       describe :backup_internet_services do
         subject { @vcloud.vdcs[0].backup_internet_services }
 
-        it { should respond_to :create }
+        it { should respond_to(:create) }
 
-        it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::BackupInternetServices }
+        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::BackupInternetServices) }
 
         its(:length) { should == 1 }
 
-        it { should have_members_of_the_right_model }
+        it { should(have_members_of_the_right_model) }
       end
     end
   end
-else
 end

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::InternetService }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :name, :id, :protocol, :port, :enabled, :description, :public_ip, :timeout, :redirect_url, :monitor, :backup_service_data] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :name, :id, :protocol, :port, :enabled, :description, :public_ip, :timeout, :redirect_url, :monitor, :backup_service_data]) }
     end
 
     context "with no uri" do
@@ -29,7 +29,7 @@ if Fog.mocking?
       let(:composed_public_ip_data) { @vcloud.vdcs[0].public_ips[0].internet_services[0].send(:_compose_ip_data) }
       let(:composed_service_data) { @vcloud.vdcs[0].public_ips[0].internet_services[0].send(:_compose_service_data) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::InternetService }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::InternetService) }
 
       its(:href)               { should == @mock_service.href }
       its(:identity)           { should == @mock_service.href }
@@ -75,6 +75,29 @@ if Fog.mocking?
             to change { subject.send(:_compose_service_data)[:backup_service_uri] }.from(nil).to(@mock_backup_service.href)
         end
       end
+
+      describe "disable monitoring via #monitor=" do
+        specify do
+          expect { subject.monitor = {:type => "Disabled", :is_enabled => "true" }; subject.save }.to change {subject.monitor}.from(nil).to(ecloud_disabled_default_monitor)
+        end
+
+      end
+
+      describe "disable monitoring via #disable_monitor" do
+        specify do
+          expect { subject.disable_monitor }.to change {subject.monitor}.from(nil).to(ecloud_disabled_default_monitor)
+        end
+      end
+
+      context "with a disabled monitor" do
+        before { subject.disable_monitor }
+
+        describe "enable ping monitoring via #enable_ping_monitor" do
+          specify do
+            expect { subject.enable_ping_monitor }.to change {subject.monitor}.from(ecloud_disabled_default_monitor).to(nil)
+          end
+        end
+      end
     end
   end
 else

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

@@ -5,7 +5,7 @@ if Fog.mocking?
     context "as an attribute of a VDC" do
       subject { @vcloud.vdcs[0] }
 
-      it { should respond_to :internet_services }
+      it { should respond_to(:internet_services) }
 
       describe :class do
         subject { @vcloud.vdcs[0].internet_services.class }
@@ -15,9 +15,9 @@ if Fog.mocking?
       describe :internet_services do
         subject { @vcloud.vdcs[0].internet_services }
 
-        it { should respond_to :create }
+        it { should respond_to(:create) }
 
-        it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::InternetServices }
+        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::InternetServices) }
 
         its(:length) { should == 4 }
 

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::Ip }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :name, :status, :server, :rnat, :id] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :name, :status, :server, :rnat, :id]) }
     end
 
     context "with no uri" do
@@ -20,7 +20,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @ip = @vcloud.vdcs[0].networks[0].ips[0] }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Ip }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Ip) }
 
       its(:name) { should == @mock_data.network_ip_from_href(@ip.href).name }
       its(:status) { should == @mock_data.network_ip_from_href(@ip.href).status }

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Ips", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
-    it { should respond_to :ips }
+    it { should respond_to(:ips) }
 
     describe :class do
       subject { @vcloud.vdcs[0].networks[0].ips.class }
@@ -13,9 +13,9 @@ if Fog.mocking?
 
     describe :ips do
       subject { @vcloud.vdcs[0].networks[0].ips.reload }
-      it { should_not respond_to :create }
+      it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Ips }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Ips) }
 
       its(:length) { should == 252 }
 

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::Network }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :name, :features, :links, :type, :gateway, :broadcast, :address, :rnat, :extension_href, :network_type, :vlan, :friendly_name] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :name, :features, :links, :type, :gateway, :broadcast, :address, :rnat, :extension_href, :network_type, :vlan, :friendly_name]) }
     end
 
     context "with no uri" do
@@ -21,7 +21,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs[0].networks[0].reload }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Network }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Network) }
 
       its(:href)                  { should == @mock_network.href }
       its(:identity)              { should == @mock_network.href }
@@ -40,7 +40,7 @@ if Fog.mocking?
 
       describe :features do
         let(:feature) { subject.features.first }
-        specify { feature.should be_an_instance_of Array }
+        specify { feature.should be_an_instance_of(Array) }
         specify { feature.last.should == @mock_network.features[0][:value] }
       end
 

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Networks", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
-    it { should respond_to :networks }
+    it { should respond_to(:networks) }
 
     describe :class do
       subject { @vcloud.networks.class }
@@ -13,9 +13,9 @@ if Fog.mocking?
 
     describe :networks do
       subject { @vcloud.vdcs[0].networks }
-      it { should_not respond_to :create }
+      it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Networks }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Networks) }
 
       its(:length) { should == 2 }
 

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

@@ -8,8 +8,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::Node }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :ip_address, :description, :name, :port, :enabled, :id] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :ip_address, :description, :name, :port, :enabled, :id]) }
     end
 
     context "with no uri" do
@@ -22,7 +22,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes.first.reload }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Node }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Node) }
 
       its(:href)                  { should == @mock_node.href }
       its(:identity)              { should == @mock_node.href }

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

@@ -5,7 +5,7 @@ if Fog.mocking?
     context "as an attribute of an internet_service" do
       subject { @vcloud.vdcs.first.public_ips.first.internet_services.first }
 
-      it { should respond_to :nodes }
+      it { should respond_to(:nodes) }
 
       describe :class do
         subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes.class }
@@ -15,9 +15,9 @@ if Fog.mocking?
       describe :nodes do
         subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes }
 
-        it { should respond_to :create }
+        it { should respond_to(:create) }
 
-        it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Nodes }
+        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Nodes) }
 
         its(:length) { should == 3 }
 
@@ -25,5 +25,4 @@ if Fog.mocking?
       end
     end
   end
-else
 end

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::PublicIp }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:name, :id, :href] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:name, :id, :href]) }
     end
 
     context "with no uri" do
@@ -21,7 +21,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs[0].public_ips[0].reload; @vcloud.vdcs[0].public_ips[0] }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::PublicIp }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIp) }
 
       its(:href)                  { should == @mock_public_ip.href }
       its(:identity)              { should == @mock_public_ip.href }

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::PublicIps", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
-    it { should respond_to :public_ips }
+    it { should respond_to(:public_ips) }
 
     describe :class do
       subject { @vcloud.public_ips.class }
@@ -13,9 +13,9 @@ if Fog.mocking?
 
     describe :public_ips do
       subject { @vcloud.vdcs[0].public_ips }
-      it { should_not respond_to :create }
+      it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::PublicIps }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIps) }
 
       its(:length) { should == 3 }
 

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

@@ -7,8 +7,8 @@ if Fog.mocking?
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::Server }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :type, :name, :status, :network_connections, :os, :virtual_hardware, :storage_size, :links] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :type, :name, :status, :network_connections, :os, :virtual_hardware, :storage_size, :links]) }
     end
 
     context "with no uri" do

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

@@ -4,14 +4,14 @@ if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
-    it { should respond_to :get_vdc }
+    it { should respond_to(:get_vdc) }
 
     describe :class do
       subject { Fog::Vcloud::Terremark::Ecloud::Vdc }
 
-      it { should have_identity :href }
-      it { should have_only_these_attributes [:href, :name, :type, :description, :other_links, :compute_capacity, :storage_capacity, :available_networks,
-                                              :resource_entities, :deployed_vm_quota, :instantiated_vm_quota] }
+      it { should have_identity(:href) }
+      it { should have_only_these_attributes([:href, :name, :type, :description, :other_links, :compute_capacity, :storage_capacity, :available_networks,
+                                              :resource_entities, :deployed_vm_quota, :instantiated_vm_quota]) }
     end
 
     context "with no uri" do
@@ -27,7 +27,7 @@ if Fog.mocking?
       its(:href)                  { should == @mock_vdc.href }
       its(:identity)              { should == @mock_vdc.href }
       its(:name)                  { should == @mock_vdc.name }
-      its(:public_ips)            { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::PublicIps }
+      its(:public_ips)            { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIps) }
       its(:other_links)           { should have(4).items }
       its(:resource_entities)     { should have(3).items }
       its(:available_networks)    { should have(2).items }

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdcs", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
-    it { should respond_to :vdcs }
+    it { should respond_to(:vdcs) }
 
     describe :class do
       subject { @vcloud.vdcs.class }
@@ -13,9 +13,9 @@ if Fog.mocking?
 
     describe :vdcs do
       subject { @vcloud.vdcs }
-      it { should_not respond_to :create }
+      it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of Fog::Vcloud::Terremark::Ecloud::Vdcs }
+      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Vdcs) }
 
       its(:length) { should == 2 }
 

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :add_backup_internet_service }
+    it { should respond_to(:add_backup_internet_service) }
 
     describe "#add_backup_internet_service" do
       before do
@@ -28,7 +28,7 @@ if Fog.mocking?
 
         let(:body) { subject.body }
 
-        its(:body) { should be_an_instance_of Hash }
+        its(:body) { should be_an_instance_of(Hash) }
         specify { body[:Href].should_not be_empty }
         specify { body[:Name].should == @new_backup_service_data[:name] }
         specify { body[:Protocol].should == @new_backup_service_data[:protocol] }

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :add_internet_service }
+    it { should respond_to(:add_internet_service) }
 
     describe "#add_internet_service" do
       before do
@@ -29,7 +29,7 @@ if Fog.mocking?
 
         let(:body) { subject.body }
 
-        its(:body) { should be_an_instance_of Hash }
+        its(:body) { should be_an_instance_of(Hash) }
         specify { body[:Href].should_not be_empty }
         specify { body[:Name].should == @new_service_data[:name] }
         specify { body[:Protocol].should == @new_service_data[:protocol] }
@@ -39,7 +39,7 @@ if Fog.mocking?
         specify { body[:Monitor].should == nil }
 
         let(:referenced_public_ip) { subject.body[:PublicIpAddress] }
-        specify { referenced_public_ip.should be_an_instance_of Hash }
+        specify { referenced_public_ip.should be_an_instance_of(Hash) }
         specify { referenced_public_ip[:Name].should == @public_ip.name }
         specify { referenced_public_ip[:Id].should == @public_ip.id }
 

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

@@ -5,7 +5,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :add_node }
+    it { should respond_to(:add_node) }
 
     describe "#add_node" do
 

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :configure_internet_service }
+    it { should respond_to(:configure_internet_service) }
 
     describe "#configure_internet_service" do
       before do

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :configure_network_ip }
+    it { should respond_to(:configure_network_ip) }
 
     describe "#configure_network_ip" do
       let(:original_network_ip) { @vcloud.get_network_ip(@mock_network_ip.href).body }

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

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :configure_node }
+    it { should respond_to(:configure_node) }
 
     describe "#configure_node" do
       let(:original_node) { @vcloud.get_node(@mock_node.href).body }