openstack
/
horizon
Code Issues Proposed changes

Merge "Use BooleanField for admin_state_up form" into stable/ocata

This commit is contained in:
Jenkins 2017-05-24 15:45:37 +00:00 committed by Gerrit Code Review
parent 53e8d0744d a7ec524d4a
commit 3bc399f3ae
12 changed files with 51 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstack_dashboard/dashboards/admin/networks/forms.py
View File

@ -125,10 +125,9 @@ class CreateNetwork(forms.SelfHandlingForm):
'class': 'switched', 'class': 'switched',
'data-switch-on': 'network_type', 'data-switch-on': 'network_type',
})) }))
admin_state = forms.ThemableChoiceField( admin_state = forms.BooleanField(label=_("Enable Admin State"),
choices=[('True', _('UP')), initial=True,
('False', _('DOWN'))], required=False)
label=_("Admin State"))
shared = forms.BooleanField(label=_("Shared"), shared = forms.BooleanField(label=_("Shared"),
initial=False, required=False) initial=False, required=False)
external = forms.BooleanField(label=_("External Network"), external = forms.BooleanField(label=_("External Network"),
@ -246,7 +245,7 @@ class CreateNetwork(forms.SelfHandlingForm):
try: try:
params = {'name': data['name'], params = {'name': data['name'],
'tenant_id': data['tenant_id'], 'tenant_id': data['tenant_id'],
'admin_state_up': (data['admin_state'] == 'True'), 'admin_state_up': data['admin_state'],
'shared': data['shared'], 'shared': data['shared'],
'router:external': data['external']} 'router:external': data['external']}
if api.neutron.is_port_profiles_supported(): if api.neutron.is_port_profiles_supported():
@ -312,9 +311,8 @@ class UpdateNetwork(forms.SelfHandlingForm):
network_id = forms.CharField(label=_("ID"), network_id = forms.CharField(label=_("ID"),
widget=forms.TextInput( widget=forms.TextInput(
attrs={'readonly': 'readonly'})) attrs={'readonly': 'readonly'}))
admin_state = forms.ThemableChoiceField(choices=[(True, _('UP')), admin_state = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], required=False)
label=_("Admin State"))
shared = forms.BooleanField(label=_("Shared"), required=False) shared = forms.BooleanField(label=_("Shared"), required=False)
external = forms.BooleanField(label=_("External Network"), required=False) external = forms.BooleanField(label=_("External Network"), required=False)
failure_url = 'horizon:admin:networks:index' failure_url = 'horizon:admin:networks:index'
@ -322,7 +320,7 @@ class UpdateNetwork(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
try: try:
params = {'name': data['name'], params = {'name': data['name'],
'admin_state_up': (data['admin_state'] == 'True'), 'admin_state_up': data['admin_state'],
'shared': data['shared'], 'shared': data['shared'],
'router:external': data['external']} 'router:external': data['external']}
network = api.neutron.network_update(request, network = api.neutron.network_update(request,

3
openstack_dashboard/dashboards/admin/networks/ports/forms.py
View File

@ -158,7 +158,7 @@ class CreatePort(forms.SelfHandlingForm):
params = { params = {
'tenant_id': network.tenant_id, 'tenant_id': network.tenant_id,
'network_id': data['network_id'], 'network_id': data['network_id'],
'admin_state_up': data['admin_state'] == 'True', 'admin_state_up': data['admin_state'],
'name': data['name'], 'name': data['name'],
'device_id': data['device_id'], 'device_id': data['device_id'],
'device_owner': data['device_owner'], 'device_owner': data['device_owner'],
@ -214,7 +214,6 @@ class UpdatePort(project_forms.UpdatePort):
try: try:
LOG.debug('params = %s' % data) LOG.debug('params = %s' % data)
extension_kwargs = {} extension_kwargs = {}
data['admin_state'] = (data['admin_state'] == 'True')
if 'binding__vnic_type' in data: if 'binding__vnic_type' in data:
extension_kwargs['binding__vnic_type'] = \ extension_kwargs['binding__vnic_type'] = \
data['binding__vnic_type'] data['binding__vnic_type']

6
openstack_dashboard/dashboards/project/firewalls/forms.py
View File

@ -134,9 +134,8 @@ class UpdateFirewall(forms.SelfHandlingForm):
label=_("Description"), label=_("Description"),
required=False) required=False)
firewall_policy_id = forms.ThemableChoiceField(label=_("Policy")) firewall_policy_id = forms.ThemableChoiceField(label=_("Policy"))
admin_state_up = forms.ThemableChoiceField(choices=[(True, _('UP')), admin_state_up = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], required=False)
label=_("Admin State"))
failure_url = 'horizon:project:firewalls:index' failure_url = 'horizon:project:firewalls:index'
@ -165,7 +164,6 @@ class UpdateFirewall(forms.SelfHandlingForm):
def handle(self, request, context): def handle(self, request, context):
firewall_id = self.initial['firewall_id'] firewall_id = self.initial['firewall_id']
name_or_id = context.get('name') or firewall_id name_or_id = context.get('name') or firewall_id
context['admin_state_up'] = (context['admin_state_up'] == 'True')
try: try:
firewall = api.fwaas.firewall_update(request, firewall_id, firewall = api.fwaas.firewall_update(request, firewall_id,
**context) **context)

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

@ -327,9 +327,9 @@ class AddFirewallAction(workflows.Action):
label=_("Description"), label=_("Description"),
required=False) required=False)
firewall_policy_id = forms.ThemableChoiceField(label=_("Policy")) firewall_policy_id = forms.ThemableChoiceField(label=_("Policy"))
admin_state_up = forms.ThemableChoiceField(choices=[(True, _('UP')), admin_state_up = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], initial=True,
label=_("Admin State")) required=False)
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
super(AddFirewallAction, self).__init__(request, *args, **kwargs) super(AddFirewallAction, self).__init__(request, *args, **kwargs)
@ -364,11 +364,6 @@ class AddFirewallStep(workflows.Step):
contributes = ("name", "firewall_policy_id", "description", contributes = ("name", "firewall_policy_id", "description",
"admin_state_up") "admin_state_up")
def contribute(self, data, context):
context = super(AddFirewallStep, self).contribute(data, context)
context['admin_state_up'] = (context['admin_state_up'] == 'True')
return context
class AddFirewall(workflows.Workflow): class AddFirewall(workflows.Workflow):
slug = "addfirewall" slug = "addfirewall"

9
openstack_dashboard/dashboards/project/networks/forms.py
View File

@ -38,11 +38,8 @@ class UpdateNetwork(forms.SelfHandlingForm):
network_id = forms.CharField(label=_("ID"), network_id = forms.CharField(label=_("ID"),
widget=forms.TextInput( widget=forms.TextInput(
attrs={'readonly': 'readonly'})) attrs={'readonly': 'readonly'}))
admin_state = forms.ThemableChoiceField( admin_state = forms.BooleanField(label=_("Enable Admin State"),
choices=[('True', _('UP')), required=False)
('False', _('DOWN'))],
required=False,
label=_("Admin State"))
shared = forms.BooleanField(label=_("Shared"), required=False) shared = forms.BooleanField(label=_("Shared"), required=False)
failure_url = 'horizon:project:networks:index' failure_url = 'horizon:project:networks:index'
@ -54,7 +51,7 @@ class UpdateNetwork(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
try: try:
params = {'admin_state_up': (data['admin_state'] == 'True'), params = {'admin_state_up': data['admin_state'],
'name': data['name']} 'name': data['name']}
# Make sure we are not sending shared data when the user # Make sure we are not sending shared data when the user
# doesnt'have admin rights because even if the user doesn't # doesnt'have admin rights because even if the user doesn't

7
openstack_dashboard/dashboards/project/networks/ports/forms.py
View File

@ -38,10 +38,8 @@ class UpdatePort(forms.SelfHandlingForm):
name = forms.CharField(max_length=255, name = forms.CharField(max_length=255,
label=_("Name"), label=_("Name"),
required=False) required=False)
admin_state = forms.ThemableChoiceField( admin_state = forms.BooleanField(label=_("Enable Admin State"),
choices=[('True', _('UP')), required=False)
('False', _('DOWN'))],
label=_("Admin State"))
failure_url = 'horizon:project:networks:detail' failure_url = 'horizon:project:networks:detail'
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
@ -81,7 +79,6 @@ class UpdatePort(forms.SelfHandlingForm):
exceptions.handle(self.request, msg) exceptions.handle(self.request, msg)
def handle(self, request, data): def handle(self, request, data):
data['admin_state'] = (data['admin_state'] == 'True')
try: try:
LOG.debug('params = %s' % data) LOG.debug('params = %s' % data)
extension_kwargs = {} extension_kwargs = {}

12
openstack_dashboard/dashboards/project/networks/workflows.py
View File

@ -45,13 +45,11 @@ class CreateNetworkInfoAction(workflows.Action):
required=False, required=False,
widget=widget) widget=widget)
admin_state = forms.ThemableChoiceField( admin_state = forms.BooleanField(
choices=[(True, _('UP')), label=_("Enable Admin State"),
(False, _('DOWN'))], initial=True,
label=_("Admin State"),
required=False, required=False,
help_text=_("The state to start" help_text=_("The state to start the network in."))
" the network in."))
shared = forms.BooleanField(label=_("Shared"), initial=False, shared = forms.BooleanField(label=_("Shared"), initial=False,
required=False) required=False)
with_subnet = forms.BooleanField(label=_("Create Subnet"), with_subnet = forms.BooleanField(label=_("Create Subnet"),
@ -493,7 +491,7 @@ class CreateNetwork(workflows.Workflow):
def _create_network(self, request, data): def _create_network(self, request, data):
try: try:
params = {'name': data['net_name'], params = {'name': data['net_name'],
'admin_state_up': (data['admin_state'] == 'True'), 'admin_state_up': data['admin_state'],
'shared': data['shared']} 'shared': data['shared']}
if api.neutron.is_port_profiles_supported(): if api.neutron.is_port_profiles_supported():
params['net_profile_id'] = data['net_profile_id'] params['net_profile_id'] = data['net_profile_id']

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

@ -34,10 +34,9 @@ LOG = logging.getLogger(__name__)
class CreateForm(forms.SelfHandlingForm): class CreateForm(forms.SelfHandlingForm):
name = forms.CharField(max_length=255, label=_("Router Name"), name = forms.CharField(max_length=255, label=_("Router Name"),
required=False) required=False)
admin_state_up = forms.ThemableChoiceField(label=_("Admin State"), admin_state_up = forms.BooleanField(label=_("Enable Admin State"),
choices=[(True, _('UP')), initial=True,
(False, _('DOWN'))], required=False)
required=False)
external_network = forms.ThemableChoiceField(label=_("External Network"), external_network = forms.ThemableChoiceField(label=_("External Network"),
required=False) required=False)
mode = forms.ChoiceField(label=_("Router Type")) mode = forms.ChoiceField(label=_("Router Type"))
@ -116,9 +115,8 @@ class CreateForm(forms.SelfHandlingForm):
class UpdateForm(forms.SelfHandlingForm): class UpdateForm(forms.SelfHandlingForm):
name = forms.CharField(label=_("Name"), required=False) name = forms.CharField(label=_("Name"), required=False)
admin_state = forms.ThemableChoiceField(choices=[(True, _('UP')), admin_state = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], required=False)
label=_("Admin State"))
router_id = forms.CharField(label=_("ID"), router_id = forms.CharField(label=_("ID"),
widget=forms.TextInput( widget=forms.TextInput(
attrs={'readonly': 'readonly'})) attrs={'readonly': 'readonly'}))
@ -155,7 +153,7 @@ class UpdateForm(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
try: try:
params = {'admin_state_up': (data['admin_state'] == 'True'), params = {'admin_state_up': data['admin_state'],
'name': data['name']} 'name': data['name']}
if self.dvr_allowed: if self.dvr_allowed:
params['distributed'] = (data['mode'] == 'distributed') params['distributed'] = (data['mode'] == 'distributed')

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

@ -264,7 +264,7 @@ class RouterActionTests(RouterMixin, test.TestCase):
api.neutron.network_list(IsA(http.HttpRequest))\ api.neutron.network_list(IsA(http.HttpRequest))\
.AndReturn(self.networks.list()) .AndReturn(self.networks.list())
params = {'name': router.name, params = {'name': router.name,
'admin_state_up': str(router.admin_state_up)} 'admin_state_up': router.admin_state_up}
api.neutron.router_create(IsA(http.HttpRequest), **params)\ api.neutron.router_create(IsA(http.HttpRequest), **params)\
.AndReturn(router) .AndReturn(router)
@ -291,7 +291,7 @@ class RouterActionTests(RouterMixin, test.TestCase):
api.neutron.network_list(IsA(http.HttpRequest))\ api.neutron.network_list(IsA(http.HttpRequest))\
.AndReturn(self.networks.list()) .AndReturn(self.networks.list())
params = {'name': router.name, params = {'name': router.name,
'admin_state_up': str(router.admin_state_up)} 'admin_state_up': router.admin_state_up}
api.neutron.router_create(IsA(http.HttpRequest), **params)\ api.neutron.router_create(IsA(http.HttpRequest), **params)\
.AndReturn(router) .AndReturn(router)
@ -322,7 +322,7 @@ class RouterActionTests(RouterMixin, test.TestCase):
param = {'name': router.name, param = {'name': router.name,
'distributed': True, 'distributed': True,
'ha': True, 'ha': True,
'admin_state_up': str(router.admin_state_up)} 'admin_state_up': router.admin_state_up}
api.neutron.router_create(IsA(http.HttpRequest), **param)\ api.neutron.router_create(IsA(http.HttpRequest), **param)\
.AndReturn(router) .AndReturn(router)
@ -352,7 +352,7 @@ class RouterActionTests(RouterMixin, test.TestCase):
api.neutron.network_list(IsA(http.HttpRequest))\ api.neutron.network_list(IsA(http.HttpRequest))\
.MultipleTimes().AndReturn(self.networks.list()) .MultipleTimes().AndReturn(self.networks.list())
params = {'name': router.name, params = {'name': router.name,
'admin_state_up': str(router.admin_state_up)} 'admin_state_up': router.admin_state_up}
api.neutron.router_create(IsA(http.HttpRequest), **params)\ api.neutron.router_create(IsA(http.HttpRequest), **params)\
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -380,7 +380,7 @@ class RouterActionTests(RouterMixin, test.TestCase):
api.neutron.network_list(IsA(http.HttpRequest))\ api.neutron.network_list(IsA(http.HttpRequest))\
.MultipleTimes().AndReturn(self.networks.list()) .MultipleTimes().AndReturn(self.networks.list())
params = {'name': router.name, params = {'name': router.name,
'admin_state_up': str(router.admin_state_up)} 'admin_state_up': router.admin_state_up}
api.neutron.router_create(IsA(http.HttpRequest), **params)\ api.neutron.router_create(IsA(http.HttpRequest), **params)\
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
self.mox.ReplayAll() self.mox.ReplayAll()

14
openstack_dashboard/dashboards/project/vpn/forms.py
View File

@ -34,15 +34,12 @@ class UpdateVPNService(forms.SelfHandlingForm):
widget=forms.TextInput(attrs={'readonly': 'readonly'})) widget=forms.TextInput(attrs={'readonly': 'readonly'}))
description = forms.CharField( description = forms.CharField(
required=False, max_length=80, label=_("Description")) required=False, max_length=80, label=_("Description"))
admin_state_up = forms.ChoiceField(choices=[(True, _('UP')), admin_state_up = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], required=False)
label=_("Admin State"),
required=False)
failure_url = 'horizon:project:vpn:index' failure_url = 'horizon:project:vpn:index'
def handle(self, request, context): def handle(self, request, context):
context['admin_state_up'] = (context['admin_state_up'] == 'True')
try: try:
data = {'vpnservice': {'name': context['name'], data = {'vpnservice': {'name': context['name'],
'description': context['description'], 'description': context['description'],
@ -279,10 +276,8 @@ class UpdateIPSecSiteConnection(forms.SelfHandlingForm):
required=False, required=False,
choices=[('bi-directional', _('bi-directional')), choices=[('bi-directional', _('bi-directional')),
('response-only', _('response-only'))]) ('response-only', _('response-only'))])
admin_state_up = forms.ChoiceField(choices=[(True, _('UP')), admin_state_up = forms.BooleanField(label=_("Enable Admin State"),
(False, _('DOWN'))], required=False)
label=_("Admin State"),
required=False)
failure_url = 'horizon:project:vpn:index' failure_url = 'horizon:project:vpn:index'
@ -297,7 +292,6 @@ class UpdateIPSecSiteConnection(forms.SelfHandlingForm):
return cleaned_data return cleaned_data
def handle(self, request, context): def handle(self, request, context):
context['admin_state_up'] = (context['admin_state_up'] == 'True')
try: try:
data = {'ipsec_site_connection': data = {'ipsec_site_connection':
{'name': context['name'], {'name': context['name'],

4
openstack_dashboard/dashboards/project/vpn/templates/vpn/_add_vpn_service_help.html
View File

@ -3,5 +3,5 @@
<p>{% trans "Create VPN service for current project." %}</p> <p>{% trans "Create VPN service for current project." %}</p>
<p>{% trans "The VPN service is attached to a router and references to a single subnet to push to a remote site." %}</p> <p>{% trans "The VPN service is attached to a router and references to a single subnet to push to a remote site." %}</p>
<p>{% trans "Specify a name, description, router, and subnet for the VPN Service." %}</p> <p>{% trans "Specify a name, description, router, and subnet for the VPN Service." %}</p>
<p>{% trans "Admin State is UP (True) by default." %}</p> <p>{% trans "Admin State is enabled by default." %}</p>
<p>{% trans "The router, subnet and admin state fields are required. All others are optional." %} </p> <p>{% trans "The router, subnet and admin state fields require to be enabled. All others are optional." %} </p>

22
openstack_dashboard/dashboards/project/vpn/workflows.py
View File

@ -28,11 +28,11 @@ class AddVPNServiceAction(workflows.Action):
max_length=80, label=_("Description")) max_length=80, label=_("Description"))
router_id = forms.ChoiceField(label=_("Router")) router_id = forms.ChoiceField(label=_("Router"))
subnet_id = forms.ChoiceField(label=_("Subnet")) subnet_id = forms.ChoiceField(label=_("Subnet"))
admin_state_up = forms.ChoiceField( admin_state_up = forms.BooleanField(
choices=[(True, _('UP')), (False, _('DOWN'))], label=_("Enable Admin State"),
label=_("Admin State"), help_text=_("The state of VPN service to start in. If disabled "
help_text=_("The state of VPN service to start in. " "(not checked), VPN service does not forward packets."),
"If DOWN (False) VPN service does not forward packets."), initial=True,
required=False) required=False)
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
@ -426,13 +426,13 @@ class AddIPSecSiteConnectionOptionalAction(workflows.Action):
required=False, required=False,
help_text=_("Valid integer greater than the DPD interval")) help_text=_("Valid integer greater than the DPD interval"))
initiator = forms.ChoiceField(label=_("Initiator state"), required=False) initiator = forms.ChoiceField(label=_("Initiator state"), required=False)
admin_state_up = forms.ChoiceField( admin_state_up = forms.BooleanField(
choices=[(True, _('UP')), (False, _('DOWN'))], label=_("Enable Admin State"),
label=_("Admin State"),
required=False,
help_text=_("The state of IPSec site connection to start in. " help_text=_("The state of IPSec site connection to start in. "
"If DOWN (False), IPSec site connection " "If disabled (not checked), IPSec site connection "
"does not forward packets.")) "does not forward packets."),
initial=True,
required=False)
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
super(AddIPSecSiteConnectionOptionalAction, self).__init__( super(AddIPSecSiteConnectionOptionalAction, self).__init__(