tests: adjustments to DHCPServer and DHCPRelay model tests

Author: jaredhendrickson13

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsDHCPRelayTestCase.inc

@@ -18,7 +18,7 @@ class APIModelsDHCPRelayTestCase extends TestCase {
             $dhcp_server->update();
         }
         if ($apply) {
-            (new DHCPServer())->apply();
+            (new DHCPServer(async: false))->apply();
         }
     }
 
@@ -81,7 +81,7 @@ class APIModelsDHCPRelayTestCase extends TestCase {
         $this->disable_dhcp_servers(apply: true);
 
         # Ensure the DHCPRelay is enabled
-        $dhcp_relay = new DHCPRelay(enable: true, server: ['1.2.3.4']);
+        $dhcp_relay = new DHCPRelay(enable: true, interface: ["lan"], server: ['1.2.3.4']);
         $dhcp_relay->update();
 
         # Ensure the DHCP relay service is running with the correct arguments
@@ -90,7 +90,7 @@ class APIModelsDHCPRelayTestCase extends TestCase {
         $wan_if = $this->env['PFREST_WAN_IF'];
         $this->assert_str_contains(
             $dhcrelay_process->output,
-            "/usr/local/sbin/dhcrelay -id $lan_if -iu $wan_if -a -m replace 1.2.3.4",
+            "/usr/local/sbin/dhcrelay -id $lan_if -iu $wan_if 1.2.3.4",
         );
 
         # Disable the DHCPRelay

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsDHCPServerTestCase.inc

@@ -34,7 +34,7 @@ class APIModelsDHCPServerTestCase extends TestCase {
     /**
      * Ensures that a DHCP server cannot be enabled on an interface is already running a DHCP relay.
      */
-    public function test_cannot_enable_dhcp_server_with_relay_running() {
+    public function test_cannot_enable_dhcp_server_with_relay_running(): void {
         $this->assert_throws_response(
             response_id: 'DHCP_SERVER_CANNOT_BE_ENABLED_WITH_DHCP_RELAY',
             code: 400,
@@ -43,7 +43,7 @@ class APIModelsDHCPServerTestCase extends TestCase {
                 $dhcp_server = new DHCPServer(id: 'lan', async: false);
 
                 # Temporarily change the `lan` interface to use dhcp IPv4
-                Model::set_config('dhcrelay/interface', 'lan');
+                Model::set_config('dhcrelay/enable', "");
 
                 # Try to enable the DHCP server
                 $dhcp_server->validate_enable(enable: true);