Fix compatibility with Tempest

Change [1] fixed gates but introduced incompatible code for
scenario tests. So, fix its compatibility for used version of tempest.

[1] Id7d43dee256856062bd0dadad9c469c1500ee36e

Change-Id: I4c3d9df0de6908b82aca787ab124552796cd1066
Closes-Bug: #1555218
This commit is contained in:
Valeriy Ponomaryov 2016-03-09 19:04:10 +02:00
parent 2358f9137e
commit e1d696c8de

View File

@ -157,10 +157,9 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
tenant_id = client.tenant_id
if not router_id:
router_id = self._get_router()['id']
client.add_router_interface_with_subnet_id(router_id,
subnet_id)
self.addCleanup(client.remove_router_interface_with_subnet_id,
router_id, subnet_id)
client.add_router_interface(router_id, subnet_id=subnet_id)
self.addCleanup(
client.remove_router_interface, router_id, subnet_id=subnet_id)
def get_remote_client(self, *args, **kwargs):
if not CONF.share.image_with_share_tools: