[S] Change in libgtpnl[master]: tests/qemu: pass MS_PROTO to gtp-tunnel delete

2024-02-22 Thread laforge 
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email )

Change subject: tests/qemu: pass MS_PROTO to gtp-tunnel delete
..

tests/qemu: pass MS_PROTO to gtp-tunnel delete

The MS protocol needs to be passed to gtp-tunnel delete, instead of the
SGSN_GGSN_PROTO.

Fix for:
  + gtp-tunnel add gtp_sgsn v1 200 100 172.99.0.1 fd00::2
  …
  + gtp-tunnel delete gtp_sgsn v1 200 ip6
  genl_socket_talk: No such file or directory

Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
---
M tests/qemu/00_test_functions.sh
M tests/qemu/01_ms_ip4_sgsn_ip4.sh
M tests/qemu/02_ms_ip4_sgsn_ip6.sh
M tests/qemu/03_ms_ip6_sgsn_ip4.sh
M tests/qemu/04_ms_ip6_sgsn_ip6.sh
5 files changed, 25 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved




diff --git a/tests/qemu/00_test_functions.sh b/tests/qemu/00_test_functions.sh
index c4813ab..5839363 100644
--- a/tests/qemu/00_test_functions.sh
+++ b/tests/qemu/00_test_functions.sh
@@ -8,6 +8,7 @@

 # MS - SGSN -gtp- GGSN - WEBSERVER
 tunnel_start() {
+   test -n "$MS_PROTO"
test -n "$MS"
test -n "$MS_PREFLEN"
test -n "$SGSN_GGSN_PROTO"
@@ -67,9 +68,9 @@

ip link del veth_sgsn
ip route del "$WEBSERVER"/"$MS_PREFLEN" dev gtp_sgsn
-   gtp-tunnel delete gtp_sgsn v1 200 "$SGSN_GGSN_PROTO"
+   gtp-tunnel delete gtp_sgsn v1 200 "$MS_PROTO"
gtp-link del gtp_sgsn
-   ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$SGSN_GGSN_PROTO"
+   ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$MS_PROTO"
ggsn_side gtp-link del gtp_ggsn
ip netns del ggsn_side
 }
diff --git a/tests/qemu/01_ms_ip4_sgsn_ip4.sh b/tests/qemu/01_ms_ip4_sgsn_ip4.sh
index 42e2842..4789483 100644
--- a/tests/qemu/01_ms_ip4_sgsn_ip4.sh
+++ b/tests/qemu/01_ms_ip4_sgsn_ip4.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip"
 MS="172.99.0.1"
 MS_PREFLEN="32"
 SGSN_GGSN_PROTO="ip"
diff --git a/tests/qemu/02_ms_ip4_sgsn_ip6.sh b/tests/qemu/02_ms_ip4_sgsn_ip6.sh
index b5858ab..2a489cd 100644
--- a/tests/qemu/02_ms_ip4_sgsn_ip6.sh
+++ b/tests/qemu/02_ms_ip4_sgsn_ip6.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip"
 MS="172.99.0.1"
 MS_PREFLEN="32"
 SGSN_GGSN_PROTO="ip6"
diff --git a/tests/qemu/03_ms_ip6_sgsn_ip4.sh b/tests/qemu/03_ms_ip6_sgsn_ip4.sh
index 12793b0..f873faf 100644
--- a/tests/qemu/03_ms_ip6_sgsn_ip4.sh
+++ b/tests/qemu/03_ms_ip6_sgsn_ip4.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip6"
 MS="fd00::"
 MS_PREFLEN="64"
 SGSN_GGSN_PROTO="ip"
diff --git a/tests/qemu/04_ms_ip6_sgsn_ip6.sh b/tests/qemu/04_ms_ip6_sgsn_ip6.sh
index 6c2f13f..483a9d7 100644
--- a/tests/qemu/04_ms_ip6_sgsn_ip6.sh
+++ b/tests/qemu/04_ms_ip6_sgsn_ip6.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip6"
 MS="fc00::"
 MS_PREFLEN="64"
 SGSN_GGSN_PROTO="ip6"

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
Gerrit-Change-Number: 36032
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in libgtpnl[master]: tests/qemu: pass MS_PROTO to gtp-tunnel delete

2024-02-22 Thread laforge 
Attention is currently required from: osmith.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email )

Change subject: tests/qemu: pass MS_PROTO to gtp-tunnel delete
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
Gerrit-Change-Number: 36032
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 22 Feb 2024 10:22:42 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: tests/qemu: pass MS_PROTO to gtp-tunnel delete

2024-02-21 Thread pespin 
Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email )

Change subject: tests/qemu: pass MS_PROTO to gtp-tunnel delete
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
Gerrit-Change-Number: 36032
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Wed, 21 Feb 2024 12:29:43 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: tests/qemu: pass MS_PROTO to gtp-tunnel delete

2024-02-21 Thread osmith 
osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email )


Change subject: tests/qemu: pass MS_PROTO to gtp-tunnel delete
..

tests/qemu: pass MS_PROTO to gtp-tunnel delete

The MS protocol needs to be passed to gtp-tunnel delete, instead of the
SGSN_GGSN_PROTO.

Fix for:
  + gtp-tunnel add gtp_sgsn v1 200 100 172.99.0.1 fd00::2
  …
  + gtp-tunnel delete gtp_sgsn v1 200 ip6
  genl_socket_talk: No such file or directory

Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
---
M tests/qemu/00_test_functions.sh
M tests/qemu/01_ms_ip4_sgsn_ip4.sh
M tests/qemu/02_ms_ip4_sgsn_ip6.sh
M tests/qemu/03_ms_ip6_sgsn_ip4.sh
M tests/qemu/04_ms_ip6_sgsn_ip6.sh
5 files changed, 25 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/32/36032/1

diff --git a/tests/qemu/00_test_functions.sh b/tests/qemu/00_test_functions.sh
index c4813ab..5839363 100644
--- a/tests/qemu/00_test_functions.sh
+++ b/tests/qemu/00_test_functions.sh
@@ -8,6 +8,7 @@

 # MS - SGSN -gtp- GGSN - WEBSERVER
 tunnel_start() {
+   test -n "$MS_PROTO"
test -n "$MS"
test -n "$MS_PREFLEN"
test -n "$SGSN_GGSN_PROTO"
@@ -67,9 +68,9 @@

ip link del veth_sgsn
ip route del "$WEBSERVER"/"$MS_PREFLEN" dev gtp_sgsn
-   gtp-tunnel delete gtp_sgsn v1 200 "$SGSN_GGSN_PROTO"
+   gtp-tunnel delete gtp_sgsn v1 200 "$MS_PROTO"
gtp-link del gtp_sgsn
-   ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$SGSN_GGSN_PROTO"
+   ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$MS_PROTO"
ggsn_side gtp-link del gtp_ggsn
ip netns del ggsn_side
 }
diff --git a/tests/qemu/01_ms_ip4_sgsn_ip4.sh b/tests/qemu/01_ms_ip4_sgsn_ip4.sh
index 42e2842..4789483 100644
--- a/tests/qemu/01_ms_ip4_sgsn_ip4.sh
+++ b/tests/qemu/01_ms_ip4_sgsn_ip4.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip"
 MS="172.99.0.1"
 MS_PREFLEN="32"
 SGSN_GGSN_PROTO="ip"
diff --git a/tests/qemu/02_ms_ip4_sgsn_ip6.sh b/tests/qemu/02_ms_ip4_sgsn_ip6.sh
index b5858ab..2a489cd 100644
--- a/tests/qemu/02_ms_ip4_sgsn_ip6.sh
+++ b/tests/qemu/02_ms_ip4_sgsn_ip6.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip"
 MS="172.99.0.1"
 MS_PREFLEN="32"
 SGSN_GGSN_PROTO="ip6"
diff --git a/tests/qemu/03_ms_ip6_sgsn_ip4.sh b/tests/qemu/03_ms_ip6_sgsn_ip4.sh
index 12793b0..f873faf 100644
--- a/tests/qemu/03_ms_ip6_sgsn_ip4.sh
+++ b/tests/qemu/03_ms_ip6_sgsn_ip4.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip6"
 MS="fd00::"
 MS_PREFLEN="64"
 SGSN_GGSN_PROTO="ip"
diff --git a/tests/qemu/04_ms_ip6_sgsn_ip6.sh b/tests/qemu/04_ms_ip6_sgsn_ip6.sh
index 6c2f13f..483a9d7 100644
--- a/tests/qemu/04_ms_ip6_sgsn_ip6.sh
+++ b/tests/qemu/04_ms_ip6_sgsn_ip6.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 . /tests/00_test_functions.sh

+MS_PROTO="ip6"
 MS="fc00::"
 MS_PREFLEN="64"
 SGSN_GGSN_PROTO="ip6"

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400
Gerrit-Change-Number: 36032
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange