diff --git a/kuryr/controllers.py b/kuryr/controllers.py old mode 100644 new mode 100755 index fa9bedd9..4cabe728 --- a/kuryr/controllers.py +++ b/kuryr/controllers.py @@ -239,7 +239,7 @@ def _create_port(endpoint_id, neutron_network_id, interface_mac, fixed_ips): try: rcvd_port = app.neutron.create_port({'port': port}) except n_exceptions.NeutronClientException as ex: - app.logger.error(_LE("Error happend during creating a" + app.logger.error(_LE("Error happened during creating a" " Neutron port: %s"), ex) raise return rcvd_port['port'] @@ -255,7 +255,7 @@ def _update_port(port, endpoint_id): 'device_owner': const.DEVICE_OWNER, 'device_id': endpoint_id}}) except n_exceptions.NeutronClientException as ex: - app.logger.error(_LE("Error happend during creating a " + app.logger.error(_LE("Error happened during creating a " "Neutron port: %s"), ex) raise return response_port['port'] @@ -1130,7 +1130,7 @@ def ipam_request_address(): allocated_address = '/'.join( [allocated_address, str(cidr.prefixlen)]) except n_exceptions.NeutronClientException as ex: - app.logger.error(_LE("Error happend during ip allocation on " + app.logger.error(_LE("Error happened during ip allocation on " "Neutron side: %s"), ex) raise else: @@ -1174,7 +1174,7 @@ def ipam_release_pool(): app.logger.info(_LI("The subnetpool with ID %s is still in use." " It can't be deleted for now."), pool_id) except n_exceptions.NeutronClientException as ex: - app.logger.error(_LE("Error happend during deleting a " + app.logger.error(_LE("Error happened during deleting a " "Neutron subnetpool: %s"), ex) raise @@ -1240,8 +1240,8 @@ def ipam_release_address(): for port in filtered_ports: app.neutron.delete_port(port['id']) except n_exceptions.NeutronClientException as ex: - app.logger.error(_LE("Error happend while fetching and deleting port, " - "%s"), ex) + app.logger.error(_LE("Error happened while fetching " + "and deleting port, %s"), ex) raise return flask.jsonify(const.SCHEMA['SUCCESS']) diff --git a/kuryr/schemata/commons.py b/kuryr/schemata/commons.py old mode 100644 new mode 100755 index 0b2ea971..33429e20 --- a/kuryr/schemata/commons.py +++ b/kuryr/schemata/commons.py @@ -119,7 +119,7 @@ COMMONS = { u'ipv4': { u'pattern': IPV4_PATTERN, u'type': u'string', - u'description': u'An IPv4 adddress', + u'description': u'An IPv4 address', u'example': u'10.0.0.1' }, u'ipv4datum': { @@ -143,7 +143,7 @@ COMMONS = { u'example': u'foo', }, u'Pool': { - u'description': u'A range of IP Addresses represted in ' + u'description': u'A range of IP Addresses requested in ' u'CIDR format address/mask.', u'$ref': u'#/definitions/commons/definitions/cidr' }, @@ -162,7 +162,7 @@ COMMONS = { u'type': u'object', u'patternProperties': { u'.+': { - u'description': u'key-vavule pair of the ID and ' + u'description': u'key-value pair of the ID and ' u'the IP address', u'$ref': u'#/definitions/commons/definitions/ipv4' } @@ -197,7 +197,7 @@ COMMONS = { u'example': u'foo', }, u'Pool': { - u'description': u'A range of IP Addresses represted in ' + u'description': u'A range of IP Addresses requested in ' u'CIDR format address/mask.', u'$ref': u'#/definitions/commons/definitions/cidrv6' }, diff --git a/kuryr/schemata/request_address.py b/kuryr/schemata/request_address.py old mode 100644 new mode 100755 index d4db1e7d..981b2deb --- a/kuryr/schemata/request_address.py +++ b/kuryr/schemata/request_address.py @@ -31,7 +31,7 @@ REQUEST_ADDRESS_SCHEMA = { u'$ref': u'#/definitions/commons/definitions/uuid' }, u'Address': { - u'description': u'Prefered address in regular IP form.', + u'description': u'Preferred address in regular IP form.', u'example': u'10.0.0.1', u'$ref': u'#/definitions/commons/definitions/ipv4_or_ipv6' }, diff --git a/tools/subunit-trace.py b/tools/subunit-trace.py index 7265df3b..e7719dc5 100755 --- a/tools/subunit-trace.py +++ b/tools/subunit-trace.py @@ -268,7 +268,7 @@ def parse_args(): 'debug information in realtime') parser.add_argument('--fails', '-f', action='store_true', dest='post_fails', help='Print failure debug ' - 'information after the stream is proccesed') + 'information after the stream is processed') parser.add_argument('--failonly', action='store_true', dest='failonly', help="Don't print success items", default=(