From fc168cc9b81fcacff432d59ed07857fefb3ba7b1 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 8 Nov 2022 14:46:00 -0500
Subject: [PATCH] Test lzma compression for genesis network boot

---
 xCAT-server/lib/xcat/plugins/mknb.pm          |  2 +-
 .../autotest/bundle/rhels_ppcle_weekly.bundle |  1 +
 .../autotest/bundle/rhels_x86_weekly.bundle   |  1 +
 xCAT-test/autotest/testcase/genesis/cases0    | 27 +++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index 435cede47..4fbd5869f 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -104,7 +104,7 @@ sub process_request {
         $callback->({ error => "Need to specify architecture (x86, x86_64 or ppc64)" }, { errorcode => [1] });
         return;
     } elsif ($arch eq "ppc64le" or $arch eq "ppc64el") {
-        $callback->({ data => "The arch:$arch is not supported at present, use \"ppc64\" instead" });
+        $callback->({ data => "The arch:$arch is not supported, using \"ppc64\" instead" });
         $arch = 'ppc64';
         $request->{arg}->[0] = $arch;
     }
diff --git a/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle
index 55a98b827..3334b784b 100644
--- a/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle
+++ b/xCAT-test/autotest/bundle/rhels_ppcle_weekly.bundle
@@ -23,6 +23,7 @@ get_xcat_postscripts_loginfo
 nodeset_cmdline
 nodeset_runimg
 nodeset_shell
+nodeset_shell_lzma
 reg_linux_diskfull_installation_flat
 compare_postscripts
 cleanup_postscripts_diskfull
diff --git a/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle b/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle
index 5cb54620a..1ea44ff43 100644
--- a/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle
+++ b/xCAT-test/autotest/bundle/rhels_x86_weekly.bundle
@@ -23,6 +23,7 @@ get_xcat_postscripts_loginfo
 nodeset_cmdline
 nodeset_runimg
 nodeset_shell
+nodeset_shell_lzma
 reg_linux_diskfull_installation_flat
 compare_postscripts
 cleanup_postscripts_diskfull
diff --git a/xCAT-test/autotest/testcase/genesis/cases0 b/xCAT-test/autotest/testcase/genesis/cases0
index ed1b4ee59..b38389827 100644
--- a/xCAT-test/autotest/testcase/genesis/cases0
+++ b/xCAT-test/autotest/testcase/genesis/cases0
@@ -1,3 +1,30 @@
+start:nodeset_shell_lzma
+os:rhels
+label:others,genesis
+description: verify could log in genesis shell lzma compression
+cmd:yum install -y https://rpmfind.net/linux/centos/8-stream/PowerTools/__GETNODEATTR($$CN,arch)__/os/Packages/xz-lzma-compat-5.2.4-3.el8.__GETNODEATTR($$CN,arch)__.rpm
+#Generate genesis network boot with lzma compression
+cmd:mknb __GETNODEATTR($$CN,arch)__
+check:rc==0
+cmd:nodeset $$CN shell
+check:rc==0
+cmd:ls -l /tftpboot/xcat/genesis.fs.*.lzma
+check:output=~genesis
+cmd:find /tftpboot -type f -name $$CN | xargs grep "lzma"
+check:output=~genesis
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
+check:rc==0
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s
+check:rc==0
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c
+check:rc==0
+cmd:cat /tmp/genesistestlog/*
+#Remove lzma compression RPM, cleanup and generate default gz genesis network boot
+cmd:yum remove -y xz-lzma-compat
+cmd:rm -f /tftpboot/xcat/genesis.fs.*.lzma
+cmd:mknb __GETNODEATTR($$CN,arch)__
+end
+
 start:nodeset_shell
 label:others,genesis
 description: verify could log in genesis shell