Merge "Drop mox usage from VPNaaS API tests"
This commit is contained in:
commit
c6a51e881c
|
@ -13,6 +13,7 @@
|
||||||
from neutronclient.v2_0 import client
|
from neutronclient.v2_0 import client
|
||||||
|
|
||||||
from openstack_dashboard import api
|
from openstack_dashboard import api
|
||||||
|
from openstack_dashboard.test import helpers
|
||||||
|
|
||||||
from neutron_vpnaas_dashboard.api import vpn as api_vpn
|
from neutron_vpnaas_dashboard.api import vpn as api_vpn
|
||||||
from neutron_vpnaas_dashboard.test import helpers as test
|
from neutron_vpnaas_dashboard.test import helpers as test
|
||||||
|
@ -21,7 +22,10 @@ neutronclient = client.Client
|
||||||
|
|
||||||
|
|
||||||
class VPNaasApiTests(test.APITestCase):
|
class VPNaasApiTests(test.APITestCase):
|
||||||
@test.create_stubs({neutronclient: ('create_vpnservice',)})
|
|
||||||
|
use_mox = False
|
||||||
|
|
||||||
|
@helpers.create_mocks({neutronclient: ('create_vpnservice',)})
|
||||||
def test_vpnservice_create(self):
|
def test_vpnservice_create(self):
|
||||||
vpnservice1 = self.api_vpnservices.first()
|
vpnservice1 = self.api_vpnservices.first()
|
||||||
form_data = {
|
form_data = {
|
||||||
|
@ -33,16 +37,16 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
}
|
}
|
||||||
|
|
||||||
vpnservice = {'vpnservice': self.api_vpnservices.first()}
|
vpnservice = {'vpnservice': self.api_vpnservices.first()}
|
||||||
neutronclient.create_vpnservice(
|
self.mock_create_vpnservice.return_value = vpnservice
|
||||||
{'vpnservice': form_data}).AndReturn(vpnservice)
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.vpnservice_create(self.request, **form_data)
|
ret_val = api_vpn.vpnservice_create(self.request, **form_data)
|
||||||
self.assertIsInstance(ret_val, api_vpn.VPNService)
|
self.assertIsInstance(ret_val, api_vpn.VPNService)
|
||||||
|
self.mock_create_vpnservice.assert_called_once_with(
|
||||||
|
{'vpnservice': form_data})
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('list_vpnservices',
|
@helpers.create_mocks({neutronclient: ('list_vpnservices',
|
||||||
'list_ipsec_site_connections'),
|
'list_ipsec_site_connections'),
|
||||||
api.neutron: ('subnet_list', 'router_list')})
|
api.neutron: ('subnet_list', 'router_list')})
|
||||||
def test_vpnservice_list(self):
|
def test_vpnservice_list(self):
|
||||||
vpnservices = {'vpnservices': self.vpnservices.list()}
|
vpnservices = {'vpnservices': self.vpnservices.list()}
|
||||||
vpnservices_dict = {'vpnservices': self.api_vpnservices.list()}
|
vpnservices_dict = {'vpnservices': self.api_vpnservices.list()}
|
||||||
|
@ -51,13 +55,11 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.list_vpnservices().AndReturn(vpnservices_dict)
|
self.mock_list_vpnservices.return_value = vpnservices_dict
|
||||||
api.neutron.subnet_list(self.request).AndReturn(subnets)
|
self.mock_subnet_list.return_value = subnets
|
||||||
api.neutron.router_list(self.request).AndReturn(routers)
|
self.mock_router_list.return_value = routers
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
ipsecsiteconnections_dict)
|
ipsecsiteconnections_dict
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.vpnservice_list(self.request)
|
ret_val = api_vpn.vpnservice_list(self.request)
|
||||||
for (v, d) in zip(ret_val, vpnservices['vpnservices']):
|
for (v, d) in zip(ret_val, vpnservices['vpnservices']):
|
||||||
|
@ -65,9 +67,14 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
self.assertTrue(v.name, d.name)
|
self.assertTrue(v.name, d.name)
|
||||||
self.assertTrue(v.id)
|
self.assertTrue(v.id)
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('show_vpnservice',
|
self.mock_list_vpnservices.assert_called_once_with()
|
||||||
'list_ipsec_site_connections'),
|
self.mock_subnet_list.assert_called_once_with(self.request)
|
||||||
api.neutron: ('subnet_get', 'router_get')})
|
self.mock_router_list.assert_called_once_with(self.request)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
|
@helpers.create_mocks({neutronclient: ('show_vpnservice',
|
||||||
|
'list_ipsec_site_connections'),
|
||||||
|
api.neutron: ('subnet_get', 'router_get')})
|
||||||
def test_vpnservice_get(self):
|
def test_vpnservice_get(self):
|
||||||
vpnservice = self.vpnservices.first()
|
vpnservice = self.vpnservices.first()
|
||||||
vpnservice_dict = {'vpnservice': self.api_vpnservices.first()}
|
vpnservice_dict = {'vpnservice': self.api_vpnservices.first()}
|
||||||
|
@ -76,19 +83,21 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.show_vpnservice(
|
self.mock_show_vpnservice.return_value = vpnservice_dict
|
||||||
vpnservice.id).AndReturn(vpnservice_dict)
|
self.mock_subnet_get.return_value = subnet
|
||||||
api.neutron.subnet_get(self.request, subnet.id).AndReturn(subnet)
|
self.mock_router_get.return_value = router
|
||||||
api.neutron.router_get(self.request, router.id).AndReturn(router)
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
ipsecsiteconnections_dict
|
||||||
ipsecsiteconnections_dict)
|
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.vpnservice_get(self.request, vpnservice.id)
|
ret_val = api_vpn.vpnservice_get(self.request, vpnservice.id)
|
||||||
self.assertIsInstance(ret_val, api_vpn.VPNService)
|
self.assertIsInstance(ret_val, api_vpn.VPNService)
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('create_endpoint_group',)})
|
self.mock_show_vpnservice.assert_called_once_with(vpnservice.id)
|
||||||
|
self.mock_subnet_get.assert_called_once_with(self.request, subnet.id)
|
||||||
|
self.mock_router_get.assert_called_once_with(self.request, router.id)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
|
@helpers.create_mocks({neutronclient: ('create_endpoint_group',)})
|
||||||
def test_endpointgroup_create(self):
|
def test_endpointgroup_create(self):
|
||||||
endpointgroup = self.api_endpointgroups.first()
|
endpointgroup = self.api_endpointgroups.first()
|
||||||
form_data = {
|
form_data = {
|
||||||
|
@ -99,15 +108,15 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
}
|
}
|
||||||
|
|
||||||
endpoint_group = {'endpoint_group': self.api_endpointgroups.first()}
|
endpoint_group = {'endpoint_group': self.api_endpointgroups.first()}
|
||||||
neutronclient.create_endpoint_group(
|
self.mock_create_endpoint_group.return_value = endpoint_group
|
||||||
{'endpoint_group': form_data}).AndReturn(endpoint_group)
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.endpointgroup_create(self.request, **form_data)
|
ret_val = api_vpn.endpointgroup_create(self.request, **form_data)
|
||||||
self.assertIsInstance(ret_val, api_vpn.EndpointGroup)
|
self.assertIsInstance(ret_val, api_vpn.EndpointGroup)
|
||||||
|
self.mock_create_endpoint_group.assert_called_once_with(
|
||||||
|
{'endpoint_group': form_data})
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('list_endpoint_groups',
|
@helpers.create_mocks({neutronclient: ('list_endpoint_groups',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_endpointgroup_list(self):
|
def test_endpointgroup_list(self):
|
||||||
endpointgroups = {'endpoint_groups': self.endpointgroups.list()}
|
endpointgroups = {'endpoint_groups': self.endpointgroups.list()}
|
||||||
endpointgroups_dict = {
|
endpointgroups_dict = {
|
||||||
|
@ -115,20 +124,20 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.list_endpoint_groups().AndReturn(endpointgroups_dict)
|
self.mock_list_endpoint_groups.return_value = endpointgroups_dict
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
ipsecsiteconnections_dict)
|
ipsecsiteconnections_dict
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.endpointgroup_list(self.request)
|
ret_val = api_vpn.endpointgroup_list(self.request)
|
||||||
for (v, d) in zip(ret_val, endpointgroups['endpoint_groups']):
|
for (v, d) in zip(ret_val, endpointgroups['endpoint_groups']):
|
||||||
self.assertIsInstance(v, api_vpn.EndpointGroup)
|
self.assertIsInstance(v, api_vpn.EndpointGroup)
|
||||||
self.assertTrue(v.name, d.name)
|
self.assertTrue(v.name, d.name)
|
||||||
self.assertTrue(v.id)
|
self.assertTrue(v.id)
|
||||||
|
self.mock_list_endpoint_groups.assert_called_once_with()
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('show_endpoint_group',
|
@helpers.create_mocks({neutronclient: ('show_endpoint_group',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_endpointgroup_get(self):
|
def test_endpointgroup_get(self):
|
||||||
endpoint_group = self.endpointgroups.first()
|
endpoint_group = self.endpointgroups.first()
|
||||||
endpoint_group_dict = {
|
endpoint_group_dict = {
|
||||||
|
@ -136,17 +145,17 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.show_endpoint_group(
|
self.mock_show_endpoint_group.return_value = endpoint_group_dict
|
||||||
endpoint_group.id).AndReturn(endpoint_group_dict)
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
ipsecsiteconnections_dict
|
||||||
ipsecsiteconnections_dict)
|
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.endpointgroup_get(self.request, endpoint_group.id)
|
ret_val = api_vpn.endpointgroup_get(self.request, endpoint_group.id)
|
||||||
self.assertIsInstance(ret_val, api_vpn.EndpointGroup)
|
self.assertIsInstance(ret_val, api_vpn.EndpointGroup)
|
||||||
|
self.mock_show_endpoint_group.assert_called_once_with(
|
||||||
|
endpoint_group.id)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('create_ikepolicy',)})
|
@helpers.create_mocks({neutronclient: ('create_ikepolicy',)})
|
||||||
def test_ikepolicy_create(self):
|
def test_ikepolicy_create(self):
|
||||||
ikepolicy1 = self.api_ikepolicies.first()
|
ikepolicy1 = self.api_ikepolicies.first()
|
||||||
form_data = {
|
form_data = {
|
||||||
|
@ -161,52 +170,51 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
}
|
}
|
||||||
|
|
||||||
ikepolicy = {'ikepolicy': self.api_ikepolicies.first()}
|
ikepolicy = {'ikepolicy': self.api_ikepolicies.first()}
|
||||||
neutronclient.create_ikepolicy(
|
self.mock_create_ikepolicy.return_value = ikepolicy
|
||||||
{'ikepolicy': form_data}).AndReturn(ikepolicy)
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ikepolicy_create(self.request, **form_data)
|
ret_val = api_vpn.ikepolicy_create(self.request, **form_data)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IKEPolicy)
|
self.assertIsInstance(ret_val, api_vpn.IKEPolicy)
|
||||||
|
self.mock_create_ikepolicy.assert_called_once_with(
|
||||||
|
{'ikepolicy': form_data})
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('list_ikepolicies',
|
@helpers.create_mocks({neutronclient: ('list_ikepolicies',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_ikepolicy_list(self):
|
def test_ikepolicy_list(self):
|
||||||
ikepolicies = {'ikepolicies': self.ikepolicies.list()}
|
ikepolicies = {'ikepolicies': self.ikepolicies.list()}
|
||||||
ikepolicies_dict = {'ikepolicies': self.api_ikepolicies.list()}
|
ikepolicies_dict = {'ikepolicies': self.api_ikepolicies.list()}
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.list_ikepolicies().AndReturn(ikepolicies_dict)
|
self.mock_list_ikepolicies.return_value = ikepolicies_dict
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
ipsecsiteconnections_dict)
|
ipsecsiteconnections_dict
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ikepolicy_list(self.request)
|
ret_val = api_vpn.ikepolicy_list(self.request)
|
||||||
for (v, d) in zip(ret_val, ikepolicies['ikepolicies']):
|
for (v, d) in zip(ret_val, ikepolicies['ikepolicies']):
|
||||||
self.assertIsInstance(v, api_vpn.IKEPolicy)
|
self.assertIsInstance(v, api_vpn.IKEPolicy)
|
||||||
self.assertTrue(v.name, d.name)
|
self.assertTrue(v.name, d.name)
|
||||||
self.assertTrue(v.id)
|
self.assertTrue(v.id)
|
||||||
|
self.mock_list_ikepolicies.assert_called_once_with()
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('show_ikepolicy',
|
@helpers.create_mocks({neutronclient: ('show_ikepolicy',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_ikepolicy_get(self):
|
def test_ikepolicy_get(self):
|
||||||
ikepolicy = self.ikepolicies.first()
|
ikepolicy = self.ikepolicies.first()
|
||||||
ikepolicy_dict = {'ikepolicy': self.api_ikepolicies.first()}
|
ikepolicy_dict = {'ikepolicy': self.api_ikepolicies.first()}
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.show_ikepolicy(
|
self.mock_show_ikepolicy.return_value = ikepolicy_dict
|
||||||
ikepolicy.id).AndReturn(ikepolicy_dict)
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
ipsecsiteconnections_dict
|
||||||
ipsecsiteconnections_dict)
|
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ikepolicy_get(self.request, ikepolicy.id)
|
ret_val = api_vpn.ikepolicy_get(self.request, ikepolicy.id)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IKEPolicy)
|
self.assertIsInstance(ret_val, api_vpn.IKEPolicy)
|
||||||
|
self.mock_show_ikepolicy.assert_called_once_with(ikepolicy.id)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('create_ipsecpolicy',)})
|
@helpers.create_mocks({neutronclient: ('create_ipsecpolicy',)})
|
||||||
def test_ipsecpolicy_create(self):
|
def test_ipsecpolicy_create(self):
|
||||||
ipsecpolicy1 = self.api_ipsecpolicies.first()
|
ipsecpolicy1 = self.api_ipsecpolicies.first()
|
||||||
form_data = {
|
form_data = {
|
||||||
|
@ -221,52 +229,51 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
}
|
}
|
||||||
|
|
||||||
ipsecpolicy = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
ipsecpolicy = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
||||||
neutronclient.create_ipsecpolicy(
|
self.mock_create_ipsecpolicy.return_value = ipsecpolicy
|
||||||
{'ipsecpolicy': form_data}).AndReturn(ipsecpolicy)
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecpolicy_create(self.request, **form_data)
|
ret_val = api_vpn.ipsecpolicy_create(self.request, **form_data)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IPsecPolicy)
|
self.assertIsInstance(ret_val, api_vpn.IPsecPolicy)
|
||||||
|
self.mock_create_ipsecpolicy.assert_called_once_with(
|
||||||
|
{'ipsecpolicy': form_data})
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('list_ipsecpolicies',
|
@helpers.create_mocks({neutronclient: ('list_ipsecpolicies',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_ipsecpolicy_list(self):
|
def test_ipsecpolicy_list(self):
|
||||||
ipsecpolicies = {'ipsecpolicies': self.ipsecpolicies.list()}
|
ipsecpolicies = {'ipsecpolicies': self.ipsecpolicies.list()}
|
||||||
ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()}
|
ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()}
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.list_ipsecpolicies().AndReturn(ipsecpolicies_dict)
|
self.mock_list_ipsecpolicies.return_value = ipsecpolicies_dict
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
ipsecsiteconnections_dict)
|
ipsecsiteconnections_dict
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecpolicy_list(self.request)
|
ret_val = api_vpn.ipsecpolicy_list(self.request)
|
||||||
for (v, d) in zip(ret_val, ipsecpolicies['ipsecpolicies']):
|
for (v, d) in zip(ret_val, ipsecpolicies['ipsecpolicies']):
|
||||||
self.assertIsInstance(v, api_vpn.IPsecPolicy)
|
self.assertIsInstance(v, api_vpn.IPsecPolicy)
|
||||||
self.assertTrue(v.name, d.name)
|
self.assertTrue(v.name, d.name)
|
||||||
self.assertTrue(v.id)
|
self.assertTrue(v.id)
|
||||||
|
self.mock_list_ipsecpolicies.assert_called_once_with()
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('show_ipsecpolicy',
|
@helpers.create_mocks({neutronclient: ('show_ipsecpolicy',
|
||||||
'list_ipsec_site_connections')})
|
'list_ipsec_site_connections')})
|
||||||
def test_ipsecpolicy_get(self):
|
def test_ipsecpolicy_get(self):
|
||||||
ipsecpolicy = self.ipsecpolicies.first()
|
ipsecpolicy = self.ipsecpolicies.first()
|
||||||
ipsecpolicy_dict = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
ipsecpolicy_dict = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
||||||
ipsecsiteconnections_dict = {
|
ipsecsiteconnections_dict = {
|
||||||
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.api_ipsecsiteconnections.list()}
|
||||||
|
|
||||||
neutronclient.show_ipsecpolicy(
|
self.mock_show_ipsecpolicy.return_value = ipsecpolicy_dict
|
||||||
ipsecpolicy.id).AndReturn(ipsecpolicy_dict)
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
ipsecsiteconnections_dict
|
||||||
ipsecsiteconnections_dict)
|
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecpolicy_get(self.request, ipsecpolicy.id)
|
ret_val = api_vpn.ipsecpolicy_get(self.request, ipsecpolicy.id)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IPsecPolicy)
|
self.assertIsInstance(ret_val, api_vpn.IPsecPolicy)
|
||||||
|
self.mock_show_ipsecpolicy.assert_called_once_with(ipsecpolicy.id)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('create_ipsec_site_connection',)})
|
@helpers.create_mocks({neutronclient: ('create_ipsec_site_connection',)})
|
||||||
def test_ipsecsiteconnection_create(self):
|
def test_ipsecsiteconnection_create(self):
|
||||||
ipsecsiteconnection1 = self.api_ipsecsiteconnections.first()
|
ipsecsiteconnection1 = self.api_ipsecsiteconnections.first()
|
||||||
form_data = {
|
form_data = {
|
||||||
|
@ -287,19 +294,19 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
|
|
||||||
ipsecsiteconnection = {'ipsec_site_connection':
|
ipsecsiteconnection = {'ipsec_site_connection':
|
||||||
self.api_ipsecsiteconnections.first()}
|
self.api_ipsecsiteconnections.first()}
|
||||||
neutronclient.create_ipsec_site_connection(
|
self.mock_create_ipsec_site_connection.return_value = \
|
||||||
{'ipsec_site_connection':
|
ipsecsiteconnection
|
||||||
form_data}).AndReturn(ipsecsiteconnection)
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecsiteconnection_create(
|
ret_val = api_vpn.ipsecsiteconnection_create(
|
||||||
self.request, **form_data)
|
self.request, **form_data)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IPsecSiteConnection)
|
self.assertIsInstance(ret_val, api_vpn.IPsecSiteConnection)
|
||||||
|
self.mock_create_ipsec_site_connection.assert_called_once_with(
|
||||||
|
{'ipsec_site_connection': form_data})
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('list_ipsec_site_connections',
|
@helpers.create_mocks({neutronclient: ('list_ipsec_site_connections',
|
||||||
'list_ikepolicies',
|
'list_ikepolicies',
|
||||||
'list_ipsecpolicies',
|
'list_ipsecpolicies',
|
||||||
'list_vpnservices')})
|
'list_vpnservices')})
|
||||||
def test_ipsecsiteconnection_list(self):
|
def test_ipsecsiteconnection_list(self):
|
||||||
ipsecsiteconnections = {
|
ipsecsiteconnections = {
|
||||||
'ipsec_site_connections': self.ipsecsiteconnections.list()}
|
'ipsec_site_connections': self.ipsecsiteconnections.list()}
|
||||||
|
@ -309,13 +316,11 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()}
|
ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()}
|
||||||
vpnservices_dict = {'vpnservices': self.api_vpnservices.list()}
|
vpnservices_dict = {'vpnservices': self.api_vpnservices.list()}
|
||||||
|
|
||||||
neutronclient.list_ipsec_site_connections().AndReturn(
|
self.mock_list_ipsec_site_connections.return_value = \
|
||||||
ipsecsiteconnections_dict)
|
ipsecsiteconnections_dict
|
||||||
neutronclient.list_ikepolicies().AndReturn(ikepolicies_dict)
|
self.mock_list_ikepolicies.return_value = ikepolicies_dict
|
||||||
neutronclient.list_ipsecpolicies().AndReturn(ipsecpolicies_dict)
|
self.mock_list_ipsecpolicies.return_value = ipsecpolicies_dict
|
||||||
neutronclient.list_vpnservices().AndReturn(vpnservices_dict)
|
self.mock_list_vpnservices.return_value = vpnservices_dict
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecsiteconnection_list(self.request)
|
ret_val = api_vpn.ipsecsiteconnection_list(self.request)
|
||||||
for (v, d) in zip(ret_val,
|
for (v, d) in zip(ret_val,
|
||||||
|
@ -323,10 +328,15 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
self.assertIsInstance(v, api_vpn.IPsecSiteConnection)
|
self.assertIsInstance(v, api_vpn.IPsecSiteConnection)
|
||||||
self.assertTrue(v.name, d.name)
|
self.assertTrue(v.name, d.name)
|
||||||
self.assertTrue(v.id)
|
self.assertTrue(v.id)
|
||||||
|
self.mock_list_ipsec_site_connections.assert_called_once_with()
|
||||||
|
self.mock_list_ikepolicies.assert_called_once_with()
|
||||||
|
self.mock_list_ipsecpolicies.assert_called_once_with()
|
||||||
|
self.mock_list_vpnservices.assert_called_once_with()
|
||||||
|
|
||||||
@test.create_stubs({neutronclient: ('show_ipsec_site_connection',
|
@helpers.create_mocks({neutronclient: ('show_ipsec_site_connection',
|
||||||
'show_ikepolicy', 'show_ipsecpolicy',
|
'show_ikepolicy',
|
||||||
'show_vpnservice')})
|
'show_ipsecpolicy',
|
||||||
|
'show_vpnservice')})
|
||||||
def test_ipsecsiteconnection_get(self):
|
def test_ipsecsiteconnection_get(self):
|
||||||
ipsecsiteconnection = self.ipsecsiteconnections.first()
|
ipsecsiteconnection = self.ipsecsiteconnections.first()
|
||||||
connection_dict = {'ipsec_site_connection':
|
connection_dict = {'ipsec_site_connection':
|
||||||
|
@ -335,17 +345,20 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
ipsecpolicy_dict = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
ipsecpolicy_dict = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
||||||
vpnservice_dict = {'vpnservice': self.api_vpnservices.first()}
|
vpnservice_dict = {'vpnservice': self.api_vpnservices.first()}
|
||||||
|
|
||||||
neutronclient.show_ipsec_site_connection(
|
self.mock_show_ipsec_site_connection.return_value = connection_dict
|
||||||
ipsecsiteconnection.id).AndReturn(connection_dict)
|
self.mock_show_ikepolicy.return_value = ikepolicy_dict
|
||||||
neutronclient.show_ikepolicy(
|
self.mock_show_ipsecpolicy.return_value = ipsecpolicy_dict
|
||||||
ipsecsiteconnection.ikepolicy_id).AndReturn(ikepolicy_dict)
|
self.mock_show_vpnservice.return_value = vpnservice_dict
|
||||||
neutronclient.show_ipsecpolicy(
|
|
||||||
ipsecsiteconnection.ipsecpolicy_id).AndReturn(ipsecpolicy_dict)
|
|
||||||
neutronclient.show_vpnservice(
|
|
||||||
ipsecsiteconnection.vpnservice_id).AndReturn(vpnservice_dict)
|
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
|
|
||||||
ret_val = api_vpn.ipsecsiteconnection_get(self.request,
|
ret_val = api_vpn.ipsecsiteconnection_get(self.request,
|
||||||
ipsecsiteconnection.id)
|
ipsecsiteconnection.id)
|
||||||
self.assertIsInstance(ret_val, api_vpn.IPsecSiteConnection)
|
self.assertIsInstance(ret_val, api_vpn.IPsecSiteConnection)
|
||||||
|
|
||||||
|
self.mock_show_ipsec_site_connection.assert_called_once_with(
|
||||||
|
ipsecsiteconnection.id)
|
||||||
|
self.mock_show_ikepolicy.assert_called_once_with(
|
||||||
|
ipsecsiteconnection.ikepolicy_id)
|
||||||
|
self.mock_show_ipsecpolicy.assert_called_once_with(
|
||||||
|
ipsecsiteconnection.ipsecpolicy_id)
|
||||||
|
self.mock_show_vpnservice.assert_called_once_with(
|
||||||
|
ipsecsiteconnection.vpnservice_id)
|
||||||
|
|
Loading…
Reference in New Issue