Fix functional tests

Post the merge of https://review.openstack.org/#/c/287573/, functional
tests started failing because of the difference in the function signature.
This patch fixes it.

Change-Id: Icb689609e7e700b61dad4ed077baee5ad73785a9
This commit is contained in:
reedip 2016-03-09 14:48:36 +09:00
parent 2a4f715798
commit db553996c0
2 changed files with 7 additions and 4 deletions

View File

@ -62,7 +62,7 @@ class TestFloatingIP(base.BaseFunctionalTest):
cls.ROT_ID = sot.id
cls.ROT = sot
# Add Router's Interface to Internal Network
sot = cls.ROT.add_interface(cls.conn.session, cls.INT_SUB_ID)
sot = cls.ROT.add_interface(cls.conn.session, subnet_id=cls.INT_SUB_ID)
cls.assertIs(sot['subnet_id'], cls.INT_SUB_ID)
# Create Port in Internal Network
prt = cls.conn.network.create_port(network_id=cls.INT_NET_ID)
@ -79,7 +79,8 @@ class TestFloatingIP(base.BaseFunctionalTest):
cls.assertIs(None, sot)
sot = cls.conn.network.delete_port(cls.PORT_ID, ignore_missing=False)
cls.assertIs(None, sot)
sot = cls.ROT.remove_interface(cls.conn.session, cls.INT_SUB_ID)
sot = cls.ROT.remove_interface(cls.conn.session,
subnet_id=cls.INT_SUB_ID)
cls.assertIs(sot['subnet_id'], cls.INT_SUB_ID)
sot = cls.conn.network.delete_router(cls.ROT_ID, ignore_missing=False)
cls.assertIs(None, sot)

View File

@ -61,11 +61,13 @@ class TestRouterInterface(base.BaseFunctionalTest):
cls.assertIs(None, sot)
def test_router_add_interface(self):
iface = self.ROT.add_interface(self.conn.session, self.SUB_ID)
iface = self.ROT.add_interface(self.conn.session,
subnet_id=self.SUB_ID)
self._verification(iface)
def test_router_remove_interface(self):
iface = self.ROT.remove_interface(self.conn.session, self.SUB_ID)
iface = self.ROT.remove_interface(self.conn.session,
subnet_id=self.SUB_ID)
self._verification(iface)
def _verification(self, interface):