Merge release branch 4.17 to main

* 4.17:
  marvin: newer python setuptools doesn't like -SNAPSHOT in marvin version (#7120)
  VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)

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;
-    }
 }

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;
-    }
 }

core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java

@@ -81,7 +81,7 @@ public abstract class NetworkElementCommand extends Command {
     }
 
     public int getAnswersCount() {
-        return 1;
+        return 2;
     }
 
     public boolean isQuery() {

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;
-    }
 }

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;
-    }
 }

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);
+    }
 }

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;
-    }
 }

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;
-    }
 }
 

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;
-    }
 }

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;
-    }
 }

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;
     }

tools/marvin/mvn-setup.py

@@ -48,7 +48,7 @@ def runSetupScript(args):
 
 
 if __name__ == "__main__":
-    version = sys.argv[1]
+    version = sys.argv[1].replace("-SNAPSHOT", "")
     remainingArgs = sys.argv[2:]
     replaceVersion(setupScript, version)
     runSetupScript(remainingArgs)