Fix Bug 2172

Fixing FileNotFoundError during unloading VIM and
Changing log level while getting installed RO version

Change-Id: I6511072efd47ce9c96c3534a7328e1f5df6e5eb1
Signed-off-by: Gulsum Atici <gulsum.atici@canonical.com>

diff --git a/NG-RO/osm_ng_ro/__init__.py b/NG-RO/osm_ng_ro/__init__.py
index 561c0f6..cce1038 100644 (file)
--- a/NG-RO/osm_ng_ro/__init__.py
+++ b/NG-RO/osm_ng_ro/__init__.py
@@ -16,13 +16,13 @@
 ##
 import logging
 
+from pkg_resources import get_distribution
+
 version = "8.0.1.post0"
 version_date = "2020-06-29"
 
 # Obtain installed package version. Ignore if error, e.g. pkg_resources not installed
 try:
-    from pkg_resources import get_distribution
-
     version = get_distribution("osm_ng_ro").version
 except Exception as error:
-    logging.exception(f"{error} occured while getting the ro version")
+    logging.warning(f"{error} occured while getting the ro version")

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index 7194446..ed971dc 100644 (file)
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -30,7 +30,6 @@ import logging
 from os import makedirs
 from os import path
 import queue
-from shutil import rmtree
 import threading
 import time
 import traceback
@@ -749,8 +748,10 @@ class VimInteractionFlavor(VimInteractionBase):
                 try:
                     flavor_data = task["find_params"]["flavor_data"]
                     vim_flavor_id = target_vim.get_flavor_id_from_data(flavor_data)
-                except vimconn.VimConnNotFoundException:
-                    self.logger.warning("VimConnNotFoundException occured.")
+                except vimconn.VimConnNotFoundException as flavor_not_found_msg:
+                    self.logger.warning(
+                        f"VimConnNotFoundException occured: {flavor_not_found_msg}"
+                    )
 
             if not vim_flavor_id and task.get("params"):
                 # CREATE
@@ -1658,10 +1659,6 @@ class NsWorker(threading.Thread):
                 self.vim_targets.remove(target_id)
 
             self.logger.info("Unloaded {}".format(target_id))
-            rmtree("{}:{}".format(target_id, self.worker_index))
-        except FileNotFoundError:
-            # This is raised by rmtree if folder does not exist.
-            self.logger.exception("FileNotFoundError occured while unloading VIM.")
         except Exception as e:
             self.logger.error("Cannot unload {}: {}".format(target_id, e))
 

diff --git a/releasenotes/notes/change_log_level-d841584449c863fa.yaml b/releasenotes/notes/change_log_level-d841584449c863fa.yaml
new file mode 100644 (file)
index 0000000..ce22c0e
--- /dev/null
+++ b/releasenotes/notes/change_log_level-d841584449c863fa.yaml
@@ -0,0 +1,22 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
+---
+other:
+  - |
+    Fixing Bug 2172 Fixing FileNotFoundError during unloading VIM. Changing log level from exception to warning in NG-RO __init__ file
+    as if the osm_ng_ro is not installed it throws exception. So, changing the log level to warning as this always happens while running
+    the tests.