Merge "Convert admin.floating_ips tests into mock"
This commit is contained in:
Zuul
Gerrit Code Review
commit
3c8932a4d6
|
|
@ -13,9 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django import http
|
||||
from django.urls import reverse
|
||||
from mox3.mox import IsA
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
|
@ -25,26 +23,20 @@ INDEX_TEMPLATE = 'horizon/common/_data_table_view.html'
|
|||
|
||||
|
||||
class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
||||
@test.create_stubs({api.nova: ('server_list', ),
|
||||
api.keystone: ('tenant_list', ),
|
||||
api.neutron: ('network_list',
|
||||
'tenant_floating_ip_list',)})
|
||||
|
||||
@test.create_mocks({
|
||||
api.nova: ['server_list'],
|
||||
api.keystone: ['tenant_list'],
|
||||
api.neutron: ['network_list', 'tenant_floating_ip_list']})
|
||||
def test_index(self):
|
||||
# Use neutron test data
|
||||
fips = self.floating_ips.list()
|
||||
servers = self.servers.list()
|
||||
tenants = self.tenants.list()
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True).AndReturn(fips)
|
||||
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
|
||||
.AndReturn([servers, False])
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
params = {"router:external": True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **params) \
|
||||
.AndReturn(self.networks.list())
|
||||
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.return_value = fips
|
||||
self.mock_server_list.return_value = [servers, False]
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = self.networks.list()
|
||||
|
||||
res = self.client.get(INDEX_URL)
|
||||
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
||||
|
|
@ -57,71 +49,76 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
self.assertEqual(len(row_actions), 1)
|
||||
row_actions = floating_ips_table.get_row_actions(floating_ips[1])
|
||||
self.assertEqual(len(row_actions), 2)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
all_tenants=True)
|
||||
self.mock_server_list.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
detailed=False,
|
||||
search_opts={'all_tenants': True})
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
params = {"router:external": True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **params)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_get',
|
||||
'network_get', )})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['tenant_floating_ip_get', 'network_get']})
|
||||
def test_floating_ip_detail_get(self):
|
||||
fip = self.floating_ips.first()
|
||||
network = self.networks.first()
|
||||
api.neutron.tenant_floating_ip_get(
|
||||
IsA(http.HttpRequest), fip.id).AndReturn(fip)
|
||||
api.neutron.network_get(
|
||||
IsA(http.HttpRequest), fip.pool).AndReturn(network)
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_get.return_value = fip
|
||||
self.mock_network_get.return_value = network
|
||||
|
||||
res = self.client.get(reverse('horizon:admin:floating_ips:detail',
|
||||
args=[fip.id]))
|
||||
self.assertTemplateUsed(res,
|
||||
'admin/floating_ips/detail.html')
|
||||
self.assertEqual(res.context['floating_ip'].ip, fip.ip)
|
||||
self.mock_tenant_floating_ip_get.assert_called_once_with(
|
||||
test.IsHttpRequest(), fip.id)
|
||||
self.mock_network_get.assert_called_once_with(
|
||||
test.IsHttpRequest(), fip.pool)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_get',)})
|
||||
@test.create_mocks({api.neutron: ['tenant_floating_ip_get']})
|
||||
def test_floating_ip_detail_exception(self):
|
||||
fip = self.floating_ips.first()
|
||||
# Only supported by neutron, so raise a neutron exception
|
||||
api.neutron.tenant_floating_ip_get(
|
||||
IsA(http.HttpRequest),
|
||||
fip.id).AndRaise(self.exceptions.neutron)
|
||||
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_get.side_effect = self.exceptions.neutron
|
||||
|
||||
res = self.client.get(reverse('horizon:admin:floating_ips:detail',
|
||||
args=[fip.id]))
|
||||
|
||||
self.assertRedirectsNoFollow(res, INDEX_URL)
|
||||
self.mock_tenant_floating_ip_get.assert_called_once_with(
|
||||
test.IsHttpRequest(), fip.id)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_list', )})
|
||||
@test.create_mocks({api.neutron: ['tenant_floating_ip_list']})
|
||||
def test_index_no_floating_ips(self):
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True).AndReturn([])
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.return_value = []
|
||||
|
||||
res = self.client.get(INDEX_URL)
|
||||
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), all_tenants=True)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_list', )})
|
||||
@test.create_mocks({api.neutron: ['tenant_floating_ip_list']})
|
||||
def test_index_error(self):
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True) \
|
||||
.AndRaise(self.exceptions.neutron)
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.side_effect = self.exceptions.neutron
|
||||
|
||||
res = self.client.get(INDEX_URL)
|
||||
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), all_tenants=True)
|
||||
|
||||
@test.create_stubs({api.neutron: ('network_list',),
|
||||
api.keystone: ('tenant_list',)})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['network_list'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_admin_allocate_get(self):
|
||||
pool = self.networks.first()
|
||||
tenants = self.tenants.list()
|
||||
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
search_opts = {'router:external': True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **search_opts) \
|
||||
.AndReturn([pool])
|
||||
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = [pool]
|
||||
|
||||
url = reverse('horizon:admin:floating_ips:allocate')
|
||||
res = self.client.get(url)
|
||||
|
|
@ -132,20 +129,21 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
self.assertEqual(len(pool_choices), 1)
|
||||
tenant_choices = allocate_form.fields['tenant'].choices
|
||||
self.assertEqual(len(tenant_choices), 3)
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
search_opts = {'router:external': True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **search_opts)
|
||||
|
||||
@test.create_stubs({api.neutron: ('network_list',),
|
||||
api.keystone: ('tenant_list',)})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['network_list'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_admin_allocate_post_invalid_ip_version(self):
|
||||
tenant = self.tenants.first()
|
||||
pool = self.networks.first()
|
||||
tenants = self.tenants.list()
|
||||
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
search_opts = {'router:external': True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **search_opts) \
|
||||
.AndReturn([pool])
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = [pool]
|
||||
|
||||
form_data = {'pool': pool.id,
|
||||
'tenant': tenant.id,
|
||||
|
|
@ -153,10 +151,16 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
url = reverse('horizon:admin:floating_ips:allocate')
|
||||
res = self.client.post(url, form_data)
|
||||
self.assertContains(res, "Invalid version for IP address")
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
search_opts = {'router:external': True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **search_opts)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_allocate',
|
||||
'network_list', 'subnet_get'),
|
||||
api.keystone: ('tenant_list',)})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['tenant_floating_ip_allocate',
|
||||
'network_list',
|
||||
'subnet_get'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_admin_allocate_post(self):
|
||||
tenant = self.tenants.first()
|
||||
floating_ip = self.floating_ips.first()
|
||||
|
|
@ -164,48 +168,45 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
pool = self.networks.first()
|
||||
tenants = self.tenants.list()
|
||||
|
||||
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
|
||||
.AndReturn(subnet)
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
search_opts = {'router:external': True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **search_opts) \
|
||||
.AndReturn([pool])
|
||||
api.neutron.tenant_floating_ip_allocate(
|
||||
IsA(http.HttpRequest),
|
||||
pool=pool.id,
|
||||
tenant_id=tenant.id).AndReturn(floating_ip)
|
||||
self.mox.ReplayAll()
|
||||
self.mock_subnet_get.return_value = subnet
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = [pool]
|
||||
self.mock_tenant_floating_ip_allocate.return_value = floating_ip
|
||||
|
||||
form_data = {'pool': subnet.id,
|
||||
'tenant': tenant.id}
|
||||
url = reverse('horizon:admin:floating_ips:allocate')
|
||||
res = self.client.post(url, form_data)
|
||||
self.assertRedirectsNoFollow(res, INDEX_URL)
|
||||
self.mock_subnet_get.assert_called_once_with(
|
||||
test.IsHttpRequest(), subnet.id)
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
search_opts = {'router:external': True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **search_opts)
|
||||
self.mock_tenant_floating_ip_allocate.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
pool=pool.id,
|
||||
subnet_id=subnet.id,
|
||||
tenant_id=tenant.id)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_list',
|
||||
'floating_ip_disassociate',
|
||||
'network_list'),
|
||||
api.nova: ('server_list', ),
|
||||
api.keystone: ('tenant_list', )})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['tenant_floating_ip_list',
|
||||
'floating_ip_disassociate',
|
||||
'network_list'],
|
||||
api.nova: ['server_list'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_admin_disassociate_floatingip(self):
|
||||
# Use neutron test data
|
||||
fips = self.floating_ips.list()
|
||||
floating_ip = self.floating_ips.list()[1]
|
||||
servers = self.servers.list()
|
||||
tenants = self.tenants.list()
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True).AndReturn(fips)
|
||||
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
|
||||
.AndReturn([servers, False])
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
params = {"router:external": True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **params) \
|
||||
.AndReturn(self.networks.list())
|
||||
api.neutron.floating_ip_disassociate(IsA(http.HttpRequest),
|
||||
floating_ip.id)
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.return_value = fips
|
||||
self.mock_server_list.return_value = [servers, False]
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = self.networks.list()
|
||||
self.mock_floating_ip_disassociate.return_value = None
|
||||
|
||||
form_data = {
|
||||
"action":
|
||||
|
|
@ -213,28 +214,34 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
res = self.client.post(INDEX_URL, form_data)
|
||||
|
||||
self.assertNoFormErrors(res)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), all_tenants=True)
|
||||
self.mock_server_list.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
detailed=False,
|
||||
search_opts={'all_tenants': True})
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
params = {"router:external": True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **params)
|
||||
self.mock_floating_ip_disassociate.assert_called_once_with(
|
||||
test.IsHttpRequest(), floating_ip.id)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_list',
|
||||
'network_list'),
|
||||
api.nova: ('server_list', ),
|
||||
api.keystone: ('tenant_list', )})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['tenant_floating_ip_list',
|
||||
'network_list'],
|
||||
api.nova: ['server_list'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_admin_delete_floatingip(self):
|
||||
# Use neutron test data
|
||||
fips = self.floating_ips.list()
|
||||
floating_ip = self.floating_ips.list()[1]
|
||||
servers = self.servers.list()
|
||||
tenants = self.tenants.list()
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True).AndReturn(fips)
|
||||
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
|
||||
.AndReturn([servers, False])
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
params = {"router:external": True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **params) \
|
||||
.AndReturn(self.networks.list())
|
||||
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.return_value = fips
|
||||
self.mock_server_list.return_value = [servers, False]
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = self.networks.list()
|
||||
|
||||
form_data = {
|
||||
"action":
|
||||
|
|
@ -242,27 +249,31 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
res = self.client.post(INDEX_URL, form_data)
|
||||
|
||||
self.assertNoFormErrors(res)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), all_tenants=True)
|
||||
self.mock_server_list.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
detailed=False,
|
||||
search_opts={'all_tenants': True})
|
||||
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||
params = {"router:external": True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **params)
|
||||
|
||||
@test.create_stubs({api.neutron: ('tenant_floating_ip_list',
|
||||
'network_list'),
|
||||
api.nova: ('server_list', ),
|
||||
api.keystone: ('tenant_list', )})
|
||||
@test.create_mocks({
|
||||
api.neutron: ['tenant_floating_ip_list',
|
||||
'network_list'],
|
||||
api.nova: ['server_list'],
|
||||
api.keystone: ['tenant_list']})
|
||||
def test_floating_ip_table_actions(self):
|
||||
# Use neutron test data
|
||||
fips = self.floating_ips.list()
|
||||
servers = self.servers.list()
|
||||
tenants = self.tenants.list()
|
||||
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
|
||||
all_tenants=True).AndReturn(fips)
|
||||
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
|
||||
.AndReturn([servers, False])
|
||||
api.keystone.tenant_list(IsA(http.HttpRequest))\
|
||||
.AndReturn([tenants, False])
|
||||
params = {"router:external": True}
|
||||
api.neutron.network_list(IsA(http.HttpRequest), **params) \
|
||||
.AndReturn(self.networks.list())
|
||||
|
||||
self.mox.ReplayAll()
|
||||
self.mock_tenant_floating_ip_list.return_value = fips
|
||||
self.mock_server_list.return_value = [servers, False]
|
||||
self.mock_tenant_list.return_value = [tenants, False]
|
||||
self.mock_network_list.return_value = self.networks.list()
|
||||
|
||||
res = self.client.get(INDEX_URL)
|
||||
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
||||
|
|
@ -277,3 +288,12 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
|
|||
self.assertContains(res, 'floating_ips__release__%s' % fips[0].id)
|
||||
self.assertContains(res, 'floating_ips__release__%s' % fips[1].id)
|
||||
self.assertContains(res, 'floating_ips__disassociate__%s' % fips[1].id)
|
||||
self.mock_tenant_floating_ip_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), all_tenants=True)
|
||||
self.mock_server_list.assert_called_once_with(
|
||||
test.IsHttpRequest(),
|
||||
detailed=False,
|
||||
search_opts={'all_tenants': True})
|
||||
params = {"router:external": True}
|
||||
self.mock_network_list.assert_called_once_with(
|
||||
test.IsHttpRequest(), **params)
|
||||
|
|
|
|||
Loading…
Reference in New Issue