squall 1.1.0 → 1.2.0beta1

data/spec/squall/virtual_machine_spec.rb

@@ -34,7 +34,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.show(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.show(404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "returns a virtual_machine" do
@@ -140,7 +140,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.build(404, :template_id => 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.build(404, :template_id => 1) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -165,7 +165,7 @@ describe Squall::VirtualMachine do
     end
 
     it "404s on not found" do
-      expect { @virtual_machine.edit(404, :label => 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.edit(404, :label => 1) }.to raise_error(Squall::NotFoundError)
     end
 
     it "accepts all valid keys" do
@@ -216,7 +216,7 @@ describe Squall::VirtualMachine do
     end
 
     it "404s on not found" do
-      expect { @virtual_machine.change_owner(404, 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.change_owner(404, 1) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -248,7 +248,7 @@ describe Squall::VirtualMachine do
     end
 
     it "404s on not found" do
-      expect { @virtual_machine.change_password(404, 'password') }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.change_password(404, 'password') }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -266,7 +266,7 @@ describe Squall::VirtualMachine do
     end
     
     it "404s on not found" do
-      expect { @virtual_machine.set_ssh_keys(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.set_ssh_keys(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
     
@@ -295,12 +295,12 @@ describe Squall::VirtualMachine do
     end
 
     it "404s on not found" do
-      expect { @virtual_machine.migrate(404, :destination => 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.migrate(404, :destination => 1) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
     it "404s on unknown destination" do
-        expect { @virtual_machine.migrate(1, :destination => 404) }.to raise_error(Squall::NotFound)
+        expect { @virtual_machine.migrate(1, :destination => 404) }.to raise_error(Squall::NotFoundError)
         @virtual_machine.success.should be_false
     end
 
@@ -320,7 +320,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.set_vip(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.set_vip(404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "deletes a virtual_machine" do
@@ -344,7 +344,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.delete(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.delete(404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "deletes a virtual_machine" do
@@ -360,7 +360,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.resize(404, :memory => 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.resize(404, :memory => 1) }.to raise_error(Squall::NotFoundError)
     end
     
     it "accepts memory" do
@@ -406,7 +406,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.suspend(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.suspend(404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "suspends a virtual_machine" do
@@ -422,7 +422,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.unlock(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.unlock(404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "unlocks a virtual_machine" do
@@ -439,7 +439,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.startup(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.startup(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -457,7 +457,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.shutdown(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.shutdown(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -475,7 +475,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.stop(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.stop(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -493,7 +493,7 @@ describe Squall::VirtualMachine do
     end
 
     it "returns not found for invalid virtual_machines" do
-      expect { @virtual_machine.reboot(404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.reboot(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
@@ -522,16 +522,16 @@ describe Squall::VirtualMachine do
     end
 
     it "404s on not found" do
-      expect { @virtual_machine.segregate(404, 1) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.segregate(404, 1) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
     it "returns 404 on unknown target vm id" do
-      expect { @virtual_machine.segregate(1, 404) }.to raise_error(Squall::NotFound)
+      expect { @virtual_machine.segregate(1, 404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
 
-    it "changes the user" do
+    it "segregates the VMS with given ids" do
       result = @virtual_machine.segregate(1, 2)
       @virtual_machine.success.should be_true
     end
@@ -546,7 +546,7 @@ describe Squall::VirtualMachine do
 
     it "returns not found for invalid virtual_machines" do
       pending "broken on OnApp (returning 500)" do
-        expect { @virtual_machine.console(404) }.to raise_error(Squall::NotFound)
+        expect { @virtual_machine.console(404) }.to raise_error(Squall::NotFoundError)
         @virtual_machine.success.should be_false
       end
     end
@@ -568,7 +568,7 @@ describe Squall::VirtualMachine do
 
     it "returns not found for invalid virtual_machines" do
       pending "broken on OnApp (returning 500)" do
-        expect { @virtual_machine.stats(404) }.to raise_error(Squall::NotFound)
+        expect { @virtual_machine.stats(404) }.to raise_error(Squall::NotFoundError)
         @virtual_machine.success.should be_false
       end
     end

data/spec/squall/whitelist_spec.rb

@@ -31,7 +31,7 @@ describe Squall::Whitelist do
     end
 
     it "returns not found for invalid whitelists" do
-      expect { @whitelist.show(1, 404) }.to raise_error(Squall::NotFound)
+      expect { @whitelist.show(1, 404) }.to raise_error(Squall::NotFoundError)
     end
 
     it "returns a whitelist" do
@@ -60,7 +60,7 @@ describe Squall::Whitelist do
     end
     
     it "raises an error for an invalid user id" do
-      expect { @whitelist.create(404, @valid) }.to raise_error(Squall::NotFound)
+      expect { @whitelist.create(404, @valid) }.to raise_error(Squall::NotFoundError)
     end
 
     it "creates a whitelist for a user" do
@@ -90,7 +90,7 @@ describe Squall::Whitelist do
     end
     
     it "raises an error for an invalid whitelist id" do
-      expect { @whitelist.edit(1, 404, @valid) }.to raise_error(Squall::NotFound)
+      expect { @whitelist.edit(1, 404, @valid) }.to raise_error(Squall::NotFoundError)
     end
   end
   
@@ -106,7 +106,7 @@ describe Squall::Whitelist do
     end
 
     it "returns NotFound for missing user" do
-      expect { @whitelist.delete(1, 404) }.to raise_error(Squall::NotFound)
+      expect { @whitelist.delete(1, 404) }.to raise_error(Squall::NotFoundError)
     end
   end
 

data/spec/vcr_cassettes/data_store_zone/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/data_store_zone/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones/1.json?pack[label]=Updated%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones/1.json?pack%5Blabel%5D=Updated+zone
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones/404.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/data_store_zones/404.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/firewall_rule/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/firewall_rules.json?firewall_rule[command]=DROP&firewall_rule[protocol]=TCP&firewall_rule[network_interface_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/firewall_rules.json?firewall_rule%5Bcommand%5D=DROP&firewall_rule%5Bprotocol%5D=TCP&firewall_rule%5Bnetwork_interface_id%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules.json?firewall_rule[command]=DROP&firewall_rule[protocol]=TCP&firewall_rule[network_interface_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules.json?firewall_rule%5Bcommand%5D=DROP&firewall_rule%5Bprotocol%5D=TCP&firewall_rule%5Bnetwork_interface_id%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/firewall_rule/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules/1.json?firewall_rule[port]=1000
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules/1.json?firewall_rule%5Bport%5D=1000
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules/404.json?firewall_rule[command]=DROP&firewall_rule[protocol]=TCP&firewall_rule[network_interface_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/firewall_rules/404.json?firewall_rule%5Bcommand%5D=DROP&firewall_rule%5Bprotocol%5D=TCP&firewall_rule%5Bnetwork_interface_id%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor/add_network_join.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors/1/network_joins.json?network_join[network_id]=1&network_join[interface]=interface
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors/1/network_joins.json?network_join%5Bnetwork_id%5D=1&network_join%5Binterface%5D=interface
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors.json?hypervisor[label]=A%20new%20hypervisor&hypervisor[ip_address]=127.126.126.126&hypervisor[hypervisor_type]=xen
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors.json?hypervisor%5Blabel%5D=A+new+hypervisor&hypervisor%5Bip_address%5D=127.126.126.126&hypervisor%5Bhypervisor_type%5D=xen
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors/1.json?hypervisor[label]=A%20new%20label
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisors/1.json?hypervisor%5Blabel%5D=A+new+label
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor_zones/add_network_join.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/1/network_joins.json?network_join[interface]=interface&network_join[network_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/1/network_joins.json?network_join%5Binterface%5D=interface&network_join%5Bnetwork_id%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor_zones/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/hypervisor_zones/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/1.json?pack[label]=Updated%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/1.json?pack%5Blabel%5D=Updated+zone
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/404.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/settings/hypervisor_zones/404.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/ipaddress/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1/ip_addresses.json?ip_address[address]=109.123.91.24&ip_address[netmask]=255.255.255.194&ip_address[network_address]=109.123.91.66&ip_address[broadcast]=109.123.91.129&ip_address[gateway]=109.123.91.67
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1/ip_addresses.json?ip_address%5Baddress%5D=109.123.91.24&ip_address%5Bnetmask%5D=255.255.255.194&ip_address%5Bnetwork_address%5D=109.123.91.66&ip_address%5Bbroadcast%5D=109.123.91.129&ip_address%5Bgateway%5D=109.123.91.67
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/ipaddress/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1/ip_addresses/1.json?ip_address[address]=109.123.91.67&ip_address[netmask]=255.255.255.193&ip_address[network_address]=109.123.91.65&ip_address[broadcast]=109.123.91.128&ip_address[gateway]=109.123.91.66
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1/ip_addresses/1.json?ip_address%5Baddress%5D=109.123.91.67&ip_address%5Bnetmask%5D=255.255.255.193&ip_address%5Bnetwork_address%5D=109.123.91.65&ip_address%5Bbroadcast%5D=109.123.91.128&ip_address%5Bgateway%5D=109.123.91.66
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/ipaddress_join/assign.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/ip_addresses.json?ip_address_join[network_interface_id]=1&ip_address_join[ip_address_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/ip_addresses.json?ip_address_join%5Bnetwork_interface_id%5D=1&ip_address_join%5Bip_address_id%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/ip_addresses.json?ip_address_join[network_interface_id]=1&ip_address_join[ip_address_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/ip_addresses.json?ip_address_join%5Bnetwork_interface_id%5D=1&ip_address_join%5Bip_address_id%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/network/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network[label]=networktaken
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network%5Blabel%5D=networktaken
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network[identifier]=newnetworkid&network[label]=newnetwork&network[vlan]=1
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network%5Bidentifier%5D=newnetworkid&network%5Blabel%5D=newnetwork&network%5Bvlan%5D=1
     body: 
     headers: 
       content-type: 
@@ -80,7 +80,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network[label]=newnetwork
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network%5Blabel%5D=newnetwork
     body: 
     headers: 
       content-type: 
@@ -119,7 +119,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network[label]=newnetwork&network[vlan]=2
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network%5Blabel%5D=newnetwork&network%5Bvlan%5D=2
     body: 
     headers: 
       content-type: 
@@ -158,7 +158,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network[identifier]=something&network[label]=newnetwork
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks.json?network%5Bidentifier%5D=something&network%5Blabel%5D=newnetwork
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/network/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network[label]=one
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network%5Blabel%5D=one
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network[network_group_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network%5Bnetwork_group_id%5D=1
     body: 
     headers: 
       content-type: 
@@ -80,7 +80,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network[identifier]=lolzsdfds
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network%5Bidentifier%5D=lolzsdfds
     body: 
     headers: 
       content-type: 
@@ -119,7 +119,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network[vlan]=1
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network%5Bvlan%5D=1
     body: 
     headers: 
       content-type: 
@@ -158,7 +158,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network[identifier]=woah&network[label]=two&network[vlan]=2
+    uri: http://<USER>:<PASS>@<URL>:80/settings/networks/1.json?network%5Bidentifier%5D=woah&network%5Blabel%5D=two&network%5Bvlan%5D=2
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/network_zones/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/network_zones.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/network_zones.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/network_zones/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/network_zones/1.json?pack[label]=Updated%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/network_zones/1.json?pack%5Blabel%5D=Updated+zone
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/network_zones/404.json?pack[label]=My%20zone
+    uri: http://<USER>:<PASS>@<URL>:80/network_zones/404.json?pack%5Blabel%5D=My+zone
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/payment/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/users/404/payments.json?payment[amount]=500
+    uri: http://<USER>:<PASS>@<URL>:80/users/404/payments.json?payment%5Bamount%5D=500
     body:
     headers:
       content-type:
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments.json?payment[amount]=500
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments.json?payment%5Bamount%5D=500
     body:
     headers:
       content-type:

data/spec/vcr_cassettes/payment/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments/1.json?payment[amount]=100
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments/1.json?payment%5Bamount%5D=100
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments/404.json?payment[amount]=500
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/payments/404.json?payment%5Bamount%5D=500
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/role/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/roles.json?role[permission_ids]=1&role[label]=Test%20Create
+    uri: http://<USER>:<PASS>@<URL>:80/roles.json?role%5Bpermission_ids%5D=1&role%5Blabel%5D=Test+Create
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/role/edit.yml

@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/roles/1.json?role[label]=New
+    uri: http://<USER>:<PASS>@<URL>:80/roles/1.json?role%5Blabel%5D=New
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/user/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/users.json?user[last_name]=Doe&user[email]=johndoe%40example.com&user[password]=CD2480A3413F&user[login]=johndoe&user[password_confirmation]=CD2480A3413F&user[first_name]=John
+    uri: http://<USER>:<PASS>@<URL>:80/users.json?user%5Blast_name%5D=Doe&user%5Bemail%5D=johndoe%40example.com&user%5Bpassword%5D=CD2480A3413F&user%5Blogin%5D=johndoe&user%5Bpassword_confirmation%5D=CD2480A3413F&user%5Bfirst_name%5D=John
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/user/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/1.json?user[first_name]=Test
+    uri: http://<USER>:<PASS>@<URL>:80/users/1.json?user%5Bfirst_name%5D=Test
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/user/edit_role.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/500.json?user[role_ids][]=
+    uri: http://<USER>:<PASS>@<URL>:80/users/500.json?user%5Brole_ids%5D%5B%5D=
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/7.json?user[role_ids][]=4
+    uri: http://<USER>:<PASS>@<URL>:80/users/7.json?user%5Brole_ids%5D%5B%5D=4
     body: 
     headers: 
       content-type: 
@@ -78,7 +78,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/7.json?user[role_ids][]=4&user[role_ids][]=2
+    uri: http://<USER>:<PASS>@<URL>:80/users/7.json?user%5Brole_ids%5D%5B%5D=4&user%5Brole_ids%5D%5B%5D=2
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/user_group/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/user_groups.json?user_group[label]=My%20new%20group
+    uri: http://<USER>:<PASS>@<URL>:80/user_groups.json?user_group%5Blabel%5D=My+new+group
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/user_group/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/user_groups/1.json?user_group[label]=My%20new%20group
+    uri: http://<USER>:<PASS>@<URL>:80/user_groups/1.json?user_group%5Blabel%5D=My+new+group
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/user_groups/404.json?user_group[label]=My%20new%20group
+    uri: http://<USER>:<PASS>@<URL>:80/user_groups/404.json?user_group%5Blabel%5D=My+new+group
     body: 
     headers: 
       content-type: