vr: fix vr in unknown state (more) (#3848)

This fixes similar issue with #3465.

Meanwhile change log level of CsHelper.execute2 from DEBUG to INFO and fix some typo.

Author: ustcweizhou

systemvm/debian/opt/cloud/bin/cs/CsHelper.py

@@ -29,8 +29,8 @@
 
 PUBLIC_INTERFACES = {"router": "eth2", "vpcrouter": "eth1"}
 
-STATE_COMMANDS = {"router": "ip addr | grep eth0 | grep inet | wc -l | xargs bash -c  'if [ $0 == 2 ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'",
-                  "vpcrouter": "ip addr | grep eth1 | grep state | awk '{print $9;}' | xargs bash -c 'if [ $0 == \"UP\" ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'"}
+STATE_COMMANDS = {"router": "ip addr show dev eth0 | grep inet | wc -l | xargs bash -c  'if [ $0 == 2 ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'",
+                  "vpcrouter": "ip addr show dev eth1 | grep state | awk '{print $9;}' | xargs bash -c 'if [ $0 == \"UP\" ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'"}
 
 
 def reconfigure_interfaces(router_config, interfaces):
@@ -215,7 +215,7 @@ def save_iptables(command, iptables_file):
 
 def execute2(command, wait=True):
     """ Execute command """
-    logging.debug("Executing: %s" % command)
+    logging.info("Executing: %s" % command)
     p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     if wait:
         p.wait()

systemvm/debian/opt/cloud/bin/cs/CsRedundant.py

@@ -102,7 +102,7 @@ def _redundant_on(self):
                 command = "ip link show %s | grep 'state UP'" % dev
                 devUp = CsHelper.execute(command)
                 if devUp:
-                    logging.info("Device %s is present, let's start keepalive now." % dev)
+                    logging.info("Device %s is present, let's start keepalived now." % dev)
                     isDeviceReady = True
 
         if not isDeviceReady:
@@ -231,7 +231,7 @@ def set_fault(self):
             return
 
         self.set_lock()
-        logging.info("Router switched to fault mode")
+        logging.info("Setting router to fault")
 
         interfaces = [interface for interface in self.address.get_interfaces() if interface.is_public()]
         for interface in interfaces: