openstack/horizon
Code Issues Proposed changes

Merge "Disable router HA attribute due to Neutron bug"

Browse Source
This commit is contained in:
Jenkins
2014-10-17 18:28:01 +00:00
committed by Gerrit Code Review
parent 20b1c189b5 03c562736b
commit 264ad3edd9
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/dashboards/project/routers/forms.py
View File

@@ -111,8 +111,11 @@ class UpdateForm(forms.SelfHandlingForm):
('distributed', _('Distributed'))] ('distributed', _('Distributed'))]
self.fields['mode'].choices = mode_choices self.fields['mode'].choices = mode_choices
self.ha_allowed = api.neutron.get_feature_permission(self.request, # TODO(amotoki): Due to Neutron Bug 1378525, Neutron disables
"l3-ha", "update") # PUT operation. It will be fixed in Kilo cycle.
# self.ha_allowed = api.neutron.get_feature_permission(
# self.request, "l3-ha", "update")
self.ha_allowed = False
if not self.ha_allowed: if not self.ha_allowed:
del self.fields['ha'] del self.fields['ha']

29
openstack_dashboard/dashboards/project/routers/tests.py
View File

@@ -278,9 +278,11 @@ class RouterActionTests(test.TestCase):
api.neutron.get_feature_permission(IsA(http.HttpRequest), api.neutron.get_feature_permission(IsA(http.HttpRequest),
"dvr", "update")\ "dvr", "update")\
.AndReturn(dvr_enabled) .AndReturn(dvr_enabled)
api.neutron.get_feature_permission(IsA(http.HttpRequest), # TODO(amotoki): Due to Neutron Bug 1378525, Neutron disables
"l3-ha", "update")\ # PUT operation. It will be fixed in Kilo cycle.
.AndReturn(ha_enabled) # api.neutron.get_feature_permission(IsA(http.HttpRequest),
# "l3-ha", "update")\
# .AndReturn(ha_enabled)
self.mox.ReplayAll() self.mox.ReplayAll()
url = reverse('horizon:%s:routers:update' % self.DASHBOARD, url = reverse('horizon:%s:routers:update' % self.DASHBOARD,
@@ -330,9 +332,11 @@ class RouterActionTests(test.TestCase):
api.neutron.get_feature_permission(IsA(http.HttpRequest), api.neutron.get_feature_permission(IsA(http.HttpRequest),
"dvr", "update")\ "dvr", "update")\
.AndReturn(False) .AndReturn(False)
api.neutron.get_feature_permission(IsA(http.HttpRequest), # TODO(amotoki): Due to Neutron Bug 1378525, Neutron disables
"l3-ha", "update")\ # PUT operation. It will be fixed in Kilo cycle.
.AndReturn(False) # api.neutron.get_feature_permission(IsA(http.HttpRequest),
# "l3-ha", "update")\
# .AndReturn(False)
api.neutron.router_update(IsA(http.HttpRequest), router.id, api.neutron.router_update(IsA(http.HttpRequest), router.id,
name=router.name, name=router.name,
admin_state_up=router.admin_state_up)\ admin_state_up=router.admin_state_up)\
@@ -358,15 +362,16 @@ class RouterActionTests(test.TestCase):
api.neutron.get_feature_permission(IsA(http.HttpRequest), api.neutron.get_feature_permission(IsA(http.HttpRequest),
"dvr", "update")\ "dvr", "update")\
.AndReturn(True) .AndReturn(True)
api.neutron.get_feature_permission(IsA(http.HttpRequest), # TODO(amotoki): Due to Neutron Bug 1378525, Neutron disables
"l3-ha", "update")\ # PUT operation. It will be fixed in Kilo cycle.
.AndReturn(True) # api.neutron.get_feature_permission(IsA(http.HttpRequest),
# "l3-ha", "update")\
# .AndReturn(True)
api.neutron.router_update(IsA(http.HttpRequest), router.id, api.neutron.router_update(IsA(http.HttpRequest), router.id,
name=router.name, name=router.name,
admin_state_up=router.admin_state_up, admin_state_up=router.admin_state_up,
distributed=True, # ha=True,
ha=True)\ distributed=True).AndReturn(router)
.AndReturn(router)
api.neutron.router_get(IsA(http.HttpRequest), router.id)\ api.neutron.router_get(IsA(http.HttpRequest), router.id)\
.AndReturn(router) .AndReturn(router)
self.mox.ReplayAll() self.mox.ReplayAll()