openstack
/
horizon
Code Issues Proposed changes

Merge "Remove 'shared' from Neutron Firewall table" into stable/kilo

This commit is contained in:
Jenkins 2015-10-12 21:53:33 +00:00 committed by Gerrit Code Review
parent 5b9bdca15b fea681e20f
commit 67e92841cb
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/firewalls/tests.py
View File

@ -350,7 +350,6 @@ class FirewallTests(test.TestCase):
form_data = {'name': firewall.name,
'description': firewall.description,
'firewall_policy_id': firewall.firewall_policy_id,
'shared': firewall.shared,
'admin_state_up': firewall.admin_state_up
}
if router_extension:
@ -403,7 +402,6 @@ class FirewallTests(test.TestCase):
form_data = {'name': firewall.name,
'description': firewall.description,
'firewall_policy_id': None,
'shared': firewall.shared,
'admin_state_up': firewall.admin_state_up
}
api.neutron.is_extension_supported(

8
openstack_dashboard/dashboards/project/firewalls/workflows.py
View File

@ -278,9 +278,6 @@ class AddFirewallAction(workflows.Action):
label=_("Description"),
required=False)
firewall_policy_id = forms.ChoiceField(label=_("Policy"))
shared = forms.BooleanField(label=_("Shared"),
initial=False,
required=False)
admin_state_up = forms.ChoiceField(choices=[(True, _('UP')),
(False, _('DOWN'))],
label=_("Admin State"))
@ -302,9 +299,6 @@ class AddFirewallAction(workflows.Action):
for p in policies:
firewall_policy_id_choices.append((p.id, p.name_or_id))
self.fields['firewall_policy_id'].choices = firewall_policy_id_choices
# only admin can set 'shared' attribute to True
if not request.user.is_superuser:
self.fields['shared'].widget.attrs['disabled'] = 'disabled'
class Meta(object):
name = _("AddFirewall")
@ -317,7 +311,7 @@ class AddFirewallAction(workflows.Action):
class AddFirewallStep(workflows.Step):
action_class = AddFirewallAction
contributes = ("name", "firewall_policy_id", "description",
"shared", "admin_state_up")
"admin_state_up")
def contribute(self, data, context):
context = super(AddFirewallStep, self).contribute(data, context)

1
openstack_dashboard/test/api_tests/fwaas_tests.py
View File

@ -325,7 +325,6 @@ class FwaasApiTests(test.APITestCase):
form_data = {'name': firewall.name,
'description': firewall.description,
'firewall_policy_id': firewall.firewall_policy_id,
'shared': firewall.shared,
'admin_state_up': firewall.admin_state_up
}

2
openstack_dashboard/test/test_data/neutron_data.py
View File

@ -984,7 +984,6 @@ def data(TEST):
'router_ids': [TEST.routers.first().id],
'description': 'firewall description',
'status': 'PENDING_CREATE',
'shared': True,
'admin_state_up': True}
TEST.api_firewalls.add(fw1_dict)
@ -1001,7 +1000,6 @@ def data(TEST):
'name': '',
'description': '',
'status': 'PENDING_CREATE',
'shared': True,
'admin_state_up': True}
TEST.api_firewalls.add(fw1_dict)