script fixes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

python/lib/cloudutils/networkConfig.py

@@ -87,7 +87,7 @@ def isBridgeSupported():
         if os.path.exists("/proc/sys/net/bridge"):
             return True
 
-        return bash("modprobe -b bridge").isSucess()
+        return bash("modprobe -b bridge").isSuccess()
 
     @staticmethod
     def isNetworkDev(devName):

python/lib/cloudutils/serviceConfig.py

@@ -27,9 +27,11 @@
 Unknown = 0
 CentOS6 = 1
 CentOS7 = 2
-Ubuntu = 3
-RHEL6 = 4
-RHEL7 = 5
+CentOS8 = 3
+Ubuntu = 4
+RHEL6 = 5
+RHEL7 = 6
+RHEL8 = 7
 distro = None
 
 #=================== DISTRIBUTION DETECTION =================
@@ -39,12 +41,16 @@
       distro = CentOS6
     elif version.find("CentOS Linux release 7") != -1:
       distro = CentOS7
+    elif version.find("CentOS Linux release 8") != -1:
+      distro = CentOS8
 elif os.path.exists("/etc/redhat-release"):
     version = open("/etc/redhat-release").readline()
     if version.find("Red Hat Enterprise Linux Server release 6") != -1:
       distro = RHEL6
     elif version.find("Red Hat Enterprise Linux Server 7") != -1:
       distro = RHEL7
+    elif version.find("Red Hat Enterprise Linux Server 8") != -1:
+      distro = RHEL8
 elif os.path.exists("/etc/lsb-release") and "Ubuntu" in open("/etc/lsb-release").read(-1): distro = Ubuntu
 else: distro = Unknown
 #=================== DISTRIBUTION DETECTION =================
@@ -343,7 +349,7 @@ def config(self):
             cfo.addEntry("NOZEROCONF", "yes")
             cfo.save()
 
-            if not bash("service network restart").isSuccess():
+            if not bash("systemctl restart NetworkManager.service").isSuccess():
                 raise CloudInternalException("Can't restart network")
 
             self.syscfg.env.nics.append(self.brName)

python/lib/cloudutils/syscfg.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from .utilities import Distribution, serviceOpsRedhat,serviceOpsUbuntu,serviceOpsRedhat7
+from .utilities import Distribution, serviceOpsRedhat,serviceOpsUbuntu,serviceOpsRedhat7,serviceOpsRedhat8
 from .serviceConfig import *
 class sysConfigFactory:
     @staticmethod
@@ -43,6 +43,8 @@ def getAgent(glbEnv):
             return sysConfigRedhat5(glbEnv)
         elif distribution == "RHEL7":
             return sysConfigRedhat7(glbEnv)
+        elif distribution == "RHEL8":
+            return sysConfigRedhat8(glbEnv)
         else:
             print("Can't find the distribution version")
             return sysConfig()
@@ -147,6 +149,11 @@ def __init__(self, env):
         self.svo = serviceOpsRedhat7()
         super(sysConfigAgentRedhat7Base, self).__init__(env)
 
+class sysConfigAgentRedhat8Base(sysConfigAgent):
+    def __init__(self, env):
+        self.svo = serviceOpsRedhat8()
+        super(sysConfigAgentRedhat8Base, self).__init__(env)
+
 class sysConfigAgentUbuntu(sysConfigAgent):
     def __init__(self, glbEnv):
         super(sysConfigAgentUbuntu, self).__init__(glbEnv)
@@ -193,6 +200,17 @@ def __init__(self, glbEnv):
                          nfsConfig(self),
                          cloudAgentConfig(self)]
 
+#it covers RHEL8
+class sysConfigRedhat8(sysConfigAgentRedhat8Base):
+    def __init__(self, glbEnv):
+        super(sysConfigRedhat8, self).__init__(glbEnv)
+        self.services = [securityPolicyConfigRedhat(self),
+                         networkConfigRedhat(self),
+                         libvirtConfigRedhat(self),
+                         firewallConfigAgent(self),
+                         nfsConfig(self),
+                         cloudAgentConfig(self)]
+
 class sysConfigServer(sysConfig):
     def check(self):
         if os.geteuid() != 0:

python/lib/cloudutils/test.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+from .utilities import bash
+import logging
+
+cmd = bash("route -n|awk \'/^0.0.0.0/ {print $2,$8}\'")
+if not cmd.isSuccess():
+    logging.debug("Failed to get default route")
+    raise CloudRuntimeException("Failed to get default route")
+
+result = cmd.getStdout().split(" ")

python/lib/cloudutils/utilities.py

@@ -60,13 +60,13 @@ def isSuccess(self):
         return self.success
 
     def getStdout(self):
-        return self.stdout.strip("\n")
+        return self.stdout.decode('utf-8').strip('\n')
 
     def getLines(self):
-        return self.stdout.split("\n")
+        return self.stdout.decode('utf-8').strip('\n')
 
     def getStderr(self):
-        return self.stderr.strip("\n")
+        return self.stderr.decode('utf-8').strip('\n')
 
     def getErrMsg(self):
         if self.isSuccess():
@@ -114,6 +114,8 @@ def __init__(self):
                 self.distro = "RHEL6"
             elif version.find("Red Hat Enterprise Linux Server release 7") != -1 or version.find("Scientific Linux release 7") != -1 or version.find("CentOS Linux release 7") != -1 or version.find("CentOS release 7.") != -1:
                 self.distro = "RHEL7"
+            elif version.find("Red Hat Enterprise Linux Server release 8") != -1 or version.find("Scientific Linux release 8") != -1 or version.find("CentOS Linux release 8") != -1 or version.find("CentOS release 8.") != -1:
+                self.distro = "RHEL8"
             elif version.find("CentOS") != -1:
                 self.distro = "CentOS"
             else:
@@ -222,6 +224,15 @@ def isServiceRunning(self, servicename):
         except:
             return False
 
+class serviceOpsRedhat8(serviceOps):
+    def isServiceRunning(self, servicename):
+        try:
+            o = bash("systemctl is-active " + servicename)
+            textout = o.getStdout()
+            return "inactive" not in textout and "failed" not in textout
+        except:
+            return False
+
     def stopService(self, servicename,force=False):
         if self.isServiceRunning(servicename) or force:
             return bash("systemctl stop " + servicename).isSuccess()