Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

so-tcpreplay now runs if manager is offline #13134

Merged
merged 3 commits into from
Jun 4, 2024
Merged

so-tcpreplay now runs if manager is offline #13134

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5f656a
dont render pillar each time so-tcpreplay runs
m0duspwnens May 23, 2024
6e70268
Merge remote-tracking branch 'origin/2.4/dev' into sotcprp
m0duspwnens May 30, 2024
c0b2cf7
add the curlys
m0duspwnens Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions salt/common/tools/sbin/so-tcpreplay → salt/common/tools/sbin_jinja/so-tcpreplay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
. /usr/sbin/so-common
. /usr/sbin/so-image-common

REPLAYIFACE=${REPLAYIFACE:-$(lookup_pillar interface sensor)}
REPLAYIFACE=${REPLAYIFACE:-"{{pillar.sensor.interface}}"}
REPLAYSPEED=${REPLAYSPEED:-10}

mkdir -p /opt/so/samples
Expand Down Expand Up @@ -57,8 +57,8 @@ if ! docker ps | grep -q so-tcpreplay; then
fi

if is_sensor_node; then
echo "Replaying PCAP(s) at ${REPLAYSPEED} Mbps on interface ${REPLAYIFACE}..."
docker exec so-tcpreplay /usr/bin/bash -c "/usr/local/bin/tcpreplay -i ${REPLAYIFACE} -M${REPLAYSPEED} $@"
echo "Replaying PCAP(s) at ${REPLAYSPEED} Mbps on interface $REPLAYIFACE..."
docker exec so-tcpreplay /usr/bin/bash -c "/usr/local/bin/tcpreplay -i $REPLAYIFACE -M${REPLAYSPEED} $@"

echo "Replay completed. Warnings shown above are typically expected."
elif is_manager_node; then
Expand Down
Loading