openstack/horizon
Code Issues Proposed changes

Merge "PEP8 E126 has been resolved"

Browse Source
This commit is contained in:
Jenkins 2013-09-19 07:50:52 +00:00 committed by Gerrit Code Review
commit d1afd53a92
48 changed files with 367 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/api/nova.py
View File

@ -232,7 +232,8 @@ class SecurityGroupManager(network_base.SecurityGroupManager):
% instance_id)
if body:
# Wrap data in SG objects as novaclient would.
sg_objs = [nova_security_groups.SecurityGroup(
sg_objs = [
nova_security_groups.SecurityGroup(
nclient.security_groups, sg, loaded=True)
for sg in body.get('security_groups', [])]
# Then wrap novaclient's object with our own. Yes, sadly wrapping

22
openstack_dashboard/api/vpn.py
View File

@ -136,8 +136,8 @@ def vpnservice_create(request, **kwargs):
:param router_id: router id for router of VPNService
:param subnet_id: subnet id for subnet of VPNService
"""
body = {'vpnservice': {
'admin_state_up': kwargs['admin_state_up'],
body = {'vpnservice':
{'admin_state_up': kwargs['admin_state_up'],
'name': kwargs['name'],
'description': kwargs['description'],
'router_id': kwargs['router_id'],
@ -182,17 +182,15 @@ def ikepolicy_create(request, **kwargs):
:param pfs: Perfect Forward Secrecy for IKEPolicy
:param phase1_negotiation_mode: IKE Phase1 negotiation mode for IKEPolicy
"""
body = {'ikepolicy': {
'name': kwargs['name'],
body = {'ikepolicy':
{'name': kwargs['name'],
'description': kwargs['description'],
'auth_algorithm': kwargs['auth_algorithm'],
'encryption_algorithm': kwargs[
'encryption_algorithm'],
'encryption_algorithm': kwargs['encryption_algorithm'],
'ike_version': kwargs['ike_version'],
'lifetime': kwargs['lifetime'],
'pfs': kwargs['pfs'],
'phase1_negotiation_mode': kwargs[
'phase1_negotiation_mode']}
'phase1_negotiation_mode': kwargs['phase1_negotiation_mode']}
}
ikepolicy = neutronclient(request).create_ikepolicy(body).get(
'ikepolicy')
@ -233,8 +231,8 @@ def ipsecpolicy_create(request, **kwargs):
:param pfs: Perfect Forward Secrecy for IPSecPolicy
:param transform_protocol: Transform Protocol for IPSecPolicy
"""
body = {'ipsecpolicy': {
'name': kwargs['name'],
body = {'ipsecpolicy':
{'name': kwargs['name'],
'description': kwargs['description'],
'auth_algorithm': kwargs['auth_algorithm'],
'encapsulation_mode': kwargs['encapsulation_mode'],
@ -288,8 +286,8 @@ def ipsecsiteconnection_create(request, **kwargs):
:param vpnservice_id: VPNService associated with this connection
:param admin_state_up: admin state (default on)
"""
body = {'ipsec_site_connection': {
'name': kwargs['name'],
body = {'ipsec_site_connection':
{'name': kwargs['name'],
'description': kwargs['description'],
'dpd': kwargs['dpd'],
'ikepolicy_id': kwargs['ikepolicy_id'],

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

@ -41,19 +41,14 @@ class CreateForm(forms.SelfHandlingForm):
widget=fields.SelectWidget(
attrs={'class': 'snapshot-selector'},
data_attrs=('size', 'display_name'),
transform=lambda x:
("%s (%sGB)" % (x.display_name,
x.size))),
transform=lambda x: "%s (%sGB)" % (x.display_name, x.size)),
required=False)
image_source = forms.ChoiceField(
label=_("Use image as a source"),
widget=fields.SelectWidget(
attrs={'class': 'image-selector'},
data_attrs=('size', 'name'),
transform=lambda x:
("%s (%s)" %
(x.name,
filesizeformat(x.bytes)))),
transform=lambda x: "%s (%s)" % (x.name, filesizeformat(x.bytes))),
required=False)
def __init__(self, request, *args, **kwargs):

24
openstack_dashboard/dashboards/project/vpn/tests.py
View File

@ -293,8 +293,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': vpnservice['name'],
form_data = {'name': vpnservice['name'],
'description': vpnservice['description'],
'subnet_id': vpnservice['subnet_id'],
'router_id': vpnservice['router_id'],
@ -323,8 +322,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': vpnservice['name'],
form_data = {'name': vpnservice['name'],
'description': vpnservice['description'],
'subnet_id': '',
'router_id': '',
@ -362,8 +360,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': ikepolicy['name'],
form_data = {'name': ikepolicy['name'],
'description': ikepolicy['description'],
'auth_algorithm': ikepolicy['auth_algorithm'],
'encryption_algorithm': ikepolicy[
@ -383,8 +380,7 @@ class VPNTests(test.TestCase):
def test_add_ikepolicy_post_error(self):
ikepolicy = self.ikepolicies.first()
form_data = {
'name': ikepolicy['name'],
form_data = {'name': ikepolicy['name'],
'description': ikepolicy['description'],
'auth_algorithm': ikepolicy['auth_algorithm'],
'encryption_algorithm': ikepolicy[
@ -428,8 +424,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': ipsecpolicy['name'],
form_data = {'name': ipsecpolicy['name'],
'description': ipsecpolicy['description'],
'auth_algorithm': ipsecpolicy['auth_algorithm'],
'encryption_algorithm': ipsecpolicy[
@ -450,8 +445,7 @@ class VPNTests(test.TestCase):
def test_add_ipsecpolicy_post_error(self):
ipsecpolicy = self.ipsecpolicies.first()
form_data = {
'name': ipsecpolicy['name'],
form_data = {'name': ipsecpolicy['name'],
'description': ipsecpolicy['description'],
'auth_algorithm': ipsecpolicy['auth_algorithm'],
'encryption_algorithm': ipsecpolicy[
@ -540,8 +534,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': ipsecsiteconnection['name'],
form_data = {'name': ipsecsiteconnection['name'],
'description': ipsecsiteconnection['description'],
'dpd_action': ipsecsiteconnection['dpd']['action'],
'dpd_interval': ipsecsiteconnection['dpd']['interval'],
@ -587,8 +580,7 @@ class VPNTests(test.TestCase):
self.mox.ReplayAll()
form_data = {
'name': ipsecsiteconnection['name'],
form_data = {'name': ipsecsiteconnection['name'],
'description': ipsecsiteconnection['description'],
'dpd_action': ipsecsiteconnection['dpd']['action'],
'dpd_interval': ipsecsiteconnection['dpd']['interval'],

3
openstack_dashboard/dashboards/settings/user/views.py
View File

@ -25,7 +25,8 @@ class UserSettingsView(forms.ModalFormView):
template_name = 'settings/user/settings.html'
def get_initial(self):
return {'language': self.request.session.get(
return {
'language': self.request.session.get(
settings.LANGUAGE_COOKIE_NAME,
self.request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME,
self.request.LANGUAGE_CODE)),

29
openstack_dashboard/test/api_tests/vpnaas_tests.py
View File

@ -33,7 +33,8 @@ class VPNaasApiTests(test.APITestCase):
'description': vpnservice1['description'],
'subnet_id': vpnservice1['subnet_id'],
'router_id': vpnservice1['router_id'],
'admin_state_up': vpnservice1['admin_state_up']}
'admin_state_up': vpnservice1['admin_state_up']
}
vpnservice = {'vpnservice': self.api_vpnservices.first()}
neutronclient.create_vpnservice(
@ -79,13 +80,12 @@ class VPNaasApiTests(test.APITestCase):
'name': ikepolicy1['name'],
'description': ikepolicy1['description'],
'auth_algorithm': ikepolicy1['auth_algorithm'],
'encryption_algorithm': ikepolicy1[
'encryption_algorithm'],
'encryption_algorithm': ikepolicy1['encryption_algorithm'],
'ike_version': ikepolicy1['ike_version'],
'lifetime': ikepolicy1['lifetime'],
'phase1_negotiation_mode': ikepolicy1[
'phase1_negotiation_mode'],
'pfs': ikepolicy1['pfs']}
'phase1_negotiation_mode': ikepolicy1['phase1_negotiation_mode'],
'pfs': ikepolicy1['pfs']
}
ikepolicy = {'ikepolicy': self.api_ikepolicies.first()}
neutronclient.create_ikepolicy(
@ -131,14 +131,12 @@ class VPNaasApiTests(test.APITestCase):
'name': ipsecpolicy1['name'],
'description': ipsecpolicy1['description'],
'auth_algorithm': ipsecpolicy1['auth_algorithm'],
'encryption_algorithm': ipsecpolicy1[
'encryption_algorithm'],
'encapsulation_mode': ipsecpolicy1[
'encapsulation_mode'],
'encryption_algorithm': ipsecpolicy1['encryption_algorithm'],
'encapsulation_mode': ipsecpolicy1['encapsulation_mode'],
'lifetime': ipsecpolicy1['lifetime'],
'pfs': ipsecpolicy1['pfs'],
'transform_protocol': ipsecpolicy1[
'transform_protocol']}
'transform_protocol': ipsecpolicy1['transform_protocol']
}
ipsecpolicy = {'ipsecpolicy': self.api_ipsecpolicies.first()}
neutronclient.create_ipsecpolicy(
@ -186,16 +184,15 @@ class VPNaasApiTests(test.APITestCase):
'dpd': ipsecsiteconnection1['dpd'],
'ikepolicy_id': ipsecsiteconnection1['ikepolicy_id'],
'initiator': ipsecsiteconnection1['initiator'],
'ipsecpolicy_id': ipsecsiteconnection1[
'ipsecpolicy_id'],
'ipsecpolicy_id': ipsecsiteconnection1['ipsecpolicy_id'],
'mtu': ipsecsiteconnection1['mtu'],
'peer_address': ipsecsiteconnection1['peer_address'],
'peer_cidrs': ipsecsiteconnection1['peer_cidrs'],
'peer_id': ipsecsiteconnection1['peer_id'],
'psk': ipsecsiteconnection1['psk'],
'vpnservice_id': ipsecsiteconnection1['vpnservice_id'],
'admin_state_up': ipsecsiteconnection1[
'admin_state_up']}
'admin_state_up': ipsecsiteconnection1['admin_state_up']
}
ipsecsiteconnection = {'ipsec_site_connection':
self.api_ipsecsiteconnections.first()}

3
tox.ini
View File

@ -32,11 +32,10 @@ downloadcache = ~/cache/pip
[flake8]
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
# E126 continuation line over-indented for hanging indent
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
# H102 Apache 2.0 license header not found
# H4xx docstrings
# H701 empty localization string
# H702 Formatting operation should be outside of localization method call
ignore = E126,E127,E128,H102,H4,H701,H702
ignore = E127,E128,H102,H4,H701,H702