From 1205d6d9833fcb19b134597eeb90bcc34b343439 Mon Sep 17 00:00:00 2001
From: Wai Yee Wong <wpeter@us.ibm.com>
Date: Mon, 2 May 2022 16:42:53 -0400
Subject: [PATCH] Improvement on the warning message and enhancement on the
 test case

---
 perl-xCAT/xCAT/NodeRange.pm              |  4 ++--
 xCAT-test/autotest/testcase/mkdef/cases1 | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/perl-xCAT/xCAT/NodeRange.pm b/perl-xCAT/xCAT/NodeRange.pm
index c79c0cf22..ea4cacc2c 100644
--- a/perl-xCAT/xCAT/NodeRange.pm
+++ b/perl-xCAT/xCAT/NodeRange.pm
@@ -295,8 +295,8 @@ sub expandatom {
                 for my $row (@grplist) {
                     if ($row->{groupname} eq $atom) {
                         my $rsp;
-                        $rsp->{data}->[0] = "$atom is a defined group name, so Node $atom is not created.";
-                        xCAT::MsgUtils->message("E", $rsp, $::callback);
+                        $rsp->{data}->[0] = "Could not create an object named \'$atom\' of type 'node'. A definition for a group object with the same name already exists.";
+                        xCAT::MsgUtils->message("W", $rsp, $::callback);
                         return ();
                     }
                 }
diff --git a/xCAT-test/autotest/testcase/mkdef/cases1 b/xCAT-test/autotest/testcase/mkdef/cases1
index 7494bb453..4e08959d7 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases1
+++ b/xCAT-test/autotest/testcase/mkdef/cases1
@@ -156,11 +156,16 @@ cmd:mkdef -t group -o tempgroup13579
 check:rc==0
 cmd:mkdef -t node -o tempgroup13579 groups=tempgroup13579
 check:rc==1
-check:output=~a defined group name
+check:output=~A definition for a group object with the same name already exists.
 check:output=~No object names were provided
-cmd:mkdef -t node -o tempnode02468,tempgroup13579 groups=tempgroup13579
+cmd:mkdef -t node -o tempgroup13579 groups=all
 check:rc==1
-check:output=~a defined group name
+check:output=~A definition for a group object with the same name already exists.
+check:output=~No object names were provided
+#cmd:mkdef -t node -o tempnode02468,tempgroup13579 groups=tempgroup13579
+cmd:mkdef -t node -o tempgroup13579,tempnode02468 groups=tempgroup13579
+check:rc==0
+check:output=~A definition for a group object with the same name already exists.
 check:output=~1 object definitions have been created
 cmd:rmdef -t node -o tempnode02468
 check:rc==0