CLOUDSTACK-6047: Add generic wrapper for group answer needed commands

Sheng Yang · Sheng Yang · commit 8b341b0639b1 · 2014-02-19T19:47:09.000-08:00
diff --git a/core/src/com/cloud/agent/api/routing/GroupAnswer.java b/core/src/com/cloud/agent/api/routing/GroupAnswer.java
@@ -34,7 +34,7 @@ public GroupAnswer(Command cmd, boolean success, int rulesCount, String[] result
         this.results = results;
     }
 
-    String[] getResults() {
+    public String[] getResults() {
         return results;
     }
 }
diff --git a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -38,4 +38,8 @@ public IpAddressTO[] getIpAddresses() {
         return ipAddresses;
     }
 
+    @Override
+    public int getAnswersCount() {
+        return ipAddresses.length;
+    }
 }
diff --git a/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -26,4 +26,10 @@ protected IpAssocVpcCommand() {
     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/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -62,4 +62,8 @@ public String getRouterAccessIp() {
     public void setRouterAccessIp(String routerAccessIp) {
         this.routerAccessIp = routerAccessIp;
     }
+
+    public int getAnswersCount() {
+        return 1;
+    }
 }
diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -16,12 +16,12 @@
 // under the License.
 package com.cloud.agent.api.routing;
 
+import com.cloud.agent.api.to.FirewallRuleTO;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.cloud.agent.api.to.FirewallRuleTO;
-
 /**
  *
  * AccessDetails allow different components to put in information about
@@ -92,4 +92,9 @@ public String[][] generateFwRules() {
 
         return result;
     }
+
+    @Override
+    public int getAnswersCount() {
+        return rules.length;
+    }
 }
diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -17,14 +17,14 @@
 
 package com.cloud.agent.api.routing;
 
+import com.cloud.agent.api.to.NetworkACLTO;
+import com.cloud.agent.api.to.NicTO;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import com.cloud.agent.api.to.NetworkACLTO;
-import com.cloud.agent.api.to.NicTO;
-
 public class SetNetworkACLCommand extends NetworkElementCommand {
     NetworkACLTO[] rules;
     NicTO nic;
@@ -97,4 +97,9 @@ public int compare(NetworkACLTO acl1, NetworkACLTO acl2) {
     public NicTO getNic() {
         return nic;
     }
+
+    @Override
+    public int getAnswersCount() {
+        return rules.length;
+    }
 }
diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
@@ -16,10 +16,10 @@
 // under the License.
 package com.cloud.agent.api.routing;
 
-import java.util.List;
-
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 
+import java.util.List;
+
 public class SetPortForwardingRulesCommand extends NetworkElementCommand {
     PortForwardingRuleTO[] rules;
 
@@ -37,4 +37,10 @@ public SetPortForwardingRulesCommand(List<? extends PortForwardingRuleTO> pfRule
     public PortForwardingRuleTO[] getRules() {
         return rules;
     }
+
+    @Override
+    public int getAnswersCount() {
+        return rules.length;
+    }
 }
+
diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
@@ -16,10 +16,10 @@
 // under the License.
 package com.cloud.agent.api.routing;
 
-import java.util.List;
-
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 
+import java.util.List;
+
 public class SetPortForwardingRulesVpcCommand extends SetPortForwardingRulesCommand {
     protected SetPortForwardingRulesVpcCommand() {
     }
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
@@ -16,10 +16,10 @@
 // under the License.
 package com.cloud.agent.api.routing;
 
-import java.util.List;
-
 import com.cloud.agent.api.to.StaticNatRuleTO;
 
+import java.util.List;
+
 public class SetStaticNatRulesCommand extends NetworkElementCommand {
 
     StaticNatRuleTO[] rules;
@@ -44,4 +44,9 @@ public StaticNatRuleTO[] getRules() {
     public Long getVpcId() {
         return vpcId;
     }
+
+    @Override
+    public int getAnswersCount() {
+        return rules.length;
+    }
 }
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
@@ -17,14 +17,14 @@
 
 package com.cloud.agent.api.routing;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.StaticRouteProfile;
 import com.cloud.utils.net.NetUtils;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public class SetStaticRouteCommand extends NetworkElementCommand {
     StaticRouteProfile[] staticRoutes;
 
@@ -59,4 +59,9 @@ public String[][] generateSRouteRules() {
         result[0] = toAdd.toArray(new String[toAdd.size()]);
         return result;
     }
+
+    @Override
+    public int getAnswersCount() {
+        return staticRoutes.length;
+    }
 }
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public GroupAnswer(Command cmd, boolean success, int rulesCount, String[] result`
`34`	`34`	`this.results = results;`
`35`	`35`	`}`
`36`	`36`
`37`		`- String[] getResults() {`
	`37`	`+ public String[] getResults() {`
`38`	`38`	`return results;`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,8 @@ public IpAddressTO[] getIpAddresses() {`
`38`	`38`	`return ipAddresses;`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ @Override`
	`42`	`+ public int getAnswersCount() {`
	`43`	`+ return ipAddresses.length;`
	`44`	`+ }`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,10 @@ protected IpAssocVpcCommand() {`
`26`	`26`	`public IpAssocVpcCommand(IpAddressTO[] ips) {`
`27`	`27`	`super(ips);`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ @Override`
	`31`	`+ public int getAnswersCount() {`
	`32`	`+ //Count private gateway to maximum value`
	`33`	`+ return ipAddresses.length * 2;`
	`34`	`+ }`
`29`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,8 @@ public String getRouterAccessIp() {`
`62`	`62`	`public void setRouterAccessIp(String routerAccessIp) {`
`63`	`63`	`this.routerAccessIp = routerAccessIp;`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ public int getAnswersCount() {`
	`67`	`+ return 1;`
	`68`	`+ }`
`65`	`69`	`}`