You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2024/02/22 19:01:43 UTC
(cloudstack) branch fr03-cleanup-PF-udp-lb created (now 702a2cb2d4b)
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch fr03-cleanup-PF-udp-lb
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
at 702a2cb2d4b NSX: Cleanup PF rule associated to an expunged VM
This branch includes the following new commits:
new 70c0a40a814 FR03: Add UDP LB rules
new 702a2cb2d4b NSX: Cleanup PF rule associated to an expunged VM
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(cloudstack) 01/02: FR03: Add UDP LB rules
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch fr03-cleanup-PF-udp-lb
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 70c0a40a8142a4b8f3f8f0f6bb134c86cba35940
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu Feb 22 13:11:46 2024 -0500
FR03: Add UDP LB rules
---
.../nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java | 2 ++
.../nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
index fe02948b989..6091130c476 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
@@ -629,6 +629,8 @@ public class NsxApiClient {
LBUdpMonitorProfile lbUdpMonitorProfile = new LBUdpMonitorProfile.Builder(UDP_MONITOR_PROFILE)
.setDisplayName(lbMonitorProfileId)
.setMonitorPort(Long.parseLong(port))
+ .setSend("")
+ .setReceive("")
.build();
lbActiveMonitor.patch(lbMonitorProfileId, lbUdpMonitorProfile);
}
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
index ce27a7ddd24..76e28d59c9f 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
@@ -664,7 +664,7 @@ public class NsxElement extends AdapterBase implements DhcpServiceProvider, Dns
.setPublicPort(String.valueOf(loadBalancingRule.getSourcePortStart()))
.setPrivatePort(String.valueOf(loadBalancingRule.getDefaultPortStart()))
.setRuleId(loadBalancingRule.getId())
- .setProtocol(loadBalancingRule.getProtocol().toUpperCase(Locale.ROOT))
+ .setProtocol(loadBalancingRule.getLbProtocol().toUpperCase(Locale.ROOT))
.setAlgorithm(loadBalancingRule.getAlgorithm())
.build();
if (loadBalancingRule.getState() == FirewallRule.State.Add) {
(cloudstack) 02/02: NSX: Cleanup PF rule associated to an expunged VM
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch fr03-cleanup-PF-udp-lb
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 702a2cb2d4b2f666e2b64c33f7d2ad612ff6f82f
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu Feb 22 11:40:30 2024 -0500
NSX: Cleanup PF rule associated to an expunged VM
---
.../nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
index 76e28d59c9f..f69cc0d1bef 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
@@ -535,8 +535,7 @@ public class NsxElement extends AdapterBase implements DhcpServiceProvider, Dns
for (PortForwardingRule rule : rules) {
IPAddressVO publicIp = ApiDBUtils.findIpAddressById(rule.getSourceIpAddressId());
UserVm vm = ApiDBUtils.findUserVmById(rule.getVirtualMachineId());
- if ((vm == null && (rule.getState() != FirewallRule.State.Revoke)) ||
- (vm != null && networkModel.getNicInNetwork(vm.getId(), network.getId()) == null)) {
+ if (vm == null && rule.getState() != FirewallRule.State.Revoke) {
continue;
}
NsxOpObject nsxObject = getNsxOpObject(network);