From 2187fdde4caa4d7d71e8403b75760b788ac26945 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Wed, 6 Mar 2024 12:17:25 -0300 Subject: [PATCH] Fix build --- .../main/java/org/apache/cloudstack/resource/NsxResource.java | 2 +- .../src/test/java/com/cloud/network/NetworkModelImplTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java index 6fbf4177ddc..cd1d481b9f8 100644 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java @@ -388,7 +388,7 @@ public class NsxResource implements ServerResource { String service = privatePort.contains("-") ? nsxApiClient.getServicePath(ruleName, privatePort, cmd.getProtocol(), null, null) : nsxApiClient.getNsxInfraServices(ruleName, privatePort, cmd.getProtocol(), null, null); if (nsxApiClient.doesPfRuleExist(ruleName, tier1GatewayName)) { - LOGGER.debug(String.format("Port forward rule for port: %s exits on NSX, not adding it again", privatePort)); + logger.debug(String.format("Port forward rule for port: %s exits on NSX, not adding it again", privatePort)); return new NsxAnswer(cmd, true, null); } nsxApiClient.createPortForwardingRule(ruleName, tier1GatewayName, cmd.getNetworkResourceName(), cmd.getPublicIp(), diff --git a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java index 41adb65fb80..6eb3e5d186b 100644 --- a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java +++ b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java @@ -39,7 +39,6 @@ import org.junit.Test; import org.mockito.ArgumentMatchers; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.springframework.test.util.ReflectionTestUtils; @@ -102,7 +101,7 @@ public class NetworkModelImplTest { DataCenter zone = Mockito.mock(DataCenter.class); VpcVO vpc = Mockito.mock(VpcVO.class); Mockito.when(network.getVpcId()).thenReturn(1L); - Mockito.doReturn(vpc).when(vpcDao).findById(Matchers.anyLong()); + Mockito.doReturn(vpc).when(vpcDao).findById(ArgumentMatchers.anyLong()); // network, vpc and zone have valid dns prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1], dns2[0], dns2[1], dns1[2], dns2[2]); Pair result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :