Wire up update_bandwidth.sh script for dynamic rate limiting in Virtual Routers

Author: sudo87

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

@@ -17,14 +17,14 @@
 
 package com.cloud.agent.api.routing;
 
-import com.cloud.agent.api.Command;
+
 
 /**
  * Sent to a Virtual Router to dynamically apply bandwidth shaping on a
  * named network interface using Linux tc (traffic control). A value of 0
  * or negative for ingressMbps / egressMbps removes an existing limit.
  */
-public class UpdateInterfaceBandwidthCommand extends Command {
+public class UpdateInterfaceBandwidthCommand extends NetworkElementCommand {
 
     /** The interface IP used to identify which VR interface to shape. */
     private String interfaceIp;
@@ -35,21 +35,21 @@ public class UpdateInterfaceBandwidthCommand extends Command {
      */
     private String trafficType;
 
-    /** Ingress (inbound) rate limit in Mbps; <= 0 means no limit. */
-    private int ingressMbps;
+    /** Ingress (inbound) rate limit in kbps; <= 0 means no limit. */
+    private int ingressKbps;
 
-    /** Egress (outbound) rate limit in Mbps; &lt;= 0 means no limit. */
-    private int egressMbps;
+    /** Egress (outbound) rate limit in kbps; <= 0 means no limit. */
+    private int egressKbps;
 
     protected UpdateInterfaceBandwidthCommand() {
         // For serialization
     }
 
-    public UpdateInterfaceBandwidthCommand(String interfaceIp, String trafficType, int ingressMbps, int egressMbps) {
+    public UpdateInterfaceBandwidthCommand(String interfaceIp, String trafficType, int ingressKbps, int egressKbps) {
         this.interfaceIp = interfaceIp;
         this.trafficType = trafficType;
-        this.ingressMbps = ingressMbps;
-        this.egressMbps = egressMbps;
+        this.ingressKbps = ingressKbps;
+        this.egressKbps = egressKbps;
     }
 
     public String getInterfaceIp() {
@@ -60,12 +60,12 @@ public String getTrafficType() {
         return trafficType;
     }
 
-    public int getIngressMbps() {
-        return ingressMbps;
+    public int getIngressKbps() {
+        return ingressKbps;
     }
 
-    public int getEgressMbps() {
-        return egressMbps;
+    public int getEgressKbps() {
+        return egressKbps;
     }
 
     @Override

core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java

@@ -80,6 +80,7 @@ public class VRScripts {
     public static final String VR_FILE_CLEANUP = "cleanup.sh";
 
     public static final String VR_UPDATE_INTERFACE_CONFIG = "update_interface_config.sh";
+    public static final String VR_UPDATE_BANDWIDTH = "update_bandwidth.sh";
 
     public static final String ROUTER_FILESYSTEM_WRITABLE_CHECK = "filesystem_writable_check.py";
 

core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

@@ -36,6 +36,7 @@
 
 import com.cloud.agent.api.HandleCksIsoCommand;
 import org.apache.cloudstack.agent.routing.ManageServiceCommand;
+import com.cloud.agent.api.routing.UpdateInterfaceBandwidthCommand;
 import com.cloud.agent.api.routing.UpdateNetworkCommand;
 import com.cloud.agent.api.to.IpAddressTO;
 import com.cloud.network.router.VirtualRouter;
@@ -146,6 +147,10 @@ public Answer executeRequest(final NetworkElementCommand cmd) {
                 return execute((UpdateNetworkCommand) cmd);
             }
 
+            if (cmd instanceof UpdateInterfaceBandwidthCommand) {
+                return execute((UpdateInterfaceBandwidthCommand) cmd);
+            }
+
             if (cmd instanceof HandleCksIsoCommand) {
                 return execute((HandleCksIsoCommand) cmd);
             }
@@ -250,6 +255,17 @@ private String getRouterSshControlIp(NetworkElementCommand cmd) {
         return routerIp;
     }
 
+    private Answer execute(UpdateInterfaceBandwidthCommand cmd) {
+        String routerIp = getRouterSshControlIp(cmd);
+        String args = String.format("%s %d %d", cmd.getInterfaceIp(), cmd.getIngressKbps(), cmd.getEgressKbps());
+        ExecutionResult result = _vrDeployer.executeInVR(routerIp, VRScripts.VR_UPDATE_BANDWIDTH, args);
+        if (result.isSuccess()) {
+            return new Answer(cmd, true, "Successfully updated bandwidth. Details: " + result.getDetails());
+        } else {
+            return new Answer(cmd, false, "Failed to update bandwidth. Details: " + result.getDetails());
+        }
+    }
+
     private Answer execute(UpdateNetworkCommand cmd) {
         IpAddressTO[] ipAddresses = cmd.getIpAddresses();
         String routerIp = getRouterSshControlIp(cmd);

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -96,6 +96,7 @@
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.manager.Commands;
 import com.cloud.agent.api.routing.UpdateInterfaceBandwidthCommand;
+import com.cloud.agent.api.routing.NetworkElementCommand;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.dao.DomainRouterJoinDao;
@@ -186,6 +187,7 @@
 import com.cloud.network.nsx.NsxService;
 import com.cloud.network.router.CommandSetupHelper;
 import com.cloud.network.router.NetworkHelper;
+import com.cloud.network.router.RouterControlHelper;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.rules.FirewallRule.Purpose;
 import com.cloud.network.rules.FirewallRuleVO;
@@ -445,6 +447,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
     @Autowired
     @Qualifier("networkHelper")
     protected NetworkHelper networkHelper;
+    @Inject
+    protected RouterControlHelper _routerControlHelper;
 
     int _cidrLimit;
     boolean _allowSubdomainNetworkAccess;
@@ -3820,6 +3824,7 @@ protected void applyDynamicNetworkRate(NetworkVO network, List<DomainRouterVO> r
             String guestIp = guestNic.getIPv4Address();
             UpdateInterfaceBandwidthCommand banCmd =
                     new UpdateInterfaceBandwidthCommand(guestIp, TrafficType.Guest.name(), kbps, kbps);
+            banCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
             Commands cmds = new Commands(Command.OnError.Continue);
             cmds.addCommand("updateBandwidth", banCmd);
             try {