openstack/heat
Code Issues Proposed changes

Fix some spelling mistakes in heat as follows:

Browse Source 
in heat/contrib/rackspace/rackspace/tests/test_auto_scale.py:270:
       mock nova and glance client methods to satisfy contraints,   contraints should be constraints
   in heat/heat_integrationtests/functional/test_resource_group.py:51
       triggering validation of nested resource custom contraints,  contraints should be constraints
   in heat/heat/common/exception.py:258:
      """Keep this for AWS compatiblility."""    compatiblility should be compatibility
   in heat/heat/engine/resources/openstack/ceilometer/alarm.py:349:
      1) so we don't create watch tasks unneccessarly ,  unneccessarly should be unnecessarily

   in heat/heat/engine/resources/openstack/neutron/vpnservice.py:462:
     The Internet Key Exchange policy identifyies the authentication and , identifyies  should be identifies

   in heat/heat/engine/resources/openstack/nova/server.py:1426:
      if 'security_groups' present for the server and explict 'port' , explict should be explicit

   in heat/heat/engine/service.py:182:
     releasing the lock to avoid race condtitions. condtitions should be conditions

   in heat/heat/engine/sync_point.py:134:
       don't aggresively spin; induce some sleep, aggresively should be aggressively

   in heat/heat/tests/openstack/heat/test_software_deployment.py:889:
       Test bug 1332355, where details contains a translateable message, translateable should be translatable

   in heat/heat/tests/test_environment.py:596:
       make sure the parent env is uneffected, uneffected should be unaffected

   in heat/heat/engine/resources/openstack/nova/server.py:472:
      'ignorning it or by replacing the entire server.'),  ignorning should be ignoring

   in heat/contrib/rackspace/rackspace/resources/cloud_server.py:104:
     'retained for compatability.'),  compatability should be compatibility

   in heat/heat/engine/stack.py:1258:
      " ID %(trvsl_id)s, not trigerring rollback."),  trigerring should be triggering.

Change-Id: Ic4ddb65dbfaf61751a330b853780689209f9f4b5
Closes-Bug: #1595376
This commit is contained in:
gecong1973 2016-06-23 12:39:48 +08:00
parent 0864664209
commit 7c389dd2a5
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rackspace/rackspace/resources/cloud_server.py
View File

@ -101,7 +101,7 @@ class CloudServer(server.Server):
_('How the server should receive the metadata required for '
'software configuration. POLL_TEMP_URL is the only '
'supported transport on Rackspace Cloud. This property is '
'retained for compatability.'),
'retained for compatibility.'),
default=server.Server.POLL_TEMP_URL,
update_allowed=True,
constraints=[

2
contrib/rackspace/rackspace/tests/test_auto_scale.py
View File

@ -267,7 +267,7 @@ class ScalingGroupTest(common.HeatTestCase):
self.fake_auto_scale = FakeAutoScale()
self.patchobject(auto_scale.Group, 'auto_scale',
return_value=self.fake_auto_scale)
# mock nova and glance client methods to satisfy contraints
# mock nova and glance client methods to satisfy constraints
mock_im = self.patchobject(glance.GlanceClientPlugin,
'find_image_by_name_or_id')
mock_im.return_value = 'image-ref'

2
heat/common/exception.py
View File

@ -255,7 +255,7 @@ class ClientNotAvailable(HeatException):
class WatchRuleNotFound(EntityNotFound):
"""Keep this for AWS compatiblility."""
"""Keep this for AWS compatibility."""
msg_fmt = _("The Watch Rule (%(watch_name)s) could not be found.")

2
heat/engine/resources/openstack/ceilometer/alarm.py
View File

@ -346,7 +346,7 @@ class CeilometerAlarm(resource.Resource):
self.resource_id_set(alarm.alarm_id)
# the watchrule below is for backwards compatibility.
# 1) so we don't create watch tasks unneccessarly
# 1) so we don't create watch tasks unnecessarily
# 2) to support CW stats post, we will redirect the request
# to ceilometer.
wr = watchrule.WatchRule(context=self.context,

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

@ -459,7 +459,7 @@ class IPsecSiteConnection(neutron.NeutronResource):
class IKEPolicy(neutron.NeutronResource):
"""A resource for IKE policy in Neutron.
The Internet Key Exchange policy identifyies the authentication and
The Internet Key Exchange policy identifies the authentication and
encryption algorithm used during phase one and phase two negotiation of a
VPN connection.
"""

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

@ -469,7 +469,7 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
USER_DATA_UPDATE_POLICY: properties.Schema(
properties.Schema.STRING,
_('Policy on how to apply a user_data update; either by '
'ignorning it or by replacing the entire server.'),
'ignoring it or by replacing the entire server.'),
default='REPLACE',
constraints=[
constraints.AllowedValues(['REPLACE', 'IGNORE']),
@ -1423,7 +1423,7 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
if metadata is not None or personality:
limits = self.client_plugin().absolute_limits()
# if 'security_groups' present for the server and explict 'port'
# if 'security_groups' present for the server and explicit 'port'
# in one or more entries in 'networks', raise validation error
if networks_with_port and self.properties[self.SECURITY_GROUPS]:
raise exception.ResourcePropertyConflict(

2
heat/engine/service.py
View File

@ -179,7 +179,7 @@ class ThreadGroupManager(object):
"""Callback function that will be passed to GreenThread.link().
Persist the stack state to COMPLETE and FAILED close to
releasing the lock to avoid race condtitions.
releasing the lock to avoid race conditions.
"""
if stack is not None and stack.action not in (
stack.DELETE, stack.ROLLBACK, stack.UPDATE):

2
heat/engine/stack.py
View File

@ -1255,7 +1255,7 @@ class Stack(collections.Mapping):
if stack_id is None:
# Failed concurrent update
LOG.warning(_LW("Failed to store stack %(name)s with traversal"
" ID %(trvsl_id)s, not trigerring rollback."),
" ID %(trvsl_id)s, not triggering rollback."),
{'name': self.name,
'trvsl_id': self.current_traversal})
return

2
heat/engine/sync_point.py
View File

@ -131,7 +131,7 @@ def sync(cnxt, entity_id, current_traversal, is_update, propagate,
rows_updated = update_input_data(
cnxt, entity_id, current_traversal, is_update,
sync_point.atomic_key, serialize_input_data(input_data))
# don't aggresively spin; induce some sleep
# don't aggressively spin; induce some sleep
if not rows_updated:
eventlet.sleep(random.uniform(0, max_wt))

2
heat/tests/openstack/heat/test_software_deployment.py
View File

@ -886,7 +886,7 @@ class SoftwareDeploymentTest(common.HeatTestCase):
self.assertEqual(details, ca[2])
self.assertIsNotNone(ca[3])
# Test bug 1332355, where details contains a translateable message
# Test bug 1332355, where details contains a translatable message
details = {'failed': _('need more memory.')}
ret = self.deployment.handle_signal(details)
self.assertEqual('deployment failed', ret)

2
heat/tests/test_environment.py
View File

@ -593,7 +593,7 @@ class ChildEnvTest(common.HeatTestCase):
rr = cenv.user_env_as_dict()['resource_registry']
self.assertIn('OS::Food', rr)
self.assertNotIn('OS::Food', rr['resources']['abc'])
# make sure the parent env is uneffected
# make sure the parent env is unaffected
innocent2 = penv.get_resource_info('OS::Food', resource_name='abc')
self.assertEqual(['resources', 'abc', 'OS::Food'], innocent2.path)

2
heat_integrationtests/functional/test_resource_group.py
View File

@ -48,7 +48,7 @@ outputs:
def test_resource_group_zero_novalidate(self):
# Nested resources should be validated only when size > 0
# This allows features to be disabled via size=0 without
# triggering validation of nested resource custom contraints
# triggering validation of nested resource custom constraints
# e.g images etc in the nested schema.
nested_template_fail = '''
heat_template_version: 2013-05-23