From 45918cb898aeb8cfcdc4b9237e909860c3309a8d Mon Sep 17 00:00:00 2001
From: Canux CHENG <WCheng@SonicWall.com>
Date: Sat, 2 Nov 2019 10:00:59 +0000
Subject: [PATCH] release 1.8.4

---
 docs/virtualization.rst                        |  4 ++--
 super_devops/__init__.py                       |  2 +-
 super_devops/virtualization/libvirt_wrapper.py | 15 ++++++++++++++-
 super_devops/virtualization/vbox_wrapper.py    | 10 +++++-----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docs/virtualization.rst b/docs/virtualization.rst
index 00b4d70..750ae5f 100644
--- a/docs/virtualization.rst
+++ b/docs/virtualization.rst
@@ -41,10 +41,10 @@ class virConnect::
     // network
     listAllNetworks(self, flags=0)
     listDefinedNetworks(self)
-    listNetworks(self)
+    listNetworks(self) // inactive not show up.
     networkCreateXML(self, xmlDesc) # temporary
     networkDefineXML(self, xml) # persistent
-    networkLookupByName(self, name)
+    networkLookupByName(self, name) // not exist will raise exception.
 
     // interface
     listAllInterfaces(self, flags=0)
diff --git a/super_devops/__init__.py b/super_devops/__init__.py
index ff93d67..23366d3 100644
--- a/super_devops/__init__.py
+++ b/super_devops/__init__.py
@@ -15,5 +15,5 @@
 DESCRIPTION:
 """
 
-__version__ = "1.8.3"
+__version__ = "1.8.4"
 __author__ = "Canux CHENG"
diff --git a/super_devops/virtualization/libvirt_wrapper.py b/super_devops/virtualization/libvirt_wrapper.py
index 734f5e8..b51a218 100644
--- a/super_devops/virtualization/libvirt_wrapper.py
+++ b/super_devops/virtualization/libvirt_wrapper.py
@@ -26,9 +26,22 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.connection.close()
 
+    def list_all_networks(self):
+        try:
+            networks = self.connection.listAllNetworks()
+            names = [
+                net.name()
+                for net in networks
+            ]
+        except Exception as e:
+            logger.error("List all networks failed.")
+        else:
+            logger.debug("all networks: {}".format(names))
+            return names
+
     def network_exist(self, name):
         try:
-            if name in self.connection.listNetworks():
+            if name in self.list_all_networks():
                 logger.debug("network {} exist.".format(name))
                 return True
             else:
diff --git a/super_devops/virtualization/vbox_wrapper.py b/super_devops/virtualization/vbox_wrapper.py
index 9d4ef5a..b6e7022 100644
--- a/super_devops/virtualization/vbox_wrapper.py
+++ b/super_devops/virtualization/vbox_wrapper.py
@@ -134,18 +134,18 @@ def attach_storage(self, vm):
             rc = process.returncode
         except Exception as e:
             logger.error(
-                "attach storage for vm {} error: {}.".format(name, e.args)
+                "attach storage for vm {} error: {}.".format(vm, e.args)
             )
             raise
         else:
             if rc:
                 logger.error(
                     "attach storage for vm {} failed with exit_code: {}".format(
-                        name, rc)
+                        vm, rc)
                 )
                 return False
             else:
-                logger.info("attach storage for vm {} succeed.".format(name))
+                logger.info("attach storage for vm {} succeed.".format(vm))
                 return True
 
     def list_vm(self, running=False):
@@ -615,8 +615,8 @@ def linux_shell(self, vm, username, password, shell):
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE
             )
             output, error = process.communicate()
-            output = output.decode("utf-8")
-            error = error.decode("utf-8")
+            # output = output.decode("utf-8")
+            # error = error.decode("utf-8")
             logger.debug("output: {}".format(output))
             logger.debug("error: {}".format(error))
             rc = process.returncode