You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/24 08:25:38 UTC
[cloudstack] branch 4.17 updated: VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.17 by this push:
new 8838943a76 VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)
8838943a76 is described below
commit 8838943a761e6670affe3a7a3ca469e7de4ad78f
Author: Wei Zhou <we...@apache.org>
AuthorDate: Tue Jan 24 09:25:29 2023 +0100
VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)
---
core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java | 5 -----
.../main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java | 6 ------
.../java/com/cloud/agent/api/routing/NetworkElementCommand.java | 2 +-
.../java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java | 5 -----
.../com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java | 5 -----
.../java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java | 5 +++++
.../main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java | 5 -----
.../com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java | 5 -----
.../java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java | 5 -----
.../java/com/cloud/agent/api/routing/SetStaticRouteCommand.java | 5 -----
.../com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java | 2 +-
11 files changed, 7 insertions(+), 43 deletions(-)
diff --git a/core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java
index 0c9fb62cfb..0370bb5323 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -40,9 +40,4 @@ public class IpAssocCommand extends NetworkElementCommand {
public IpAddressTO[] getIpAddresses() {
return ipAddresses;
}
-
- @Override
- public int getAnswersCount() {
- return ipAddresses.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java
index da1060f11b..4508461742 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -29,10 +29,4 @@ public class IpAssocVpcCommand extends IpAssocCommand {
public IpAssocVpcCommand(IpAddressTO[] ips) {
super(ips);
}
-
- @Override
- public int getAnswersCount() {
- //Count private gateway to maximum value
- return ipAddresses.length * 2;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
index de3843e2b8..19235ca212 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -80,7 +80,7 @@ public abstract class NetworkElementCommand extends Command {
}
public int getAnswersCount() {
- return 1;
+ return 2;
}
public boolean isQuery() {
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index b6e40dc207..c56f8d20fb 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -111,9 +111,4 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
return result;
}
-
- @Override
- public int getAnswersCount() {
- return rules.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java
index 638ba408de..dca81d0d9a 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java
@@ -47,9 +47,4 @@ public class SetIpv6FirewallRulesCommand extends NetworkElementCommand {
public String getGuestIp6Cidr() {
return guestIp6Cidr;
}
-
- @Override
- public int getAnswersCount() {
- return rules.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
index 86fc14c88b..969117517f 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
@@ -95,4 +95,9 @@ public class SetMonitorServiceCommand extends NetworkElementCommand {
public void setDeleteFromProcessedCache(boolean deleteFromProcessedCache) {
this.deleteFromProcessedCache = deleteFromProcessedCache;
}
+
+ @Override
+ public int getAnswersCount() {
+ return 2 + (reconfigureAfterUpdate ? 1 : 0);
+ }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java
index 0de484ac4e..c7cb1e61e5 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -109,9 +109,4 @@ public class SetNetworkACLCommand extends NetworkElementCommand {
public NicTO getNic() {
return nic;
}
-
- @Override
- public int getAnswersCount() {
- return rules.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
index cb2669aafb..c7d1d0ef5a 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
@@ -40,10 +40,5 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
public PortForwardingRuleTO[] getRules() {
return rules;
}
-
- @Override
- public int getAnswersCount() {
- return rules.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
index 213fa47848..15e6f12a2e 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
@@ -47,9 +47,4 @@ public class SetStaticNatRulesCommand extends NetworkElementCommand {
public Long getVpcId() {
return vpcId;
}
-
- @Override
- public int getAnswersCount() {
- return rules.length;
- }
}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java
index 635fa15e5d..c23f775a0b 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java
@@ -59,9 +59,4 @@ public class SetStaticRouteCommand extends NetworkElementCommand {
}
return toAdd.toArray(new String[toAdd.size()]);
}
-
- @Override
- public int getAnswersCount() {
- return staticRoutes.length;
- }
}
diff --git a/core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java
index dbbdc8eeb0..042bec9d21 100644
--- a/core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java
+++ b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java
@@ -286,7 +286,7 @@ public class ConfigHelperTest {
final IpAddressTO[] ipArray = ips.toArray(new IpAddressTO[ips.size()]);
final IpAssocVpcCommand cmd = new IpAssocVpcCommand(ipArray);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, ROUTERNAME);
- assertEquals(6, cmd.getAnswersCount()); // AnswersCount is clearly wrong as it doesn't know enough to tell
+ assertEquals(2, cmd.getAnswersCount());
return cmd;
}