From b7414b881e88f712966a4e3bef20f8b825b8b62c Mon Sep 17 00:00:00 2001 From: Lucas Haug Date: Thu, 11 Jul 2024 11:31:12 +0200 Subject: [PATCH] Consistent use of EligibilityTimeGate and Ieee8021qAsynchronousShaper.ned --- showcases/tsn/trafficshaping/asynchronousshaper/doc/index.rst | 2 +- src/inet/linklayer/ieee8021q/Ieee8021qAsynchronousShaper.ned | 1 + .../trafficshaping/asynchronousshaper/core4inet/omnetpp.ini | 4 ++-- .../tsn/trafficshaping/asynchronousshaper/icct/omnetpp.ini | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/showcases/tsn/trafficshaping/asynchronousshaper/doc/index.rst b/showcases/tsn/trafficshaping/asynchronousshaper/doc/index.rst index 1142f9f41c7..7d289122a77 100644 --- a/showcases/tsn/trafficshaping/asynchronousshaper/doc/index.rst +++ b/showcases/tsn/trafficshaping/asynchronousshaper/doc/index.rst @@ -77,7 +77,7 @@ To enable asynchronous traffic shaping in a TSN switch, the following is require - Set the type of the ``queue`` and ``transmissionSelectionAlgorithm`` submodules in ``eth[*].macLayer.queue``: ``*.switch.eth[*].macLayer.queue.queue[*].typename = "EligibilityTimeQueue"`` - ``*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[*].typename = "Ieee8021qAsynchronousShaper"`` + ``*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[*].typename = "EligibilityTimeGate"`` - We can override the number of traffic classes (8 by default) in the time-aware shaper modules (``eth[*].macLayer.queue``): diff --git a/src/inet/linklayer/ieee8021q/Ieee8021qAsynchronousShaper.ned b/src/inet/linklayer/ieee8021q/Ieee8021qAsynchronousShaper.ned index ceaceed4118..f153bab24a4 100644 --- a/src/inet/linklayer/ieee8021q/Ieee8021qAsynchronousShaper.ned +++ b/src/inet/linklayer/ieee8021q/Ieee8021qAsynchronousShaper.ned @@ -11,6 +11,7 @@ import inet.protocolelement.shaper.EligibilityTimeGate; // // This module implements the IEEE 802.1Q asynchronous shaper. +// This module is an alias for the EligibilityTimeGate module. // module Ieee8021qAsynchronousShaper extends EligibilityTimeGate { diff --git a/tests/validation/tsn/trafficshaping/asynchronousshaper/core4inet/omnetpp.ini b/tests/validation/tsn/trafficshaping/asynchronousshaper/core4inet/omnetpp.ini index 2aa23f8fb45..898904fa12c 100644 --- a/tests/validation/tsn/trafficshaping/asynchronousshaper/core4inet/omnetpp.ini +++ b/tests/validation/tsn/trafficshaping/asynchronousshaper/core4inet/omnetpp.ini @@ -128,7 +128,7 @@ sim-time-limit = 1s *.switch.bridging.streamFilter.ingress.meter[1].committedBurstSize = 322B - 22B # 4B (802.1Q) + 14B (ETH MAC) + 4B (ETH FCS) *.switch.eth[*].macLayer.queue.queue[5..6].typename = "EligibilityTimeQueue" -*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[5..6].typename = "Ieee8021qAsynchronousShaper" +*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[5..6].typename = "EligibilityTimeGate" ############################### # Traffic Shaping Configuration @@ -140,7 +140,7 @@ sim-time-limit = 1s *.switch.eth[*].macLayer.queue.queue[*].packetCapacity = 4 *.switch.eth[*].macLayer.queue.queue[*].dropperClass = "inet::queueing::PacketAtCollectionBeginDropper" *.switch.eth[*].macLayer.queue.queue[5..6].typename = "EligibilityTimeQueue" -*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[5..6].typename = "Ieee8021qAsynchronousShaper" +*.switch.eth[*].macLayer.queue.transmissionSelectionAlgorithm[5..6].typename = "EligibilityTimeGate" ########################## # Visualizer Configuration diff --git a/tests/validation/tsn/trafficshaping/asynchronousshaper/icct/omnetpp.ini b/tests/validation/tsn/trafficshaping/asynchronousshaper/icct/omnetpp.ini index 2cd6e705d55..858b2b3e3fb 100644 --- a/tests/validation/tsn/trafficshaping/asynchronousshaper/icct/omnetpp.ini +++ b/tests/validation/tsn/trafficshaping/asynchronousshaper/icct/omnetpp.ini @@ -349,9 +349,9 @@ sim-time-limit = 0.1s # asynchronous shaper for AVB classes *.N*.eth[*].macLayer.queue.queue[6].typename = "EligibilityTimeQueue" -*.N*.eth[*].macLayer.queue.transmissionSelectionAlgorithm[6].typename = "Ieee8021qAsynchronousShaper" +*.N*.eth[*].macLayer.queue.transmissionSelectionAlgorithm[6].typename = "EligibilityTimeGate" *.*.eth[*].macLayer.queue.queue[4..5].typename = "EligibilityTimeQueue" -*.*.eth[*].macLayer.queue.transmissionSelectionAlgorithm[4..5].typename = "Ieee8021qAsynchronousShaper" +*.*.eth[*].macLayer.queue.transmissionSelectionAlgorithm[4..5].typename = "EligibilityTimeGate" ########################## # Visualizer Configuration