openstack
/
horizon
Code Issues Proposed changes

Merge "Don’t error if dhcp_agent_scheduler not enabled"

This commit is contained in:
Jenkins 2016-05-18 14:45:29 +00:00 committed by Gerrit Code Review
parent 71ab95d437 e33cbd6d6c
commit 3dbfbc97f6
5 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/admin/networks/agents/tests.py
View File

@ -126,6 +126,9 @@ class NetworkAgentTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(False)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'agents__delete__%s' % agent_id}
@ -155,6 +158,9 @@ class NetworkAgentTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(False)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'agents__delete__%s' % agent_id}

6
openstack_dashboard/dashboards/admin/networks/ports/tests.py
View File

@ -403,6 +403,9 @@ class NetworkPortTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(mac_learning)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'ports__delete__%s' % port.id}
@ -442,6 +445,9 @@ class NetworkPortTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(mac_learning)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'ports__delete__%s' % port.id}

6
openstack_dashboard/dashboards/admin/networks/subnets/tests.py
View File

@ -318,6 +318,9 @@ class NetworkSubnetTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(mac_learning)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'subnets__delete__%s' % subnet.id}
@ -357,6 +360,9 @@ class NetworkSubnetTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(mac_learning)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()
form_data = {'action': 'subnets__delete__%s' % subnet.id}

12
openstack_dashboard/dashboards/admin/networks/tests.py
View File

@ -107,6 +107,9 @@ class NetworkTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(
IsA(http.HttpRequest),
'dhcp_agent_scheduler').AndReturn(True)
api.neutron.is_extension_supported(
IsA(http.HttpRequest),
'dhcp_agent_scheduler').AndReturn(True)
self.mox.ReplayAll()
@ -149,6 +152,9 @@ class NetworkTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'mac-learning')\
.AndReturn(mac_learning)
api.neutron.is_extension_supported(
IsA(http.HttpRequest),
'dhcp_agent_scheduler').AndReturn(True)
self.mox.ReplayAll()
@ -194,6 +200,9 @@ class NetworkTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(
IsA(http.HttpRequest),
'dhcp_agent_scheduler').AndReturn(True)
api.neutron.is_extension_supported(
IsA(http.HttpRequest),
'dhcp_agent_scheduler').AndReturn(True)
self.mox.ReplayAll()
@ -242,6 +251,9 @@ class NetworkTests(test.BaseAdminViewTests):
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'dhcp_agent_scheduler')\
.AndReturn(True)
self.mox.ReplayAll()

17
openstack_dashboard/dashboards/admin/networks/views.py
View File

@ -131,13 +131,16 @@ class DetailView(tables.MultiTableView):
def get_agents_data(self):
agents = []
try:
network_id = self.kwargs['network_id']
agents = api.neutron.list_dhcp_agent_hosting_networks(self.request,
network_id)
except Exception:
msg = _('Unable to list dhcp agents hosting network.')
exceptions.handle(self.request, msg)
if api.neutron.is_extension_supported(self.request,
'dhcp_agent_scheduler'):
try:
network_id = self.kwargs['network_id']
agents = api.neutron.list_dhcp_agent_hosting_networks(
self.request,
network_id)
except Exception:
msg = _('Unable to list dhcp agents hosting network.')
exceptions.handle(self.request, msg)
return agents
@memoized.memoized_method