Browse Source

Merge "Add missing message parameter to LOG.exception call"

Jenkins 2 years ago
parent
commit
e896751c3c

+ 1
- 1
fuel_health/ceilometermanager.py View File

@@ -473,7 +473,7 @@ class CeilometerBaseTest(fuel_health.nmanager.PlatformServicesBaseClass):
473 473
             try:
474 474
                 method(resource)
475 475
             except Exception:
476
-                LOG.exception()
476
+                LOG.exception("")
477 477
 
478 478
     @classmethod
479 479
     def tearDownClass(cls):

+ 3
- 3
fuel_health/cleanup.py View File

@@ -190,7 +190,7 @@ def cleanup(cluster_deployment_info):
190 190
                     LOG.info('Delete server with name {0}'.format(s.name))
191 191
                     manager._get_compute_client().servers.delete(s.id)
192 192
                 except Exception:
193
-                    LOG.exception()
193
+                    LOG.exception("")
194 194
     else:
195 195
         LOG.info('No servers found')
196 196
 
@@ -232,12 +232,12 @@ def _delete_it(client, log_message, name='ost1_test-', delete_type='name'):
232 232
                         else:
233 233
                             client.delete(item.id)
234 234
                     except Exception:
235
-                        LOG.exception()
235
+                        LOG.exception("")
236 236
             except AttributeError:
237 237
                 if item.display_name.startswith(name):
238 238
                     client.delete(item)
239 239
     except Exception:
240
-        LOG.exception()
240
+        LOG.exception("")
241 241
 
242 242
 
243 243
 if __name__ == "__main__":

+ 1
- 1
fuel_health/common/ssh.py View File

@@ -169,7 +169,7 @@ class Client(object):
169 169
             connection = self._get_ssh_connection()
170 170
             connection.close()
171 171
         except paramiko.AuthenticationException:
172
-            LOG.exception()
172
+            LOG.exception("")
173 173
             return False
174 174
 
175 175
         return True

+ 15
- 15
fuel_health/nmanager.py View File

@@ -29,42 +29,42 @@ LOG = logging.getLogger(__name__)
29 29
 try:
30 30
     import heatclient.v1.client
31 31
 except Exception:
32
-    LOG.exception()
32
+    LOG.exception("")
33 33
     LOG.warning('Heatclient could not be imported.')
34 34
 try:
35 35
     import muranoclient.v1.client
36 36
 except Exception:
37
-    LOG.exception()
37
+    LOG.exception("")
38 38
     LOG.warning('Muranoclient could not be imported.')
39 39
 try:
40 40
     import saharaclient.client
41 41
 except Exception:
42
-    LOG.exception()
42
+    LOG.exception("")
43 43
     LOG.warning('Sahara client could not be imported.')
44 44
 try:
45 45
     import ceilometerclient.v2.client
46 46
 except Exception:
47
-    LOG.exception()
47
+    LOG.exception("")
48 48
     LOG.warning('Ceilometer client could not be imported.')
49 49
 try:
50 50
     import neutronclient.neutron.client
51 51
 except Exception:
52
-    LOG.exception()
52
+    LOG.exception("")
53 53
     LOG.warning('Neutron client could not be imported.')
54 54
 try:
55 55
     import glanceclient
56 56
 except Exception:
57
-    LOG.exception()
57
+    LOG.exception("")
58 58
     LOG.warning('Glance client could not be imported')
59 59
 try:
60 60
     import ironicclient
61 61
 except Exception:
62
-    LOG.exception()
62
+    LOG.exception("")
63 63
     LOG.warning('Ironic client could not be imported')
64 64
 try:
65 65
     import muranoclient.glance.client as art_client
66 66
 except Exception:
67
-    LOG.exception()
67
+    LOG.exception("")
68 68
     LOG.warning('Artifacts client could not be imported')
69 69
 
70 70
 import aodhclient.client
@@ -511,7 +511,7 @@ class OfficialClientTest(fuel_health.test.TestCase):
511 511
                       .format(image=self.manager.config.compute.image_name)
512 512
                       )
513 513
         except nova_exc.ClientException:
514
-            LOG.exception()
514
+            LOG.exception("")
515 515
             self.fail("Image can not be retrieved. "
516 516
                       "Please refer to OpenStack logs for more details")
517 517
 
@@ -614,7 +614,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
614 614
                                      timeout=self.timeout)
615 615
             return sshclient.exec_longrun_command(cmd)
616 616
         except Exception:
617
-            LOG.exception()
617
+            LOG.exception("")
618 618
             self.fail("%s command failed." % cmd)
619 619
 
620 620
     def _create_keypair(self, client, namestart='ost1_test-keypair-smoke-'):
@@ -665,7 +665,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
665 665
             try:
666 666
                 client.security_group_rules.create(secgroup.id, **ruleset)
667 667
             except Exception:
668
-                LOG.exception()
668
+                LOG.exception("")
669 669
                 self.fail("Failed to create rule in security group.")
670 670
 
671 671
         return secgroup
@@ -803,7 +803,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
803 803
         try:
804 804
             client.servers.add_floating_ip(server, floating_ip)
805 805
         except Exception:
806
-            LOG.exception()
806
+            LOG.exception("")
807 807
             self.fail('Can not assign floating ip to instance')
808 808
 
809 809
     @classmethod
@@ -829,7 +829,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
829 829
                                        key_filename=self.key,
830 830
                                        timeout=timeout)
831 831
                 except Exception:
832
-                    LOG.exception()
832
+                    LOG.exception("")
833 833
 
834 834
                 return self.retry_command(retries=retries[0],
835 835
                                           timeout=retries[1],
@@ -860,7 +860,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
860 860
                                    timeout=timeout)
861 861
 
862 862
             except Exception:
863
-                LOG.exception()
863
+                LOG.exception("")
864 864
 
865 865
             command = "ping -q -c1 -w10 8.8.8.8"
866 866
 
@@ -891,7 +891,7 @@ class NovaNetworkScenarioTest(OfficialClientTest):
891 891
                 LOG.debug('Host is {0}'.format(host))
892 892
 
893 893
             except Exception:
894
-                LOG.exception()
894
+                LOG.exception("")
895 895
 
896 896
             return self.retry_command(retries[0], retries[1],
897 897
                                       ssh.exec_command_on_vm,

+ 1
- 1
fuel_health/tests/sanity/test_sanity_infrastructure.py View File

@@ -82,7 +82,7 @@ class SanityInfrastructureTest(nmanager.SanityChecksTest):
82 82
                 'Step 2 failed: Some nova services have not been started.')
83 83
         except Exception:
84 84
             LOG.info("Will sleep for 120 seconds and try again")
85
-            LOG.exception()
85
+            LOG.exception("")
86 86
             time.sleep(120)
87 87
             # Re-collect data silently
88 88
             output = get_controllers_down_states()

+ 1
- 1
fuel_health/tests/smoke/test_user_create.py View File

@@ -128,6 +128,6 @@ class TestUserTenantRole(nmanager.SmokeChecksTest):
128 128
                         "logs for more details.",
129 129
                     failed_step=9)
130 130
         except Exception:
131
-            LOG.exception()
131
+            LOG.exception("")
132 132
             self.fail("Step 10 failed: Can not authenticate in Horizon. "
133 133
                       "Please refer to OpenStack logs for more details.")

+ 2
- 2
fuel_health/tests/smoke/test_vcenter.py View File

@@ -227,7 +227,7 @@ class TestVcenter(nmanager.NovaNetworkScenarioTest):
227 227
                 if addr.startswith('novanetwork'):
228 228
                     instance_ip = server.addresses[addr][0]['addr']
229 229
         except Exception:
230
-            LOG.exception()
230
+            LOG.exception("")
231 231
             self.fail("Step 3 failed: cannot get instance details. "
232 232
                       "Please refer to OpenStack logs for more details.")
233 233
 
@@ -285,7 +285,7 @@ class TestVcenterImageAction(nmanager.SmokeChecksTest):
285 285
                     if e.__class__.__name__ == 'NotFound':
286 286
                         return True
287 287
                     self.error_msg.append(e)
288
-                    LOG.exception()
288
+                    LOG.exception("")
289 289
                 return False
290 290
 
291 291
         # Block until resource deletion has completed or timed-out

Loading…
Cancel
Save