Support to add and delete Port forward rules

Pearl1594 · Oct 30, 2023 · Oct 23, 2023 · Oct 23, 2023 · Oct 23, 2023 · Oct 23, 2023
commit be49197bc5625a1a0ea04e774af3af1a98c4a2bd
diff --git a/...ts/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxPortForwardRuleCommand.java b/...ts/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxPortForwardRuleCommand.java
@@ -0,0 +1,36 @@
+package org.apache.cloudstack.agent.api;
+
+public class CreateNsxPortForwardRuleCommand extends NsxNetworkCommand {
+    private final String publicPort;
+    private final String privatePort;
+    private final String protocol;
+    private final long ruleId;
+
+
+    public CreateNsxPortForwardRuleCommand(long domainId, long accountId, long zoneId, Long networkResourceId,
+                                           String networkResourceName, boolean isResourceVpc, Long vmId,
+                                           long ruleId, String publicIp, String vmIp, String publicPort, String privatePort, String protocol) {
+        super(domainId, accountId, zoneId, networkResourceId, networkResourceName, isResourceVpc, vmId, publicIp, vmIp);
+        this.publicPort = publicPort;
+        this.privatePort = privatePort;
+        this.ruleId = ruleId;
+        this.protocol = protocol;
+
+    }
+
+    public String getPublicPort() {
+        return publicPort;
+    }
+
+    public String getPrivatePort() {
+        return privatePort;
+    }
+
+    public long getRuleId() {
+        return ruleId;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+}
diff --git a/...elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxStaticNatCommand.java b/...elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxStaticNatCommand.java
@@ -1,76 +1,9 @@
 package org.apache.cloudstack.agent.api;
 
-import java.util.Objects;
+public class CreateNsxStaticNatCommand extends NsxNetworkCommand {
 
-public class CreateNsxStaticNatCommand extends NsxCommand {
-
-    private long vpcId;
-    private String vpcName;
-    private long vmId;
-    private String publicIp;
-    private String vmIp;
-
-    public CreateNsxStaticNatCommand(long domainId, long accountId, long zoneId, long vpcId, String vpcName,
-                                     long vmId, String publicIp, String vmIp) {
-        super(domainId, accountId, zoneId);
-        this.vpcId = vpcId;
-        this.vpcName = vpcName;
-        this.vmId = vmId;
-        this.publicIp = publicIp;
-        this.vmIp = vmIp;
-    }
-
-    public long getVpcId() {
-        return vpcId;
-    }
-
-    public void setVpcId(long vpcId) {
-        this.vpcId = vpcId;
-    }
-
-    public String getVpcName() {
-        return vpcName;
-    }
-
-    public void setVpcName(String vpcName) {
-        this.vpcName = vpcName;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    public void setVmId(long vmId) {
-        this.vmId = vmId;
-    }
-
-    public String getPublicIp() {
-        return publicIp;
-    }
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public String getVmIp() {
-        return vmIp;
-    }
-
-    public void setVmIp(String vmIp) {
-        this.vmIp = vmIp;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        CreateNsxStaticNatCommand that = (CreateNsxStaticNatCommand) o;
-        return vpcId == that.vpcId && Objects.equals(publicIp, that.publicIp) && Objects.equals(vmIp, that.vmIp);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), vpcId, publicIp, vmIp);
+    public CreateNsxStaticNatCommand(long domainId, long accountId, long zoneId, Long networkResourceId, String networkResourceName,
+                                     boolean isResourceVpc, Long vmId, String publicIp, String vmIp) {
+        super(domainId, accountId, zoneId, networkResourceId, networkResourceName, isResourceVpc, vmId, publicIp, vmIp);
     }
 }
diff --git a/...k-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxNatRuleCommand.java b/...k-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxNatRuleCommand.java
@@ -0,0 +1,25 @@
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.network.Network;
+
+public class DeleteNsxNatRuleCommand extends NsxNetworkCommand {
+    private Long ruleId;
+    private Network.Service service;
+    public DeleteNsxNatRuleCommand(long domainId, long accountId, long zoneId, Long networkResourceId, String networkResourceName,
+                                   boolean isResourceVpc, Long vmId, Long ruleId, String publicIp, String vmIp) {
+        super(domainId, accountId, zoneId, networkResourceId, networkResourceName, isResourceVpc, vmId, publicIp, vmIp);
+        this.ruleId = ruleId;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public Network.Service getService() {
+        return service;
+    }
+
+    public void setService(Network.Service service) {
+        this.service = service;
+    }
+}
diff --git a/...elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxStaticNatCommand.java b/...elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxStaticNatCommand.java
diff --git a/...network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxNetworkCommand.java b/...network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxNetworkCommand.java
@@ -0,0 +1,87 @@
+package org.apache.cloudstack.agent.api;
+
+import java.util.Objects;
+
+public class NsxNetworkCommand extends NsxCommand {
+    private Long networkResourceId;
+    private String networkResourceName;
+    private boolean isResourceVpc;
+    private Long vmId;
+    private String publicIp;
+    private String vmIp;
+
+    public NsxNetworkCommand(long domainId, long accountId, long zoneId, Long networkResourceId, String networkResourceName,
+                             boolean isResourceVpc, Long vmId, String publicIp, String vmIp) {
+        super(domainId, accountId, zoneId);
+        this.networkResourceId = networkResourceId;
+        this.networkResourceName = networkResourceName;
+        this.isResourceVpc = isResourceVpc;
+        this.vmId = vmId;
+        this.publicIp = publicIp;
+        this.vmIp = vmIp;
+    }
+
+    public Long getNetworkResourceId() {
+        return networkResourceId;
+    }
+
+    public void setNetworkResourceId(long networkResourceId) {
+        this.networkResourceId = networkResourceId;
+    }
+
+    public String getNetworkResourceName() {
+        return networkResourceName;
+    }
+
+    public void setNetworkResourceName(String networkResourceName) {
+        this.networkResourceName = networkResourceName;
+    }
+
+    public boolean isResourceVpc() {
+        return isResourceVpc;
+    }
+
+    public void setResourceVpc(boolean resourceVpc) {
+        isResourceVpc = resourceVpc;
+    }
+
+    public Long getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(Long vmId) {
+        this.vmId = vmId;
+    }
+
+    public String getPublicIp() {
+        return publicIp;
+    }
+
+    public void setPublicIp(String publicIp) {
+        this.publicIp = publicIp;
+    }
+
+    public String getVmIp() {
+        return vmIp;
+    }
+
+    public void setVmIp(String vmIp) {
+        this.vmIp = vmIp;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        NsxNetworkCommand that = (NsxNetworkCommand) o;
+        return networkResourceId == that.networkResourceId && vmId == that.vmId &&
+                Objects.equals(networkResourceName, that.networkResourceName) && Objects.equals(publicIp, that.publicIp)
+                && Objects.equals(vmIp, that.vmIp);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), networkResourceId, networkResourceName, vmId, publicIp, vmIp);
+    }
+}