openstack
/
heat
Code Issues Proposed changes

Fix all trailing spaces for custom guidelines 

There are several trailing spaces error raised by
custom guidelines check. Need to fix them for successful
pep8 running.

implements bp custom-guidelines

Change-Id: Ibf50208155315e75795d7b9c8a8dbe487f9046ac
This commit is contained in:
Peter Razumovsky 2016-02-18 15:47:17 +03:00
parent 753f4c65e2
commit a5338c90c3
8 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/openstack/manila/share.py
View File

@ -87,8 +87,8 @@ class ManilaShare(resource.Resource):
),
SHARE_SNAPSHOT: properties.Schema(
properties.Schema.STRING,
_('Name or ID of shared file system snapshot that will be restored'
' and created as a new share.'),
_('Name or ID of shared file system snapshot that '
'will be restored and created as a new share.'),
constraints=[constraints.CustomConstraint('manila.share_snapshot')]
),
NAME: properties.Schema(

14
heat/engine/resources/openstack/mistral/workflow.py
View File

@ -165,14 +165,14 @@ class Workflow(signal_responder.SignalResponder,
),
WAIT_BEFORE: properties.Schema(
properties.Schema.INTEGER,
_('Defines a delay in seconds that Mistral Engine'
' should wait before starting a task.')
_('Defines a delay in seconds that Mistral Engine '
'should wait before starting a task.')
),
WAIT_AFTER: properties.Schema(
properties.Schema.INTEGER,
_('Defines a delay in seconds that Mistral Engine'
' should wait after a task has completed before'
' starting next tasks defined in '
_('Defines a delay in seconds that Mistral Engine '
'should wait after a task has completed before '
'starting next tasks defined in '
'on-success, on-error or on-complete.')
),
PAUSE_BEFORE: properties.Schema(
@ -321,8 +321,8 @@ class Workflow(signal_responder.SignalResponder,
_('Allows to synchronize multiple parallel workflow '
'branches and aggregate their data. '
'Valid inputs: all - the task will run only if '
'all upstream tasks are completed.'
' Any numeric value - then the task will run once '
'all upstream tasks are completed. '
'Any numeric value - then the task will run once '
'at least this number of upstream tasks are '
'completed and corresponding conditions have '
'triggered.'),

4
heat/engine/resources/openstack/neutron/port.py
View File

@ -249,8 +249,8 @@ class Port(neutron.NeutronResource):
'To support SR-IOV PCI passthrough networking, you can request '
'that the neutron port to be realized as normal (virtual nic), '
'direct (pci passthrough), or macvtap '
'(virtual interface with a tap-like software interface). Note'
' that this only works for Neutron deployments that support '
'(virtual interface with a tap-like software interface). Note '
'that this only works for Neutron deployments that support '
'the bindings extension.'),
constraints=[
constraints.AllowedValues(['normal', 'direct', 'macvtap']),

10
heat/engine/resources/openstack/neutron/subnet.py
View File

@ -187,8 +187,8 @@ class Subnet(neutron.NeutronResource):
),
TENANT_ID: properties.Schema(
properties.Schema.STRING,
_('The ID of the tenant who owns the network. Only administrative'
' users can specify a tenant ID other than their own.')
_('The ID of the tenant who owns the network. Only administrative '
'users can specify a tenant ID other than their own.')
),
HOST_ROUTES: properties.Schema(
properties.Schema.LIST,
@ -218,8 +218,7 @@ class Subnet(neutron.NeutronResource):
),
IPV6_RA_MODE: properties.Schema(
properties.Schema.STRING,
_('IPv6 RA (Router Advertisement) mode.'
' dhcpv6-stateful, dhcpv6-stateless, or slaac.'),
_('IPv6 RA (Router Advertisement) mode.'),
constraints=[
constraints.AllowedValues([DHCPV6_STATEFUL, DHCPV6_STATELESS,
SLAAC]),
@ -228,8 +227,7 @@ class Subnet(neutron.NeutronResource):
),
IPV6_ADDRESS_MODE: properties.Schema(
properties.Schema.STRING,
_('IPv6 address mode.'
' dhcpv6-stateful, dhcpv6-stateless, or slaac.'),
_('IPv6 address mode.'),
constraints=[
constraints.AllowedValues([DHCPV6_STATEFUL, DHCPV6_STATELESS,
SLAAC]),

2
heat/engine/resources/openstack/neutron/subnetpool.py
View File

@ -114,7 +114,7 @@ class SubnetPool(neutron.NeutronResource):
),
SHARED: properties.Schema(
properties.Schema.BOOLEAN,
_('Whether the subnet pool will be shared across all tenants.'
_('Whether the subnet pool will be shared across all tenants. '
'Note that the default policy setting restricts usage of this '
'attribute to administrative users only.'),
default=False,

2
heat/engine/resources/openstack/nova/flavor.py
View File

@ -93,7 +93,7 @@ class NovaFlavor(resource.Resource):
),
IS_PUBLIC: properties.Schema(
properties.Schema.BOOLEAN,
_('Scope of flavor accessibility. Public or private.'
_('Scope of flavor accessibility. Public or private. '
'Default value is True, means public, shared '
'across all projects.'),
default=True,

4
heat/engine/resources/openstack/nova/server.py
View File

@ -232,8 +232,8 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
),
BLOCK_DEVICE_MAPPING_DEVICE_TYPE: properties.Schema(
properties.Schema.STRING,
_('Device type: at the moment we can make distinction'
' only between disk and cdrom.'),
_('Device type: at the moment we can make distinction '
'only between disk and cdrom.'),
constraints=[
constraints.AllowedValues(['cdrom', 'disk']),
],

2
tools/custom_guidelines.py
View File

@ -25,7 +25,7 @@ from heat.engine import support
class HeatCustomGuidelines(object):
_RULES = ['resource_descriptions']
_RULES = ['resource_descriptions', 'trailing_spaces']
def __init__(self, exclude):
self.error_count = 0