tc faults apply to all network interfaces

Author: amogh09

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go

@@ -1316,9 +1316,26 @@ func validateTaskNetworkConfig(taskNetworkConfig *state.TaskNetworkConfig) error
 	return nil
 }
 
-// startNetworkLatencyFault invokes the linux TC utility tool to start the network-latency fault.
-func (h *FaultHandler) startNetworkLatencyFault(ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkLatencyRequest) error {
-	interfaceName := taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces[0].DeviceName
+// startNetworkLatencyFault invokes the linux TC utility tool to start the
+// network-latency fault for the given task.
+func (h *FaultHandler) startNetworkLatencyFault(
+	ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkLatencyRequest,
+) error {
+	for _, netInterface := range taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces {
+		err := h.startNetworkLatencyFaultForInterface(ctx, taskMetadata, request, netInterface.DeviceName)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// startNetworkLatencyFaultForInterface invokes the linux TC utility tool to start the
+// network-latency fault for the given interface.
+func (h *FaultHandler) startNetworkLatencyFaultForInterface(
+	ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkLatencyRequest,
+	interfaceName string,
+) error {
 	networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
 	// If task's network mode is awsvpc, we need to run nsenter to access the task's network namespace.
 	nsenterPrefix := ""
@@ -1378,8 +1395,24 @@ func (h *FaultHandler) startNetworkLatencyFault(ctx context.Context, taskMetadat
 }
 
 // startNetworkPacketLossFault invokes the linux TC utility tool to start the network-packet-loss fault.
-func (h *FaultHandler) startNetworkPacketLossFault(ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkPacketLossRequest) error {
-	interfaceName := taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces[0].DeviceName
+func (h *FaultHandler) startNetworkPacketLossFault(
+	ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkPacketLossRequest,
+) error {
+	for _, netInterface := range taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces {
+		err := h.startNetworkPacketLossFaultForInterface(ctx, taskMetadata, request, netInterface.DeviceName)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// startNetworkPacketLossFault invokes the linux TC utility tool to start the network-packet-loss fault
+// for the given network interface.
+func (h *FaultHandler) startNetworkPacketLossFaultForInterface(
+	ctx context.Context, taskMetadata *state.TaskResponse, request types.NetworkPacketLossRequest,
+	interfaceName string,
+) error {
 	networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
 	// If task's network mode is awsvpc, we need to run nsenter to access the task's network namespace.
 	nsenterPrefix := ""
@@ -1439,7 +1472,20 @@ func (h *FaultHandler) startNetworkPacketLossFault(ctx context.Context, taskMeta
 // stopTCFault invokes the linux TC utility tool to stop the network fault started by TC,
 // including both network-latency fault and network-packet-loss fault.
 func (h *FaultHandler) stopTCFault(ctx context.Context, taskMetadata *state.TaskResponse) error {
-	interfaceName := taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces[0].DeviceName
+	for _, netInterface := range taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces {
+		err := h.stopTCFaultForInterface(ctx, taskMetadata, netInterface.DeviceName)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// stopTCFaultForInterface invokes the linux TC utility tool to stop the network fault started by TC,
+// including both network-latency fault and network-packet-loss fault, for the given network interface.
+func (h *FaultHandler) stopTCFaultForInterface(
+	ctx context.Context, taskMetadata *state.TaskResponse, interfaceName string,
+) error {
 	networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
 	// If task's network mode is awsvpc, we need to run nsenter to access the task's network namespace.
 	nsenterPrefix := ""
@@ -1487,9 +1533,31 @@ func (h *FaultHandler) stopTCFault(ctx context.Context, taskMetadata *state.Task
 	return nil
 }
 
-// checkTCFault check if there's existing network-latency fault or network-packet-loss fault.
-func (h *FaultHandler) checkTCFault(ctx context.Context, taskMetadata *state.TaskResponse) (bool, bool, error) {
-	interfaceName := taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces[0].DeviceName
+// checkTCFault checks if there's existing network-latency fault or network-packet-loss fault.
+func (h *FaultHandler) checkTCFault(
+	ctx context.Context, taskMetadata *state.TaskResponse,
+) (bool, bool, error) {
+	var latencyFound, packetLossFound bool
+	for _, netInterface := range taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].NetworkInterfaces {
+		hasLatency, hasPacketLoss, err := h.checkTCFaultForInterface(ctx, taskMetadata, netInterface.DeviceName)
+		if err != nil {
+			return false, false, err
+		}
+		if hasLatency {
+			latencyFound = true
+		}
+		if hasPacketLoss {
+			packetLossFound = true
+		}
+	}
+	return latencyFound, packetLossFound, nil
+}
+
+// checkTCFaultForInterface checks if there's existing network-latency fault or
+// network-packet-loss fault for the given network interface.
+func (h *FaultHandler) checkTCFaultForInterface(
+	ctx context.Context, taskMetadata *state.TaskResponse, interfaceName string,
+) (bool, bool, error) {
 	networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
 	// If task's network mode is awsvpc, we need to run nsenter to access the task's network namespace.
 	nsenterPrefix := ""