From a66e3a4d04beaab11cc29c4d6f3f699a0acfea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Mon, 24 Aug 2026 15:27:36 -0300
Subject: [PATCH] test(dhcp): use shared version helpers in intent harness

---
 xCAT-test/unit/dhcp_kea_plugin_intent.t | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/xCAT-test/unit/dhcp_kea_plugin_intent.t b/xCAT-test/unit/dhcp_kea_plugin_intent.t
index 84b68b397..b5f09fd93 100644
--- a/xCAT-test/unit/dhcp_kea_plugin_intent.t
+++ b/xCAT-test/unit/dhcp_kea_plugin_intent.t
@@ -5,6 +5,7 @@ no warnings 'once';
 
 use FindBin;
 use lib "$FindBin::Bin/../../perl-xCAT";
+use lib "$FindBin::Bin/../../xCAT-server/lib/perl";
 
 use File::Temp qw(tempdir);
 use Socket ();
@@ -24,11 +25,6 @@ BEGIN {
     sub get_site_attribute { return; }
     $INC{'xCAT/TableUtils.pm'} = __FILE__;
 
-    package xCAT::Utils;
-    sub osver { return 'rhels9'; }
-    sub runcmd { return; }
-    $INC{'xCAT/Utils.pm'} = __FILE__;
-
     package xCAT::NetworkUtils;
     sub import {
         my $caller = caller;
@@ -78,6 +74,13 @@ BEGIN {
     $INC{'xCAT/NodeRange.pm'} = __FILE__;
 }
 
+require xCAT::Utils;
+{
+    no warnings 'redefine';
+    *xCAT::Utils::osver = sub { return 'rhels9'; };
+    *xCAT::Utils::runcmd = sub { return; };
+}
+
 my $source_dhcp_plugin = "$FindBin::Bin/../../xCAT-server/lib/xcat/plugins/dhcp.pm";
 if ( -f $source_dhcp_plugin ) {
     require $source_dhcp_plugin;