From: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Date: Thu, 7 Jun 2018 08:35:48 +0000 (+0200)
Subject: Add own logger for SdnvpnFuncTest class
X-Git-Tag: opnfv-7.0.0~36^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6491326ffadcc143a64723169038cad58620f117;p=sdnvpn.git

Add own logger for SdnvpnFuncTest class

The functest xtesting Testcase class removed the logger instance
variable, so let SdnvpnFuncTest use its own logger.

JIRA: SDNVPN-215

Change-Id: I8b611273e44204d5051fad1140e6ecaddc2a4334
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
---

diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py
index 8e55b2d..e4d55f1 100644
--- a/sdnvpn/test/functest/run_sdnvpn_tests.py
+++ b/sdnvpn/test/functest/run_sdnvpn_tests.py
@@ -21,6 +21,7 @@ from sdnvpn.lib import openstack_utils as os_utils
 from sdnvpn.lib.gather_logs import gather_logs
 from sdnvpn.lib import utils as test_utils
 
+logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
 
@@ -42,8 +43,8 @@ class SdnvpnFunctest(feature.Feature):
             neutron_quota['port'], neutron_quota['router'])
         instances_quota = test_utils.get_nova_instances_quota(nova_client)
 
-        self.logger.info("Setting net/subnet/port/router "
-                         "quota to unlimited")
+        logger.info("Setting net/subnet/port/router "
+                    "quota to unlimited")
         test_utils.update_nw_subnet_port_quota(
             neutron_client,
             tenant_id,
@@ -55,13 +56,14 @@ class SdnvpnFunctest(feature.Feature):
 
         # Workaround for
         # https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-115
-        self.logger.info("Setting instances quota class to unlimited")
+        logger.info("Setting instances quota class to unlimited")
         test_utils.update_instance_quota_class(
             nova_client,
             COMMON_CONFIG.nova_instances_quota_class)
 
         # Clean up the stale floating ip's so that required
         # ip addresses are available for sdnvpn testcases
+        logger.info("Cleaning up the Floating IP Addresses")
         floating_ips = os_utils.get_floating_ips(neutron_client)
         if floating_ips is not None:
             for floating_ip in floating_ips:
@@ -79,37 +81,37 @@ class SdnvpnFunctest(feature.Feature):
                 test_descr = testcases[tc]['description']
                 title = ("Running '%s - %s'" %
                          (test_name, test_descr))
-                self.logger.info(title)
-                self.logger.info("%s\n" % ("=" * len(title)))
+                logger.info(title)
+                logger.info("%s\n" % ("=" * len(title)))
                 try:
-                    self.logger.info("Importing the testcase %s" % test_name)
+                    logger.info("Importing the testcase %s" % test_name)
                     t = importlib.import_module(test_name, package=None)
-                    self.logger.info("Calling the testcase %s main method"
-                                     % test_name)
+                    logger.info("Calling the testcase %s main method"
+                                % test_name)
                     result = t.main()
-                    self.logger.info("Execution is complete for the"
-                                     " testcase %s" % test_name)
+                    logger.info("Execution is complete for the"
+                                " testcase %s" % test_name)
                 except Exception as ex:
                     result = -1
-                    self.logger.info("Caught Exception in %s: %s Trace: %s"
-                                     % (test_name, ex,
-                                        traceback.format_exc()))
+                    logger.info("Caught Exception in %s: %s Trace: %s"
+                                % (test_name, ex,
+                                   traceback.format_exc()))
                 if result < 0:
                     status = "FAIL"
                     overall_status = "FAIL"
-                    self.logger.info("Testcase %s failed" % test_name)
+                    logger.info("Testcase %s failed" % test_name)
                 else:
                     status = result.get("status")
                     self.details.update(
                         {test_name: {'status': status,
                                      'details': result.get("details")}})
-                    self.logger.info("Results of test case '%s - %s':\n%s\n"
-                                     % (test_name, test_descr, result))
+                    logger.info("Results of test case '%s - %s':\n%s\n"
+                                % (test_name, test_descr, result))
 
                     if status == "FAIL":
                         overall_status = "FAIL"
 
-        self.logger.info("Resetting subnet/net/port quota")
+        logger.info("Resetting subnet/net/port quota")
         test_utils.update_nw_subnet_port_quota(neutron_client,
                                                tenant_id,
                                                neutron_nw_quota,
@@ -117,7 +119,7 @@ class SdnvpnFunctest(feature.Feature):
                                                neutron_port_quota,
                                                neutron_router_quota)
 
-        self.logger.info("Resetting instances quota class")
+        logger.info("Resetting instances quota class")
         test_utils.update_instance_quota_class(nova_client, instances_quota)
 
         try:
@@ -125,13 +127,13 @@ class SdnvpnFunctest(feature.Feature):
             if installer_type in ["fuel", "apex"]:
                 gather_logs('overall')
             else:
-                self.logger.info("Skipping log gathering because installer"
-                                 "type %s is neither fuel nor apex" %
-                                 installer_type)
+                logger.info("Skipping log gathering because installer"
+                            "type %s is neither fuel nor apex" %
+                            installer_type)
         except Exception as ex:
-            self.logger.error(('Something went wrong in the Log gathering.'
-                               'Ex: %s, Trace: %s')
-                              % (ex, traceback.format_exc()))
+            logger.error(('Something went wrong in the Log gathering.'
+                          'Ex: %s, Trace: %s')
+                         % (ex, traceback.format_exc()))
 
         if overall_status == "PASS":
             self.result = 100