Change in osmo-ci[master]: ansible: gsm-tester: Remove net iface name from hash input

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Sat Apr 6 20:18:29 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13518 )

Change subject: ansible: gsm-tester: Remove net iface name from hash input
......................................................................

ansible: gsm-tester: Remove net iface name from hash input

Otherwise every time the interface is added (ie when it goes back to
default netns), the generate name changes due to DEVPATH containing
current name at the end of the path.

Change-Id: I87c686caa23a3b39e48e0762d4323a59be7cd4b8
---
M ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules b/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
index a9826e2..376b214 100644
--- a/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
+++ b/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
@@ -5,6 +5,6 @@
 
 # If dev paths are too long (too many usb hubs in the path) (>IFNAMSIZ), ID_NET_NAME_PATH is not populated.
 ENV{DEVTYPE}=="wwan", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
-ENV{DEVTYPE}=="wwan", ENV{ID_NET_NAME_PATH}=="", PROGRAM="/bin/sh -ec 'echo ${DEVPATH} | sha1sum | head -c14'", NAME="r$result"
+ENV{DEVTYPE}=="wwan", ENV{ID_NET_NAME_PATH}=="", PROGRAM="/bin/sh -ec 'echo ${DEVPATH} | xargs dirname | sha1sum | head -c14'", NAME="r$result"
 
 LABEL="net_setup_link_end"

-- 
To view, visit https://gerrit.osmocom.org/13518
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I87c686caa23a3b39e48e0762d4323a59be7cd4b8
Gerrit-Change-Number: 13518
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190406/a719ffb6/attachment.html>


More information about the gerrit-log mailing list