NSX: Add unit tests to increase coverage (#8355)

* NSX: Add unit tests

* cleanup unused imports

* add more unit tests

* add tests for publicnsxnetworkguru

* add license

* fix build failures

* address sonar comment

Author: Pearl1594

plugins/network-elements/nsx/pom.xml

@@ -29,7 +29,21 @@
         <version>4.19.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${cs.jacoco-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/org/apache/cloudstack/agent/api/**</exclude>
+                        <exclude>**/org/apache/cloudstack/api/response/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>com.vmware</groupId>

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java

@@ -39,7 +39,6 @@
 import com.cloud.network.guru.GuestNetworkGuru;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.offering.NetworkOffering;
-import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.Account;
 import com.cloud.user.dao.AccountDao;
@@ -76,8 +75,6 @@ public class NsxGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
     DomainDao domainDao;
     @Inject
     NetworkModel networkModel;
-    @Inject
-    NetworkOfferingDao networkOfferingDao;
 
     public NsxGuestNetworkGuru() {
         super();
@@ -298,7 +295,7 @@ public void commitMigration(NicProfile nic, Network network, VirtualMachineProfi
         // Do nothing
     }
 
-    private void createNsxSegment(NetworkVO networkVO, DataCenter zone) {
+    public void createNsxSegment(NetworkVO networkVO, DataCenter zone) {
         Account account = accountDao.findById(networkVO.getAccountId());
         if (isNull(account)) {
             throw new CloudRuntimeException(String.format("Unable to find account with id: %s", networkVO.getAccountId()));

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderServiceImpl.java

@@ -36,6 +36,7 @@
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.cloudstack.api.command.DeleteNsxControllerCmd;
 import org.apache.cloudstack.api.command.ListNsxControllersCmd;
 import org.apache.cloudstack.api.BaseResponse;
@@ -197,7 +198,8 @@ public List<Class<?>> getCommands() {
         return cmdList;
     }
 
-    private void validateNetworkState(List<NetworkVO> networkList) {
+    @VisibleForTesting
+    void validateNetworkState(List<NetworkVO> networkList) {
         for (NetworkVO network : networkList) {
             if (network.getBroadcastDomainType() == Networks.BroadcastDomainType.NSX) {
                 if ((network.getState() != Network.State.Shutdown) && (network.getState() != Network.State.Destroy)) {

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java

@@ -25,8 +25,14 @@
 import com.vmware.nsx_policy.model.SiteListResult;
 import junit.framework.Assert;
 import org.apache.cloudstack.NsxAnswer;
+import org.apache.cloudstack.agent.api.CreateNsxDistributedFirewallRulesCommand;
+import org.apache.cloudstack.agent.api.CreateNsxLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.CreateNsxPortForwardRuleCommand;
 import org.apache.cloudstack.agent.api.CreateNsxSegmentCommand;
+import org.apache.cloudstack.agent.api.CreateNsxStaticNatCommand;
 import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
+import org.apache.cloudstack.agent.api.DeleteNsxDistributedFirewallRulesCommand;
+import org.apache.cloudstack.agent.api.DeleteNsxNatRuleCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxSegmentCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxTier1GatewayCommand;
 import org.apache.cloudstack.agent.api.NsxCommand;
@@ -160,4 +166,57 @@ public void testDeleteNsxSegment() {
         NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
         assertTrue(answer.getResult());
     }
+
+    @Test
+    public void testCreateStaticNat() {
+        CreateNsxStaticNatCommand cmd = new CreateNsxStaticNatCommand(1L, 1L, 1L, 3L, "VPC01", true, 2L, "10.1.12.10", "172.30.20.12");
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testCreatePortForwardRule() {
+        CreateNsxPortForwardRuleCommand cmd = new CreateNsxPortForwardRuleCommand(1L, 1L, 1L, 3L, "VPC01", true, 2L, 5L, "10.1.12.10", "172.30.20.12", "2222", "22", "tcp");
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testDeleteNsxNatRule() {
+        DeleteNsxNatRuleCommand cmd = new DeleteNsxNatRuleCommand(1L, 1L, 1L, 3L, "VPC01", true, 2L, 5L, "22", "tcp");
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testCreateNsxLoadBalancerRule() {
+        List<NsxLoadBalancerMember> loadBalancerMembers = List.of(new NsxLoadBalancerMember(
+                1L, "172.30.20.12", 6443
+        ));
+        CreateNsxLoadBalancerRuleCommand cmd = new CreateNsxLoadBalancerRuleCommand(1L, 1L, 1L,
+                3L, "VPC01", true, loadBalancerMembers, 1L, "6443", "6443", "RoundRobin", "TCP");
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+
+    @Test
+    public void testCreateNsxDistributedFirewallRule() {
+        List<NsxNetworkRule> networkRules = List.of(new NsxNetworkRule());
+        CreateNsxDistributedFirewallRulesCommand cmd = new CreateNsxDistributedFirewallRulesCommand(1L, 1L, 1L,
+                3L, 1L, networkRules);
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testDeleteNsxDistributedFirewallRule() {
+        List<NsxNetworkRule> networkRules = List.of(new NsxNetworkRule());
+        DeleteNsxDistributedFirewallRulesCommand cmd = new DeleteNsxDistributedFirewallRulesCommand(1L, 1L, 1L,
+                3L, 1L, networkRules);
+        NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+
 }