openstack/neutron-vpnaas
Code Issues Proposed changes

VPNaaS Cisco unit test clean-up

Browse Source 
Removed unused args to mock side-effect function and duplicate
constant.

Change-Id: I5409ce86ccaab86213d65f757f19c1bdf9a66929
Closes-Bug: #1381221
This commit is contained in:
Paul Michali 2014-10-14 18:18:15 -04:00
parent 1075f28d5c
commit 042c8f354a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
View File

@ -125,7 +125,7 @@ class TestCiscoCsrIPSecConnection(base.BaseTestCase):
steps are called in reverse order. At the end, there should be no steps are called in reverse order. At the end, there should be no
rollback infromation for the connection. rollback infromation for the connection.
""" """
def fake_route_check_fails(*args, **kwargs): def fake_route_check_fails(*args):
if args[0] == 'Static Route': if args[0] == 'Static Route':
# So that subsequent calls to CSR rest client (for rollback) # So that subsequent calls to CSR rest client (for rollback)
# will fake as passing. # will fake as passing.

8
neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py
View File

@ -29,19 +29,15 @@ from neutron.tests.unit import testlib_api
_uuid = uuidutils.generate_uuid _uuid = uuidutils.generate_uuid
FAKE_VPN_CONN_ID = _uuid() FAKE_VPN_CONN_ID = _uuid()
FAKE_SERVICE_ID = _uuid()
FAKE_VPN_CONNECTION = { FAKE_VPN_CONNECTION = {
'vpnservice_id': _uuid(), 'vpnservice_id': FAKE_SERVICE_ID,
'id': FAKE_VPN_CONN_ID, 'id': FAKE_VPN_CONN_ID,
'ikepolicy_id': _uuid(), 'ikepolicy_id': _uuid(),
'ipsecpolicy_id': _uuid(), 'ipsecpolicy_id': _uuid(),
'tenant_id': _uuid() 'tenant_id': _uuid()
} }
FAKE_SERVICE_ID = _uuid()
FAKE_VPN_CONNECTION = {
'vpnservice_id': FAKE_SERVICE_ID
}
FAKE_ROUTER_ID = _uuid() FAKE_ROUTER_ID = _uuid()
FAKE_VPN_SERVICE = { FAKE_VPN_SERVICE = {
'router_id': FAKE_ROUTER_ID 'router_id': FAKE_ROUTER_ID