From b83441333ca1b003d7bb9c8407031f8019f29d1a Mon Sep 17 00:00:00 2001
From: Kyle Rames <kyle.rames@rackspace.com>
Date: Tue, 1 Apr 2014 16:26:41 -0500
Subject: [PATCH] [openstack|network] fixing broken tests

---
 lib/fog/hp/models/network/router.rb                 | 2 +-
 lib/fog/openstack/models/network/router.rb          | 9 +++++----
 lib/fog/openstack/requests/network/update_router.rb | 3 ++-
 tests/openstack/requests/network/router_tests.rb    | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/fog/hp/models/network/router.rb b/lib/fog/hp/models/network/router.rb
index d9eac914c..131e8a882 100644
--- a/lib/fog/hp/models/network/router.rb
+++ b/lib/fog/hp/models/network/router.rb
@@ -10,7 +10,7 @@ module Fog
         attribute :name
         attribute :tenant_id
         attribute :external_gateway_info
-        attribute :admin_state_up
+        attribute :admin_state_up, :type => :boolean
         attribute :status
 
         def destroy
diff --git a/lib/fog/openstack/models/network/router.rb b/lib/fog/openstack/models/network/router.rb
index 00ecc80c4..579172d05 100644
--- a/lib/fog/openstack/models/network/router.rb
+++ b/lib/fog/openstack/models/network/router.rb
@@ -32,15 +32,16 @@ module Fog
 
         def create
           requires :name
-          merge_attributes(service.create_router(self.name,
-                                                  self.attributes).body['router'])
+          response = service.create_router(self.name, self.attributes)
+          merge_attributes(response.body['router'])
+
           self
         end
 
         def update
           requires :id
-          merge_attributes(service.update_router(self.id,
-                                                  self.attributes).body['router'])
+          response = service.update_router(self.id, self.attributes)
+          merge_attributes(response.body['router'])
           self
         end
 
diff --git a/lib/fog/openstack/requests/network/update_router.rb b/lib/fog/openstack/requests/network/update_router.rb
index efdb538df..a50b82a1f 100644
--- a/lib/fog/openstack/requests/network/update_router.rb
+++ b/lib/fog/openstack/requests/network/update_router.rb
@@ -68,8 +68,9 @@ module Fog
               end
             end
             options.keys.each do |k|
-              router[k.to_s] = options[k]
+              router[k] = options[k]
             end
+
             response.body = { 'router' => router }
             response.status = 200
             response
diff --git a/tests/openstack/requests/network/router_tests.rb b/tests/openstack/requests/network/router_tests.rb
index 51bcb4b86..75a3ea4c0 100644
--- a/tests/openstack/requests/network/router_tests.rb
+++ b/tests/openstack/requests/network/router_tests.rb
@@ -33,7 +33,7 @@ Shindo.tests('Fog::Network[:openstack] | router requests', ['openstack']) do
         :name => 'net_name', 
         :external_gateway_info => { :network_id => 'net_id' },
         :status => 'ACTIVE',
-        :admin_state_up => 'true'
+        :admin_state_up => true
       }
       Fog::Network[:openstack].update_router(router_id, attributes).body
     end
@@ -45,7 +45,7 @@ Shindo.tests('Fog::Network[:openstack] | router requests', ['openstack']) do
         :name => 'net_name', 
         :external_gateway_info => net,
         :status => 'ACTIVE',
-        :admin_state_up => 'true'
+        :admin_state_up => true
       }
       Fog::Network[:openstack].update_router(router_id, attributes).body
     end