commit 4a6849e596dd5993755d52e3082593b0d43ffa4b
author Jenkins <jenkins@review.openstack.org> Wed Oct 15 05:01:36 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Oct 15 05:01:36 2014 +0000
tree 588c91493f4a3e070c88d9153f9b17fd1ba254d6
parent 45e0c7104583e457964922dd236f6456613e304d
parent 5e9c8fdfd1db85d11dd56f89b164192b7c1050d6

Merge "Fix finding router for scenario tests"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 57b9bd0..383a28d 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -937,8 +937,8 @@
         router_id = CONF.network.public_router_id
         network_id = CONF.network.public_network_id
         if router_id:
-            result = client.show_router(router_id)
-            return net_resources.AttributeDict(**result['router'])
+            resp, body = client.show_router(router_id)
+            return net_resources.AttributeDict(**body['router'])
         elif network_id:
             router = self._create_router(client, tenant_id)
             router.set_gateway(network_id)