Update NetworkOrchestratorTest.java

gzhao9 · Oct 10, 2023 · ee25fac · ee25fac
1 parent c3aeba1
commit ee25fac
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...ion/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java b/...ion/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java
@@ -97,6 +97,7 @@ public class NetworkOrchestratorTest extends TestCase {
     private String guruName = "GuestNetworkGuru";
     private String dhcpProvider = "VirtualRouter";
     private NetworkGuru guru = mock(NetworkGuru.class);
+    private Network network;
 
     NetworkOfferingVO networkOffering = mock(NetworkOfferingVO.class);
 
@@ -111,6 +112,7 @@ public class NetworkOrchestratorTest extends TestCase {
     @Before
     public void setUp() {
         // make class-scope mocks
+        network = mock(Network.class);
         testOrchastrator._nicDao = mock(NicDao.class);
         testOrchastrator._networksDao = mock(NetworkDao.class);
         testOrchastrator._networkModel = mock(NetworkModel.class);
@@ -242,7 +244,7 @@ public void testCheckL2OfferingServicesMultipleServicesNotIncludingUserData() {
 
     @Test
     public void testConfigureNicProfileBasedOnRequestedIpTestMacNull() {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());
 
@@ -256,7 +258,7 @@ public void testConfigureNicProfileBasedOnRequestedIpTestMacNull() {
 
     @Test
     public void testConfigureNicProfileBasedOnRequestedIpTestNicProfileMacNotNull() {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());
 
@@ -284,7 +286,7 @@ public void testConfigureNicProfileBasedOnRequestedIpTestRequestedIpIsNotValid()
     }
 
     private void testConfigureNicProfileBasedOnRequestedIpTestRequestedIp(String requestedIpv4Address) {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());
 
@@ -311,7 +313,7 @@ public void testConfigureNicProfileBasedOnRequestedIpTestGatewayIsNull() {
     }
 
     private void testConfigureNicProfileBasedOnRequestedIpTestGateway(String ipv4Gateway) {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());
 
@@ -337,7 +339,7 @@ public void testConfigureNicProfileBasedOnRequestedIpTestNetmaskIsNotValid() {
     }
 
     private void testConfigureNicProfileBasedOnRequestedIpTestNetmask(String ipv4Netmask) {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());
 
@@ -349,7 +351,7 @@ private void testConfigureNicProfileBasedOnRequestedIpTestNetmask(String ipv4Net
 
     @Test(expected = InvalidParameterValueException.class)
     public void testConfigureNicProfileBasedOnRequestedIpTestIPAddressVONull() {
-        Network network = mock(Network.class);
+
         NicProfile requestedNicProfile = new NicProfile();
         NicProfile nicProfile = Mockito.spy(new NicProfile());