(cloudstack) 06/06: add logs

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch nsx-additional-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 3e8bb8d8f84bafb0cf72dedc825ddc85342f4797
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Tue Feb 27 15:53:07 2024 -0500

    add logs
---
 .../nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java | 3 ++-
 .../nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java | 4 +++-
 2 files changed, 5 insertions(+), 2 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 06f6f9c1bcb..6fbf4177ddc 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
@@ -387,7 +387,8 @@ public class NsxResource implements ServerResource {
             String privatePort = cmd.getPrivatePort();
             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, cmd.getNetworkResourceName())) {
+            if (nsxApiClient.doesPfRuleExist(ruleName, tier1GatewayName)) {
+                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/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 940464d3ba2..f3930d7cf7e 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
@@ -572,12 +572,13 @@ public class NsxApiClient {
         }
     }
 
-    public boolean doesPfRuleExist(String ruleName, String tier1GatewayName, String networkName) {
+    public boolean doesPfRuleExist(String ruleName, String tier1GatewayName) {
         try {
             NatRules natService = (NatRules) nsxService.apply(NatRules.class);
             PolicyNatRule rule = natService.get(tier1GatewayName, NAT_ID, ruleName);
             return !Objects.isNull(rule);
         } catch (Error error) {
+            LOGGER.debug(String.format("Found a port forward rule named: %s on NSX", ruleName));
             return false;
         }
     }
@@ -781,6 +782,7 @@ public class NsxApiClient {
                 return lbVirtualServer;
             }
         } catch (Exception e) {
+            LOGGER.debug(String.format("Found an LB virtual server named: %s on NSX", lbVSName));
             return null;
         }
         return null;