Merge "Removed extra spaces from double line strings"

nova/compute/api.py

@@ -2623,7 +2623,7 @@ class API(base.Base):
         current_instance_type_name = current_instance_type['name']
         new_instance_type_name = new_instance_type['name']
         LOG.debug("Old instance type %(current_instance_type_name)s, "
-                  " new instance type %(new_instance_type_name)s",
+                  "new instance type %(new_instance_type_name)s",
                   {'current_instance_type_name': current_instance_type_name,
                    'new_instance_type_name': new_instance_type_name},
                   instance=instance)

nova/tests/unit/test_wsgi.py

@@ -127,9 +127,9 @@ class TestWSGIServer(test.NoDBTestCase):
         server.stop()
         server.wait()
 
-    @testtools.skipIf(not utils.is_linux(), 'SO_REUSEADDR behaves differently'
-                                            ' on OSX and BSD, see bugs '
-                                            ' 1436895 and 1467145')
+    @testtools.skipIf(not utils.is_linux(), 'SO_REUSEADDR behaves differently '
+                                            'on OSX and BSD, see bugs '
+                                            '1436895 and 1467145')
     def test_socket_options_for_simple_server(self):
         # test normal socket options has set properly
         self.flags(tcp_keepidle=500)
@@ -291,9 +291,9 @@ class TestWSGIServerWithSSL(test.NoDBTestCase):
         fake_ssl_server.stop()
         fake_ssl_server.wait()
 
-    @testtools.skipIf(not utils.is_linux(), 'SO_REUSEADDR behaves differently'
-                                            ' on OSX and BSD, see bugs '
-                                            ' 1436895 and 1467145')
+    @testtools.skipIf(not utils.is_linux(), 'SO_REUSEADDR behaves differently '
+                                            'on OSX and BSD, see bugs '
+                                            '1436895 and 1467145')
     def test_socket_options_for_ssl_server(self):
         # test normal socket options has set properly
         self.flags(tcp_keepidle=500)

nova/virt/hyperv/vmops.py

@@ -351,7 +351,7 @@ class VMOps(object):
             'hw_machine_type', default_vm_gen)
         if image_prop_vm not in self._hostutils.get_supported_vm_types():
             LOG.error(_LE('Requested VM Generation %s is not supported on '
-                         ' this OS.'), image_prop_vm)
+                          'this OS.'), image_prop_vm)
             raise vmutils.HyperVException(
                 _('Requested VM Generation %s is not supported on this '
                   'OS.') % image_prop_vm)

nova/virt/libvirt/driver.py

@@ -5600,7 +5600,7 @@ class LibvirtDriver(driver.ComputeDriver):
                 (CONF.spice.enabled and not dest_local_spice)):
 
                 LOG.warn(_LW('Your libvirt version does not support the'
-                             ' VIR_DOMAIN_XML_MIGRATABLE flag, and the '
+                             ' VIR_DOMAIN_XML_MIGRATABLE flag, and the'
                              ' graphics (VNC and/or SPICE) listen'
                              ' addresses on the destination node do not'
                              ' match the addresses on the source node.'

nova/virt/vmwareapi/vmops.py

@@ -1689,7 +1689,7 @@ class VMwareVMOps(object):
                                        attach_config_spec)
             except Exception as e:
                 LOG.error(_LE('Attaching network adapter failed. Exception: '
-                              ' %s'),
+                              '%s'),
                           e, instance=instance)
                 raise exception.InterfaceAttachFailed(
                         instance_uuid=instance.uuid)