AMBARI-14757 host check doesn't show warning about working firewall on the host (Suse only) (dsen)

ambari-common/src/main/python/ambari_commons/firewall.py

@@ -129,7 +129,7 @@ class Fedora18FirewallChecks(FirewallChecks):
 class SuseFirewallChecks(FirewallChecks):
   def __init__(self):
     super(SuseFirewallChecks, self).__init__()
-    self.FIREWALL_SERVICE_NAME = "SuSEfirewall2"
+    self.FIREWALL_SERVICE_NAME = "rcSuSEfirewall2"
 
   def get_command(self):
     return "%s %s" % (self.FIREWALL_SERVICE_NAME, self.SERVICE_SUBCMD)
@@ -137,9 +137,9 @@ class SuseFirewallChecks(FirewallChecks):
   def check_result(self):
     result = False
     if self.returncode == 0:
-      if "SuSEfirewall2 not active" in self.stdoutdata:
+      if "unused" in self.stdoutdata:
         result = False
-      elif "### iptables" in self.stdoutdata:
+      elif "running" in self.stdoutdata:
         result = True
     return result
 

ambari-server/src/test/python/TestAmbariServer.py

@@ -1880,11 +1880,11 @@ class TestAmbariServer(TestCase):
     get_os_family_mock.return_value = OSConst.SUSE_FAMILY
 
     firewall_obj = Firewall().getFirewallObject()
-    p.communicate.return_value = ("### iptables", "err")
+    p.communicate.return_value = ("running", "err")
     p.returncode = 0
     self.assertEqual("SuseFirewallChecks", firewall_obj.__class__.__name__)
     self.assertTrue(firewall_obj.check_firewall())
-    p.communicate.return_value = ("SuSEfirewall2 not active", "err")
+    p.communicate.return_value = ("unused", "err")
     p.returncode = 0
     self.assertFalse(firewall_obj.check_firewall())
     self.assertEqual("err", firewall_obj.stderrdata)