PEP8 E126 has been resolved
Change-Id: Ic5d3b96b6061b7a34e7620d8d09418bd6976fbb1 Partial-Bug: #1085346
This commit is contained in:
parent
08a757b0d1
commit
afaa72185c
|
@ -232,7 +232,8 @@ class SecurityGroupManager(network_base.SecurityGroupManager):
|
||||||
% instance_id)
|
% instance_id)
|
||||||
if body:
|
if body:
|
||||||
# Wrap data in SG objects as novaclient would.
|
# 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)
|
nclient.security_groups, sg, loaded=True)
|
||||||
for sg in body.get('security_groups', [])]
|
for sg in body.get('security_groups', [])]
|
||||||
# Then wrap novaclient's object with our own. Yes, sadly wrapping
|
# Then wrap novaclient's object with our own. Yes, sadly wrapping
|
||||||
|
|
|
@ -136,8 +136,8 @@ def vpnservice_create(request, **kwargs):
|
||||||
:param router_id: router id for router of VPNService
|
:param router_id: router id for router of VPNService
|
||||||
:param subnet_id: subnet id for subnet of VPNService
|
:param subnet_id: subnet id for subnet of VPNService
|
||||||
"""
|
"""
|
||||||
body = {'vpnservice': {
|
body = {'vpnservice':
|
||||||
'admin_state_up': kwargs['admin_state_up'],
|
{'admin_state_up': kwargs['admin_state_up'],
|
||||||
'name': kwargs['name'],
|
'name': kwargs['name'],
|
||||||
'description': kwargs['description'],
|
'description': kwargs['description'],
|
||||||
'router_id': kwargs['router_id'],
|
'router_id': kwargs['router_id'],
|
||||||
|
@ -182,17 +182,15 @@ def ikepolicy_create(request, **kwargs):
|
||||||
:param pfs: Perfect Forward Secrecy for IKEPolicy
|
:param pfs: Perfect Forward Secrecy for IKEPolicy
|
||||||
:param phase1_negotiation_mode: IKE Phase1 negotiation mode for IKEPolicy
|
:param phase1_negotiation_mode: IKE Phase1 negotiation mode for IKEPolicy
|
||||||
"""
|
"""
|
||||||
body = {'ikepolicy': {
|
body = {'ikepolicy':
|
||||||
'name': kwargs['name'],
|
{'name': kwargs['name'],
|
||||||
'description': kwargs['description'],
|
'description': kwargs['description'],
|
||||||
'auth_algorithm': kwargs['auth_algorithm'],
|
'auth_algorithm': kwargs['auth_algorithm'],
|
||||||
'encryption_algorithm': kwargs[
|
'encryption_algorithm': kwargs['encryption_algorithm'],
|
||||||
'encryption_algorithm'],
|
|
||||||
'ike_version': kwargs['ike_version'],
|
'ike_version': kwargs['ike_version'],
|
||||||
'lifetime': kwargs['lifetime'],
|
'lifetime': kwargs['lifetime'],
|
||||||
'pfs': kwargs['pfs'],
|
'pfs': kwargs['pfs'],
|
||||||
'phase1_negotiation_mode': kwargs[
|
'phase1_negotiation_mode': kwargs['phase1_negotiation_mode']}
|
||||||
'phase1_negotiation_mode']}
|
|
||||||
}
|
}
|
||||||
ikepolicy = neutronclient(request).create_ikepolicy(body).get(
|
ikepolicy = neutronclient(request).create_ikepolicy(body).get(
|
||||||
'ikepolicy')
|
'ikepolicy')
|
||||||
|
@ -233,8 +231,8 @@ def ipsecpolicy_create(request, **kwargs):
|
||||||
:param pfs: Perfect Forward Secrecy for IPSecPolicy
|
:param pfs: Perfect Forward Secrecy for IPSecPolicy
|
||||||
:param transform_protocol: Transform Protocol for IPSecPolicy
|
:param transform_protocol: Transform Protocol for IPSecPolicy
|
||||||
"""
|
"""
|
||||||
body = {'ipsecpolicy': {
|
body = {'ipsecpolicy':
|
||||||
'name': kwargs['name'],
|
{'name': kwargs['name'],
|
||||||
'description': kwargs['description'],
|
'description': kwargs['description'],
|
||||||
'auth_algorithm': kwargs['auth_algorithm'],
|
'auth_algorithm': kwargs['auth_algorithm'],
|
||||||
'encapsulation_mode': kwargs['encapsulation_mode'],
|
'encapsulation_mode': kwargs['encapsulation_mode'],
|
||||||
|
@ -288,8 +286,8 @@ def ipsecsiteconnection_create(request, **kwargs):
|
||||||
:param vpnservice_id: VPNService associated with this connection
|
:param vpnservice_id: VPNService associated with this connection
|
||||||
:param admin_state_up: admin state (default on)
|
:param admin_state_up: admin state (default on)
|
||||||
"""
|
"""
|
||||||
body = {'ipsec_site_connection': {
|
body = {'ipsec_site_connection':
|
||||||
'name': kwargs['name'],
|
{'name': kwargs['name'],
|
||||||
'description': kwargs['description'],
|
'description': kwargs['description'],
|
||||||
'dpd': kwargs['dpd'],
|
'dpd': kwargs['dpd'],
|
||||||
'ikepolicy_id': kwargs['ikepolicy_id'],
|
'ikepolicy_id': kwargs['ikepolicy_id'],
|
||||||
|
|
|
@ -41,19 +41,14 @@ class CreateForm(forms.SelfHandlingForm):
|
||||||
widget=fields.SelectWidget(
|
widget=fields.SelectWidget(
|
||||||
attrs={'class': 'snapshot-selector'},
|
attrs={'class': 'snapshot-selector'},
|
||||||
data_attrs=('size', 'display_name'),
|
data_attrs=('size', 'display_name'),
|
||||||
transform=lambda x:
|
transform=lambda x: "%s (%sGB)" % (x.display_name, x.size)),
|
||||||
("%s (%sGB)" % (x.display_name,
|
|
||||||
x.size))),
|
|
||||||
required=False)
|
required=False)
|
||||||
image_source = forms.ChoiceField(
|
image_source = forms.ChoiceField(
|
||||||
label=_("Use image as a source"),
|
label=_("Use image as a source"),
|
||||||
widget=fields.SelectWidget(
|
widget=fields.SelectWidget(
|
||||||
attrs={'class': 'image-selector'},
|
attrs={'class': 'image-selector'},
|
||||||
data_attrs=('size', 'name'),
|
data_attrs=('size', 'name'),
|
||||||
transform=lambda x:
|
transform=lambda x: "%s (%s)" % (x.name, filesizeformat(x.bytes))),
|
||||||
("%s (%s)" %
|
|
||||||
(x.name,
|
|
||||||
filesizeformat(x.bytes)))),
|
|
||||||
required=False)
|
required=False)
|
||||||
|
|
||||||
def __init__(self, request, *args, **kwargs):
|
def __init__(self, request, *args, **kwargs):
|
||||||
|
|
|
@ -293,8 +293,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': vpnservice['name'],
|
||||||
'name': vpnservice['name'],
|
|
||||||
'description': vpnservice['description'],
|
'description': vpnservice['description'],
|
||||||
'subnet_id': vpnservice['subnet_id'],
|
'subnet_id': vpnservice['subnet_id'],
|
||||||
'router_id': vpnservice['router_id'],
|
'router_id': vpnservice['router_id'],
|
||||||
|
@ -323,8 +322,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': vpnservice['name'],
|
||||||
'name': vpnservice['name'],
|
|
||||||
'description': vpnservice['description'],
|
'description': vpnservice['description'],
|
||||||
'subnet_id': '',
|
'subnet_id': '',
|
||||||
'router_id': '',
|
'router_id': '',
|
||||||
|
@ -362,8 +360,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ikepolicy['name'],
|
||||||
'name': ikepolicy['name'],
|
|
||||||
'description': ikepolicy['description'],
|
'description': ikepolicy['description'],
|
||||||
'auth_algorithm': ikepolicy['auth_algorithm'],
|
'auth_algorithm': ikepolicy['auth_algorithm'],
|
||||||
'encryption_algorithm': ikepolicy[
|
'encryption_algorithm': ikepolicy[
|
||||||
|
@ -383,8 +380,7 @@ class VPNTests(test.TestCase):
|
||||||
def test_add_ikepolicy_post_error(self):
|
def test_add_ikepolicy_post_error(self):
|
||||||
ikepolicy = self.ikepolicies.first()
|
ikepolicy = self.ikepolicies.first()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ikepolicy['name'],
|
||||||
'name': ikepolicy['name'],
|
|
||||||
'description': ikepolicy['description'],
|
'description': ikepolicy['description'],
|
||||||
'auth_algorithm': ikepolicy['auth_algorithm'],
|
'auth_algorithm': ikepolicy['auth_algorithm'],
|
||||||
'encryption_algorithm': ikepolicy[
|
'encryption_algorithm': ikepolicy[
|
||||||
|
@ -428,8 +424,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ipsecpolicy['name'],
|
||||||
'name': ipsecpolicy['name'],
|
|
||||||
'description': ipsecpolicy['description'],
|
'description': ipsecpolicy['description'],
|
||||||
'auth_algorithm': ipsecpolicy['auth_algorithm'],
|
'auth_algorithm': ipsecpolicy['auth_algorithm'],
|
||||||
'encryption_algorithm': ipsecpolicy[
|
'encryption_algorithm': ipsecpolicy[
|
||||||
|
@ -450,8 +445,7 @@ class VPNTests(test.TestCase):
|
||||||
def test_add_ipsecpolicy_post_error(self):
|
def test_add_ipsecpolicy_post_error(self):
|
||||||
ipsecpolicy = self.ipsecpolicies.first()
|
ipsecpolicy = self.ipsecpolicies.first()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ipsecpolicy['name'],
|
||||||
'name': ipsecpolicy['name'],
|
|
||||||
'description': ipsecpolicy['description'],
|
'description': ipsecpolicy['description'],
|
||||||
'auth_algorithm': ipsecpolicy['auth_algorithm'],
|
'auth_algorithm': ipsecpolicy['auth_algorithm'],
|
||||||
'encryption_algorithm': ipsecpolicy[
|
'encryption_algorithm': ipsecpolicy[
|
||||||
|
@ -540,8 +534,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ipsecsiteconnection['name'],
|
||||||
'name': ipsecsiteconnection['name'],
|
|
||||||
'description': ipsecsiteconnection['description'],
|
'description': ipsecsiteconnection['description'],
|
||||||
'dpd_action': ipsecsiteconnection['dpd']['action'],
|
'dpd_action': ipsecsiteconnection['dpd']['action'],
|
||||||
'dpd_interval': ipsecsiteconnection['dpd']['interval'],
|
'dpd_interval': ipsecsiteconnection['dpd']['interval'],
|
||||||
|
@ -587,8 +580,7 @@ class VPNTests(test.TestCase):
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
form_data = {
|
form_data = {'name': ipsecsiteconnection['name'],
|
||||||
'name': ipsecsiteconnection['name'],
|
|
||||||
'description': ipsecsiteconnection['description'],
|
'description': ipsecsiteconnection['description'],
|
||||||
'dpd_action': ipsecsiteconnection['dpd']['action'],
|
'dpd_action': ipsecsiteconnection['dpd']['action'],
|
||||||
'dpd_interval': ipsecsiteconnection['dpd']['interval'],
|
'dpd_interval': ipsecsiteconnection['dpd']['interval'],
|
||||||
|
|
|
@ -25,7 +25,8 @@ class UserSettingsView(forms.ModalFormView):
|
||||||
template_name = 'settings/user/settings.html'
|
template_name = 'settings/user/settings.html'
|
||||||
|
|
||||||
def get_initial(self):
|
def get_initial(self):
|
||||||
return {'language': self.request.session.get(
|
return {
|
||||||
|
'language': self.request.session.get(
|
||||||
settings.LANGUAGE_COOKIE_NAME,
|
settings.LANGUAGE_COOKIE_NAME,
|
||||||
self.request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME,
|
self.request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME,
|
||||||
self.request.LANGUAGE_CODE)),
|
self.request.LANGUAGE_CODE)),
|
||||||
|
|
|
@ -33,7 +33,8 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
'description': vpnservice1['description'],
|
'description': vpnservice1['description'],
|
||||||
'subnet_id': vpnservice1['subnet_id'],
|
'subnet_id': vpnservice1['subnet_id'],
|
||||||
'router_id': vpnservice1['router_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()}
|
vpnservice = {'vpnservice': self.api_vpnservices.first()}
|
||||||
neutronclient.create_vpnservice(
|
neutronclient.create_vpnservice(
|
||||||
|
@ -79,13 +80,12 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
'name': ikepolicy1['name'],
|
'name': ikepolicy1['name'],
|
||||||
'description': ikepolicy1['description'],
|
'description': ikepolicy1['description'],
|
||||||
'auth_algorithm': ikepolicy1['auth_algorithm'],
|
'auth_algorithm': ikepolicy1['auth_algorithm'],
|
||||||
'encryption_algorithm': ikepolicy1[
|
'encryption_algorithm': ikepolicy1['encryption_algorithm'],
|
||||||
'encryption_algorithm'],
|
|
||||||
'ike_version': ikepolicy1['ike_version'],
|
'ike_version': ikepolicy1['ike_version'],
|
||||||
'lifetime': ikepolicy1['lifetime'],
|
'lifetime': ikepolicy1['lifetime'],
|
||||||
'phase1_negotiation_mode': ikepolicy1[
|
'phase1_negotiation_mode': ikepolicy1['phase1_negotiation_mode'],
|
||||||
'phase1_negotiation_mode'],
|
'pfs': ikepolicy1['pfs']
|
||||||
'pfs': ikepolicy1['pfs']}
|
}
|
||||||
|
|
||||||
ikepolicy = {'ikepolicy': self.api_ikepolicies.first()}
|
ikepolicy = {'ikepolicy': self.api_ikepolicies.first()}
|
||||||
neutronclient.create_ikepolicy(
|
neutronclient.create_ikepolicy(
|
||||||
|
@ -131,14 +131,12 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
'name': ipsecpolicy1['name'],
|
'name': ipsecpolicy1['name'],
|
||||||
'description': ipsecpolicy1['description'],
|
'description': ipsecpolicy1['description'],
|
||||||
'auth_algorithm': ipsecpolicy1['auth_algorithm'],
|
'auth_algorithm': ipsecpolicy1['auth_algorithm'],
|
||||||
'encryption_algorithm': ipsecpolicy1[
|
'encryption_algorithm': ipsecpolicy1['encryption_algorithm'],
|
||||||
'encryption_algorithm'],
|
'encapsulation_mode': ipsecpolicy1['encapsulation_mode'],
|
||||||
'encapsulation_mode': ipsecpolicy1[
|
|
||||||
'encapsulation_mode'],
|
|
||||||
'lifetime': ipsecpolicy1['lifetime'],
|
'lifetime': ipsecpolicy1['lifetime'],
|
||||||
'pfs': ipsecpolicy1['pfs'],
|
'pfs': ipsecpolicy1['pfs'],
|
||||||
'transform_protocol': ipsecpolicy1[
|
'transform_protocol': ipsecpolicy1['transform_protocol']
|
||||||
'transform_protocol']}
|
}
|
||||||
|
|
||||||
ipsecpolicy = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
ipsecpolicy = {'ipsecpolicy': self.api_ipsecpolicies.first()}
|
||||||
neutronclient.create_ipsecpolicy(
|
neutronclient.create_ipsecpolicy(
|
||||||
|
@ -186,16 +184,15 @@ class VPNaasApiTests(test.APITestCase):
|
||||||
'dpd': ipsecsiteconnection1['dpd'],
|
'dpd': ipsecsiteconnection1['dpd'],
|
||||||
'ikepolicy_id': ipsecsiteconnection1['ikepolicy_id'],
|
'ikepolicy_id': ipsecsiteconnection1['ikepolicy_id'],
|
||||||
'initiator': ipsecsiteconnection1['initiator'],
|
'initiator': ipsecsiteconnection1['initiator'],
|
||||||
'ipsecpolicy_id': ipsecsiteconnection1[
|
'ipsecpolicy_id': ipsecsiteconnection1['ipsecpolicy_id'],
|
||||||
'ipsecpolicy_id'],
|
|
||||||
'mtu': ipsecsiteconnection1['mtu'],
|
'mtu': ipsecsiteconnection1['mtu'],
|
||||||
'peer_address': ipsecsiteconnection1['peer_address'],
|
'peer_address': ipsecsiteconnection1['peer_address'],
|
||||||
'peer_cidrs': ipsecsiteconnection1['peer_cidrs'],
|
'peer_cidrs': ipsecsiteconnection1['peer_cidrs'],
|
||||||
'peer_id': ipsecsiteconnection1['peer_id'],
|
'peer_id': ipsecsiteconnection1['peer_id'],
|
||||||
'psk': ipsecsiteconnection1['psk'],
|
'psk': ipsecsiteconnection1['psk'],
|
||||||
'vpnservice_id': ipsecsiteconnection1['vpnservice_id'],
|
'vpnservice_id': ipsecsiteconnection1['vpnservice_id'],
|
||||||
'admin_state_up': ipsecsiteconnection1[
|
'admin_state_up': ipsecsiteconnection1['admin_state_up']
|
||||||
'admin_state_up']}
|
}
|
||||||
|
|
||||||
ipsecsiteconnection = {'ipsec_site_connection':
|
ipsecsiteconnection = {'ipsec_site_connection':
|
||||||
self.api_ipsecsiteconnections.first()}
|
self.api_ipsecsiteconnections.first()}
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -32,11 +32,10 @@ downloadcache = ~/cache/pip
|
||||||
[flake8]
|
[flake8]
|
||||||
builtins = _
|
builtins = _
|
||||||
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
|
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
|
# E127 continuation line over-indented for visual indent
|
||||||
# E128 continuation line under-indented for visual indent
|
# E128 continuation line under-indented for visual indent
|
||||||
# H102 Apache 2.0 license header not found
|
# H102 Apache 2.0 license header not found
|
||||||
# H4xx docstrings
|
# H4xx docstrings
|
||||||
# H701 empty localization string
|
# H701 empty localization string
|
||||||
# H702 Formatting operation should be outside of localization method call
|
# 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
|
||||||
|
|
Loading…
Reference in New Issue