Call sonic-kdump-config --remote after setting ssh_path and ssh_string (#319) (#332)

sonic-kdump-config --remote command comments/uncomments the ssh_path and
ssh_string based on the boolean in CONFIG_DB KDUMp table. This should be
called after setting both ssh_string and ssh_path.

Author: arista-hpandya

scripts/hostcfgd

@@ -1254,19 +1254,20 @@ class KdumpCfg(object):
                 num_dumps = data.get("num_dumps")
             run_cmd(["sonic-kdump-config", "--num_dumps", num_dumps])
 
-            # Remote option
-            remote = self.kdump_defaults["remote"]
-            if data.get("remote") is not None:
-                remote = data.get("remote")
-            run_cmd(["sonic-kdump-config", "--remote", remote])
-
+            # ssh_string
             ssh_string = self.kdump_defaults["ssh_string"]
             if data.get("ssh_string") is not None:
-                    run_cmd(["sonic-kdump-config", "--ssh_string", ssh_string])
+                ssh_string = data.get("ssh_string")
+            run_cmd(["sonic-kdump-config", "--ssh_string", ssh_string])
+
             # ssh_path
-            ssh_path= self.kdump_defaults["ssh_path"]
+            ssh_path = self.kdump_defaults["ssh_path"]
             if data.get("ssh_path") is not None:
-                    run_cmd(["sonic-kdump-config", "--ssh_path", ssh_path])
+                ssh_path = data.get("ssh_path")
+            run_cmd(["sonic-kdump-config", "--ssh_path", ssh_path])
+
+            # Remote option
+            run_cmd(["sonic-kdump-config", "--remote"])
 
 class NtpCfg(object):
     """

tests/hostcfgd/hostcfgd_test.py

@@ -214,7 +214,7 @@ def test_kdump_event(self):
                 call(['sonic-kdump-config', '--disable']),
                 call(['sonic-kdump-config', '--num_dumps', '3']),
                 call(['sonic-kdump-config', '--memory', '0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-16G:448M,16G-32G:768M,32G-:1G']),
-                call(['sonic-kdump-config', '--remote', 'false']),  # Covering remote
+                call(['sonic-kdump-config', '--remote']),  # Covering remote
                 call(['sonic-kdump-config', '--ssh_string', 'user@localhost']),  # Covering ssh_string
                 call(['sonic-kdump-config', '--ssh_path', '/a/b/c'])  # Covering ssh_path
             ]
@@ -235,7 +235,7 @@ def test_kdump_load(self):
                 call(['sonic-kdump-config', '--enable']),
                 call(['sonic-kdump-config', '--num_dumps', '3']),
                 call(['sonic-kdump-config', '--memory', '0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-16G:448M,16G-32G:768M,32G-:1G']),
-                call(['sonic-kdump-config', '--remote', 'false']),  # Covering remote
+                call(['sonic-kdump-config', '--remote']),  # Covering remote
                 call(['sonic-kdump-config', '--ssh_string', 'user@localhost']),  # Covering ssh_string
                 call(['sonic-kdump-config', '--ssh_path', '/a/b/c'])  # Covering ssh_path
             ]
@@ -263,7 +263,7 @@ def test_kdump_event_with_proc_cmdline(self):
                 call(['sonic-kdump-config', '--enable']),
                 call(['sonic-kdump-config', '--num_dumps', '3']),
                 call(['sonic-kdump-config', '--memory', '8G-:1G']),
-                call(['sonic-kdump-config', '--remote', 'false']),  # Covering remote
+                call(['sonic-kdump-config', '--remote']),  # Covering remote
                 call(['sonic-kdump-config', '--ssh_string', 'user@localhost']),  # Covering ssh_string
                 call(['sonic-kdump-config', '--ssh_path', '/a/b/c'])  # Covering ssh_path
             ]