October 2024 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: Fix 'update route' vty command

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38348?usp=email ) Change subject: Fix 'update route' vty command ...................................................................... Fix 'update route' vty command Optional param marks in VTY command descriptions are only supported per token, spanning a list of params is not supported and fails matching. Related: SYS#7112 Change-Id: I28d3b587ae5d6ca7f494221e2bfc39357a45736d --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 37 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/48/38348/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I28d3b587ae5d6ca7f494221e2bfc39357a45736d Gerrit-Change-Number: 38348 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

8 months, 2 weeks

1
0
0 0

[L] Change in libosmo-sigtran[master]: tests/vty: Add vty-transcript-test for osmo-stp

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38347?usp=email ) Change subject: tests/vty: Add vty-transcript-test for osmo-stp ...................................................................... tests/vty: Add vty-transcript-test for osmo-stp So far we were only testing vty transcript for libosmo-sccp in ASP mode (osmo_ss7_vty_init_asp()). Let's also test in SG mode (osmo_ss7_vty_init_sg()), the one used in osmo-stp. Last command in SG-only node "route-table system" shows a current bug in command "update route", returning "% Unknown command.". Related: SYS#7112 Change-Id: If2f069b9d724038c326f5c35848faa1e9c216fd5 --- M tests/vty/Makefile.am A tests/vty/osmo_stp_test.vty 2 files changed, 589 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/47/38347/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If2f069b9d724038c326f5c35848faa1e9c216fd5 Gerrit-Change-Number: 38347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

8 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Fix 'update route' vty command

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38348?usp=email ) Change subject: Fix 'update route' vty command ...................................................................... Fix 'update route' vty command Optional param marks in VTY command descriptions are only supported per token, spanning a list of params is not supported and fails matching. Related: OS#6586 Change-Id: I28d3b587ae5d6ca7f494221e2bfc39357a45736d --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 37 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/48/38348/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index f1b0a1c..fb224d1 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -341,7 +341,7 @@ } DEFUN_ATTR(cs7_rt_upd, cs7_rt_upd_cmd, - "update route POINT_CODE MASK linkset LS_NAME [priority PRIO] [qos-class (CLASS|default)]", + "update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(CLASS|default)]", "Update the Route\n" "Update the Route\n" "Destination Point Code\n" @@ -380,6 +380,23 @@ return CMD_WARNING; } + switch (argc) { + case 3: + return CMD_SUCCESS; + case 5: + if (strcmp(argv[3], "priority") != 0 && + strcmp(argv[3], "qos-class") != 0) + return CMD_WARNING; + break; /* Parse values below */ + case 7: + if (strcmp(argv[3], "priority") != 0 && + strcmp(argv[5], "qos-class") != 0) + return CMD_WARNING; + break; /* Parse values below */ + default: + return CMD_WARNING; + } + argind = 3; if (argc > argind && !strcmp(argv[argind], "priority")) { argind++; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index c952bbe..95f5d02 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -568,7 +568,24 @@ OsmoSTP(config-cs7)# route-table system OsmoSTP(config-cs7-rt)# list ... - update route POINT_CODE MASK linkset LS_NAME [priority PRIO] [qos-class (CLASS|default)] + update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(CLASS|default)] remove route POINT_CODE MASK OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 5 -% Unknown command. +OsmoSTP(config-cs7-rt)# show running-config +... +cs7 instance 0 +... + route-table system + update route 3.2.1 7.255.7 linkset my-ass priority 5 +... +cs7 instance 1 +... + route-table system +... !update route 3.2.1 7.255.7 linkset my-ass priority 5 +OsmoSTP(config-cs7-rt)# remove route 3.2.1 7.255.7 +OsmoSTP(config-cs7-rt)# show running-config +... +cs7 instance 0 +... + route-table system +... !update route 3.2.1 7.255.7 linkset my-ass priority 5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I28d3b587ae5d6ca7f494221e2bfc39357a45736d Gerrit-Change-Number: 38348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[L] Change in libosmo-sigtran[master]: tests/vty: Add vty-transcript-test for osmo-stp

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38347?usp=email ) Change subject: tests/vty: Add vty-transcript-test for osmo-stp ...................................................................... tests/vty: Add vty-transcript-test for osmo-stp So far we were only testing vty transcript for libosmo-sccp in ASP mode (osmo_ss7_vty_init_asp()). Let's also test in SG mode (osmo_ss7_vty_init_sg()), the one used in osmo-stp. Last command in SG-only node "route-table system" shows a current bug in command "update route", returning "% Unknown command.". Related: OS#6586 Change-Id: If2f069b9d724038c326f5c35848faa1e9c216fd5 --- M tests/vty/Makefile.am A tests/vty/osmo_stp_test.vty 2 files changed, 589 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/47/38347/1 diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am index 7f67d75..f0bbcb3 100644 --- a/tests/vty/Makefile.am +++ b/tests/vty/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) EXTRA_DIST = \ + osmo_stp_test.vty \ ss7_asp_test.vty \ vty_test_runner.py \ $(NULL) @@ -27,15 +28,25 @@ vty-python-test: $(top_builddir)/stp/osmo-stp $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v -# To update the VTY script from current application behavior, -# pass -u to osmo_verify_transcript_vty.py by doing: -# make vty-test U=-u -vty-transcript-test: ss7_asp_vty_test +vty-transcript-test-stp: $(top_builddir)/stp/osmo-stp + osmo_verify_transcript_vty.py -v \ + -n OsmoSTP -p 4239 \ + -r "$(top_builddir)/stp/osmo-stp -c $(top_srcdir)/doc/examples/osmo-stp.cfg" \ + $(U) $(srcdir)/osmo_stp_*.vty + +vty-transcript-test-asp: ss7_asp_vty_test osmo_verify_transcript_vty.py -v \ -p 42043 \ -r "$(builddir)/ss7_asp_vty_test" \ $(U) $(srcdir)/ss7_asp_*.vty +# To update the VTY script from current application behavior, +# pass -u to osmo_verify_transcript_vty.py by doing: +# make vty-test U=-u +vty-transcript-test: + $(MAKE) vty-transcript-test-stp +# $(MAKE) vty-transcript-test-asp + # don't run multiple tests concurrently so that the ports don't conflict vty-test: $(MAKE) vty-python-test diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty new file mode 100644 index 0000000..c952bbe --- /dev/null +++ b/tests/vty/osmo_stp_test.vty @@ -0,0 +1,574 @@ +OsmoSTP> list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 (sua|m3ua|ipa) (sctp|tcp) [<0-65534>] + show cs7 config + show cs7 instance <0-15> asp + show cs7 instance <0-15> asp name ASP_NAME + show cs7 instance <0-15> asp-remaddr + show cs7 instance <0-15> asp-remaddr name ASP_NAME + show cs7 instance <0-15> asp-assoc-status + show cs7 instance <0-15> asp-assoc-status name ASP_NAME + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> route + show cs7 instance <0-15> sccp addressbook + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers +... !show cs7 + +OsmoSTP> enable +OsmoSTP# list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 (sua|m3ua|ipa) (sctp|tcp) [<0-65534>] + show cs7 config + cs7 instance <0-15> asp NAME disconnect + show cs7 instance <0-15> asp + show cs7 instance <0-15> asp name ASP_NAME + show cs7 instance <0-15> asp-remaddr + show cs7 instance <0-15> asp-remaddr name ASP_NAME + show cs7 instance <0-15> asp-assoc-status + show cs7 instance <0-15> asp-assoc-status name ASP_NAME + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> route + show cs7 instance <0-15> sccp addressbook + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers +... !show cs7 + +OsmoSTP# show ? +... + cs7 ITU-T Signaling System 7 +... + +OsmoSTP# show cs7 ? + instance An instance of the SS7 stack + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + config Currently running cs7 configuration + +OsmoSTP# show cs7 m3ua ? + [<0-65534>] Local Port Number + sctp SCTP (Stream Control Transmission Protocol) + tcp TCP (Transmission Control Protocol) + +OsmoSTP# show cs7 m3ua 2905 ? + <cr> + +OsmoSTP# show cs7 m3ua sctp ? + [<0-65534>] Local Port Number + +OsmoSTP# show cs7 m3ua sctp 2905 ? + <cr> + +OsmoSTP# show cs7 instance ? + <0-15> An instance of the SS7 stack + +OsmoSTP# show cs7 instance 0 ? + users User Table + asp Application Server Process (ASP) + asp-remaddr Application Server Process (ASP) remote addresses information + asp-assoc-status Application Server Process (ASP) SCTP association status + as Application Server (AS) + route Routing Table + sccp Signalling Connection Control Part + +OsmoSTP# show cs7 instance 0 as ? + active Display all active ASs + all Display all ASs (default) + m3ua Display all m3ua ASs + sua Display all SUA ASs + +OsmoSTP# show cs7 instance 0 sccp ? + addressbook List all SCCP addressbook entries + users Show List of SCCP Users registered + ssn Find an SCCP User registered for the given SSN + connections Show List of active SCCP connections + timers Show List of SCCP timers + +OsmoSTP# show cs7 instance 0 sccp ssn ? + <0-65535> Subsystem Number (SSN) + +OsmoSTP# configure terminal +OsmoSTP(config)# cs7 instance 0 + +OsmoSTP(config-cs7)# list +... + description .TEXT + network-indicator (international | national | reserved | spare) + point-code POINT_CODE + secondary-pc POINT_CODE + point-code format <1-24> [<1-23>] [<1-22>] + point-code format default + point-code delimiter (default|dash) + xua rkm routing-key-allocation (static-only|dynamic-permitted) + asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) + asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) (sctp|tcp) + no asp NAME + as NAME (sua|m3ua|ipa) + no as NAME + sccp-address NAME + no sccp-address NAME + route-table system + listen (sua|m3ua|ipa) <0-65534> [(sctp|tcp)] + no listen (sua|m3ua|ipa) <0-65534> [(sctp|tcp)] + sccp-timer (conn_est|ias|iar|rel|repeat_rel|int|guard|reset|reassembly) <1-999999> + sccp max-optional-data (<0-999999>|standard) + +OsmoSTP(config-cs7)# ? +... + description Save human-readable description of the object + network-indicator Configure the Network Indicator + point-code Configure the local Point Code + secondary-pc Configure the local Secondary Point Code + xua SIGTRAN xxxUA related + asp Configure Application Server Process + no Negate a command or set its defaults + as Configure an Application Server + sccp-address Create/Modify an SCCP addressbook entry + route-table Specify the name of the route table + listen Configure/Enable xUA Listener + sccp-timer Configure SCCP timer values, see ITU-T Q.714 + sccp Configure SCCP behavior + +OsmoSTP(config-cs7)# description ? + TEXT Text until the end of the line + +OsmoSTP(config-cs7)# network-indicator ? + international International Network + national National Network + reserved Reserved Network + spare Spare Network + +OsmoSTP(config-cs7)# point-code ? + POINT_CODE Point Code + format Configure Point Code Format + delimiter Configure Point Code Delimiter + +OsmoSTP(config-cs7)# point-code format ? + <1-24> Length of first PC component + default Default Point Code Format (3.8.3) +OsmoSTP(config-cs7)# point-code format 1 ? + [<1-23>] Length of second PC component +OsmoSTP(config-cs7)# point-code format 1 1 ? + [<1-22>] Length of third PC component + +OsmoSTP(config-cs7)# point-code delimiter ? + default Use dot as delimiter + dash User dash as delimiter + +OsmoSTP(config-cs7)# xua ? + rkm Routing Key Management +OsmoSTP(config-cs7)# xua rkm ? + routing-key-allocation Routing Key Management Allocation Policy +OsmoSTP(config-cs7)# xua rkm routing-key-allocation ? + static-only Only static (pre-configured) Routing Keys permitted + dynamic-permitted Dynamically allocate Routing Keys for what ASPs request + +OsmoSTP(config-cs7)# asp ? + NAME Name of ASP +OsmoSTP(config-cs7)# asp foo ? + <0-65535> Remote port number +OsmoSTP(config-cs7)# asp foo 0 ? + <0-65535> Local port number +OsmoSTP(config-cs7)# asp foo 0 0 ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) +OsmoSTP(config-cs7)# asp foo 0 0 m3ua ? + sctp SCTP (Stream Control Transmission Protocol) + tcp TCP (Transmission Control Protocol) + <cr> + +OsmoSTP(config-cs7)# as ? + NAME Name of the Application Server +OsmoSTP(config-cs7)# as foo ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +OsmoSTP(config-cs7)# sccp-address ? + NAME Name of the SCCP Address + +OsmoSTP(config-cs7)# no ? + asp Disable Application Server Process + as Disable Application Server + sccp-address Delete an SCCP addressbook entry + listen Disable xUA Listener on given port +OsmoSTP(config-cs7)# no asp ? + NAME Name of ASP +OsmoSTP(config-cs7)# no as ? + NAME Name of AS +OsmoSTP(config-cs7)# no sccp-address ? + NAME Name of the SCCP Address + +OsmoSTP(config-cs7)# sccp-address foo +OsmoSTP(config-cs7-sccpaddr)# list +... + no point-code + no subsystem-number + no global-title + routing-indicator (GT|PC|IP) + point-code POINT_CODE + subsystem-number <0-4294967295> + global-title +OsmoSTP(config-cs7-sccpaddr)# ? +... + no Negate a command or set its defaults + routing-indicator Add Routing Indicator + point-code Add point-code Number + subsystem-number Add Subsystem Number + global-title Add/Modify Global Title + +OsmoSTP(config-cs7-sccpaddr)# point-code 1.2.3 + +OsmoSTP(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook + +Name RI: PC: SSN: GT: +------------ --- --------- ---------- --------------------------------------- +foo PC 1.2.3 (none) (none) + +OsmoSTP(config-cs7-sccpaddr)# exit + +OsmoSTP(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar +Error: SCCP address name too long: 'foobarfoobarfoobarfoobarfoobarfoobar' +% Command incomplete. + +OsmoSTP(config-cs7)# exit +OsmoSTP(config)# cs7 instance 1 +OsmoSTP(config-cs7)# sccp-address foo +Error: SCCP address name already used in cs7 instance 0: 'foo' +% Command incomplete. +OsmoSTP(config-cs7)# sccp-address bar +OsmoSTP(config-cs7-sccpaddr)# point-code 1.2.3 +OsmoSTP(config-cs7-sccpaddr)# exit +OsmoSTP(config-cs7)# exit +OsmoSTP(config)# no cs7 instance 1 +% Unknown command. + +OsmoSTP(config)# cs7 instance 0 + +OsmoSTP(config-cs7)# asp my-asp 12345 54321 m3ua +OsmoSTP(config-cs7-asp)# list +... + description .TEXT + remote-ip (A.B.C.D|X:X::X:X) [primary] + no remote-ip (A.B.C.D|X:X::X:X) + local-ip (A.B.C.D|X:X::X:X) [primary] + no local-ip (A.B.C.D|X:X::X:X) + qos-class <0-255> + role (sg|asp|ipsp) + transport-role (client|server) + sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> + no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) + block + shutdown +... + +OsmoSTP(config-cs7-asp)# ? +... + description Save human-readable description of the object + remote-ip Specify Remote IP Address of ASP + no Negate a command or set its defaults + local-ip Specify Local IP Address from which to contact ASP + qos-class Specify QoS Class of ASP + role Specify the xUA role for this ASP + transport-role Specify the transport layer role for this ASP + sctp-param Configure SCTP parameters + block Allows a SCTP Association with ASP, but doesn't let it become active + shutdown Terminates SCTP association; New associations will be rejected +... + +OsmoSTP(config-cs7-asp)# no ? +... + sctp-param Configure SCTP parameters + quirk Disable quirk to work around interop issues +... + +OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.200 +OsmoSTP(config-cs7-asp)# local-ip 127.0.0.100 +OsmoSTP(config-cs7-asp)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp ? uninitialized m3ua sg server 127.0.0.100:54321 127.0.0.200:12345 +OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.201 +OsmoSTP(config-cs7-asp)# local-ip 127.0.0.101 +OsmoSTP(config-cs7-asp)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp ? uninitialized m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 +OsmoSTP(config-cs7-asp)# ! Mark as primary: +OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.201 primary +OsmoSTP(config-cs7-asp)# ! 'local-ip 127.0.0.101 primary' cannot be tested here since output may be different based on sysctl available +OsmoSTP(config-cs7-asp)# local-ip 127.0.0.101 +... +OsmoSTP(config-cs7-asp)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp ? uninitialized m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201*):12345 +OsmoSTP(config-cs7-asp)# show running-config +... + local-ip 127.0.0.100 + local-ip 127.0.0.101 + remote-ip 127.0.0.200 + remote-ip 127.0.0.201 primary +... +end +OsmoSTP(config-cs7-asp)# ! Mark as non-primary: +OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.201 +OsmoSTP(config-cs7-asp)# local-ip 127.0.0.101 +OsmoSTP(config-cs7-asp)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp ? uninitialized m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 +OsmoSTP(config-cs7-asp)# show running-config +... + local-ip 127.0.0.100 + local-ip 127.0.0.101 + remote-ip 127.0.0.200 + remote-ip 127.0.0.201 +... +end +OsmoSTP(config-cs7-asp)# exit + +OsmoSTP(config-cs7)# as my-ass m3ua +OsmoSTP(config-cs7-as)# list +... + description .TEXT + asp NAME + no asp NAME + traffic-mode (broadcast | loadshare | roundrobin | override) + no traffic-mode + recovery-timeout <1-2000> + qos-class <0-255> + routing-key RCONTEXT DPC + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) + routing-key RCONTEXT DPC ssn SSN + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN + point-code override dpc PC + point-code override patch-sccp (disabled|both) + +OsmoSTP(config-cs7-as)# ? +... + description Save human-readable description of the object + asp Specify that a given ASP is part of this AS + no Negate a command or set its defaults + traffic-mode Specifies traffic mode of operation of the ASP within the AS + recovery-timeout Specifies the recovery timeout value in milliseconds + qos-class Specity QoS Class of AS + routing-key Define a routing key + point-code Point Code Specific Features + +OsmoSTP(config-cs7-as)# no ? + asp Specify ASP to be removed from this AS + traffic-mode Remove explicit traffic mode of operation of this AS + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 0.0.0 override + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as active + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as sua + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as m3ua + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 0.0.0 override + +OsmoSTP(config-cs7-as)# asp my-asp +OsmoSTP(config-cs7-as)# routing-key 0 3.2.1 + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 + +OsmoSTP(config-cs7-as)# exit +OsmoSTP(config-cs7)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 + +OsmoSTP(config-cs7)# exit + + +OsmoSTP(config)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- +my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 + +OsmoSTP(config)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 3.2.1 override + + + +OsmoSTP(config)# show running-config +... +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp my-asp 12345 54321 m3ua + local-ip 127.0.0.100 + local-ip 127.0.0.101 + remote-ip 127.0.0.200 + remote-ip 127.0.0.201 + role sg + sctp-role server + as my-ass m3ua + asp my-asp + routing-key 0 3.2.1 + route-table system + listen m3ua 2905 + local-ip :: + accept-asp-connections dynamic-permitted + sccp-address foo + routing-indicator PC + point-code 1.2.3 +cs7 instance 1 + route-table system + sccp-address bar + routing-indicator PC + point-code 1.2.3 +end + +OsmoSTP(config)# do show cs7 instance 0 users + +OsmoSTP(config)# do show cs7 m3ua +xUA server for m3ua/sctp on (::ffff:127.0.0.1|::1%1|::ffff:192.168.1.140|fe80::b1c9:4852:85d8:c04c%enp0s20f0u2u4u1|::ffff:10.26.31.247|::ffff:10.26.30.247|fe80::f7b7:d1d9:ddaf:7e6%wlp59s0|::ffff:192.168.1.142):2905 is listening + +OsmoSTP(config)# cs7 instance 0 +OsmoSTP(config-cs7)# no asp unknown-asp +No ASP named 'unknown-asp' found + +OsmoSTP(config-cs7)# no asp my-asp + +OsmoSTP(config-cs7)# do show cs7 instance 0 asp +ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses +------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- + +OsmoSTP(config-cs7)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 3.2.1 override + + +OsmoSTP(config-cs7)# do show cs7 instance 0 sccp timers +SS7 instance 0 has no SCCP initialized + +OsmoSTP(config-cs7)# show running-config +... !sccp-timer + +OsmoSTP(config-cs7)# sccp-timer ias 5 +OsmoSTP(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 60 +sccp-timer ias 5 +sccp-timer iar 900 +sccp-timer rel 10 +sccp-timer repeat_rel 10 +sccp-timer int 60 +sccp-timer guard 1380 +sccp-timer reset 10 +sccp-timer reassembly 10 +OsmoSTP(config-cs7)# show running-config +... !sccp-timer + sccp-timer ias 5 +... !sccp-timer + +OsmoSTP(config-cs7)# sccp-timer ias 420 +OsmoSTP(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 60 +sccp-timer ias 420 +sccp-timer iar 900 +sccp-timer rel 10 +sccp-timer repeat_rel 10 +sccp-timer int 60 +sccp-timer guard 1380 +sccp-timer reset 10 +sccp-timer reassembly 10 +OsmoSTP(config-cs7)# show running-config +... !sccp-timer + +OsmoSTP(config-cs7)# sccp-timer? + sccp-timer Configure SCCP timer values, see ITU-T Q.714 + +OsmoSTP(config-cs7)# sccp-timer ? + conn_est Waiting for connection confirm message, 1 to 2 minutes (default: 60) + ias Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes (default: 420) + iar Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes (default: 900) + rel Waiting for release complete message, 10 to 20 seconds (default: 10) + repeat_rel Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds (default: 10) + int Waiting for release complete message; or to release connection resources, freeze the LRN and alert a maintenance function after the initial expiry, extending to 1 minute (default: 60) + guard Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes (default: 1380) + reset Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds (default: 10) + reassembly Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds (default: 10) + +OsmoSTP(config-cs7)# sccp-timer conn_est ? + <1-999999> Timer value, in seconds + +OsmoSTP(config-cs7)# sccp ? + max-optional-data Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages. For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload, and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130 bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP peers. + +OsmoSTP(config-cs7)# sccp max-optional-data ? + <0-999999> Set a non-standard maximum allowed number of bytes + standard Use the ITU-T Q.713 4.2 to 4.5 standard value of 130 + +OsmoSTP(config-cs7)# show running-config +... !sccp max-optional-data + +OsmoSTP(config-cs7)# sccp max-optional-data 0 +OsmoSTP(config-cs7)# show running-config +... + sccp max-optional-data 0 +... + +OsmoSTP(config-cs7)# sccp max-optional-data 123 +OsmoSTP(config-cs7)# show running-config +... + sccp max-optional-data 123 +... + +OsmoSTP(config-cs7)# sccp max-optional-data 999999 +OsmoSTP(config-cs7)# show running-config +... +cs7 instance 0 +... + sccp max-optional-data 999999 +... +cs7 instance 1 +... !sccp max-optional-data + +OsmoSTP(config-cs7)# sccp max-optional-data standard +OsmoSTP(config-cs7)# show running-config +... !sccp max-optional-data + +OsmoSTP(config-cs7)# sccp max-optional-data 130 +OsmoSTP(config-cs7)# show running-config +... !sccp max-optional-data + +OsmoSTP(config-cs7)# route-table system +OsmoSTP(config-cs7-rt)# list +... + update route POINT_CODE MASK linkset LS_NAME [priority PRIO] [qos-class (CLASS|default)] + remove route POINT_CODE MASK +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 5 +% Unknown command. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If2f069b9d724038c326f5c35848faa1e9c216fd5 Gerrit-Change-Number: 38347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: tlv/cosmetic: improve import of osmocom functions

by osmith

Attention is currently required from: dexter, fixeria, laforge. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email ) Change subject: tlv/cosmetic: improve import of osmocom functions ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/python/pyosmocom/+/38288/comment/4986ee58_cd43… : PS1, Line 9: We can import osmocom and then reference > sadly we now have a tagged 0.0.5 without this patch despite my explicit comment here. Sorry, I did not get a mail notification for this. Just saw this by chance now. But we can tag 0.0.6. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a Gerrit-Change-Number: 38288 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 13:54:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: move ggsn testsuite

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email to look at the new patch set (#2). Change subject: jobs/ttcn3-testsuites-testenv: move ggsn testsuite ...................................................................... jobs/ttcn3-testsuites-testenv: move ggsn testsuite Run the GGSN testsuite in all combinations (osmo-ggsn, osmo-ggsn with various kernels and kernel gtp-u, open5gs) with testenv. Depends: osmo-ttcn3-hacks I3f9db4325d5928c809cc99bc82d9cb82bf9e71eb Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 --- M jobs/ttcn3-testsuites-testenv.yml M jobs/ttcn3-testsuites.yml 2 files changed, 67 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/46/38346/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 Gerrit-Change-Number: 38346 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

8 months, 2 weeks

1
0
0 0

[L] Change in osmo-ci[master]: jobs/build-kernels-testenv: new jobs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email ) Change subject: jobs/build-kernels-testenv: new jobs ...................................................................... jobs/build-kernels-testenv: new jobs Prepare to replace the docker-playground based jobs for running osmo-ggsn in QEMU with a kernel built from source with testenv. Split the part that builds the kernels into extra jobs that export the built kernels as artifacts. This makes it easier to use kernels outside of jenkins too and it allows retriggering only a testsuite run without also building the kernel again. The fragment.config is imported from docker-playground current master 978adc, path: ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config Change-Id: Id64a1a778fa38eec20498c36b390332f75d7d3f5 --- M jobs/README.md A jobs/build-kernels-testenv.yml A scripts/kernel/build.sh A scripts/kernel/fragment.config 4 files changed, 378 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/38345/1 diff --git a/jobs/README.md b/jobs/README.md index 56b5dfd..f7e704e 100644 --- a/jobs/README.md +++ b/jobs/README.md @@ -162,6 +162,7 @@ 22:XX coverity 22:XX octsim_osmo-ccid-firmware 22:XX osmo-gsm-tester-runner (virtual) + 23:XX build-kernels-testenv 23:XX master-builds-dahdi 00:XX osmocom-api 00:XX registry-update-base-images diff --git a/jobs/build-kernels-testenv.yml b/jobs/build-kernels-testenv.yml new file mode 100644 index 0000000..3e9ad75 --- /dev/null +++ b/jobs/build-kernels-testenv.yml @@ -0,0 +1,83 @@ +--- +- project: + name: 'build-kernels' + concurrent: false + description: | + Build kernels to be used with osmo-ttcn3-hacks to run SUT in QEMU. + + Git repository: + <code>{url}</code> + + Branch: + <code>{branch}</code> + jobs: + - "{job-name}" + branch: master + job-name: + - build-kernel-net-next: + url: "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" + branch: main + - build-kernel-torvalds: + url: "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" + +- job-template: + name: '{job-name}' + project-type: freestyle + defaults: global + description: '{obj:description}' + # Limit to 1 node to save space on others + node: "build4-deb12build-ansible" + concurrent: false + parameters: + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' + - string: + name: BRANCH_KERNEL + description: Branch of the kernel repository + default: '{branch}' + - string: + name: BRANCH_CI + description: Branch of osmo-ci.git (has scripts/kernel/build.sh) + default: 'master' + builders: + - shell: |- + IMAGE="osmocom-build/debian-bookworm-osmo-ttcn3-testenv" + podman pull "registry.osmocom.org/$IMAGE" + + rm -rf output osmo-ci + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b "$BRANCH_CI" + osmo-ci/scripts/kernel/build.sh + scm: + - git: + branches: + - '$BRANCH_KERNEL' + url: "{obj:url}" + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + refspec: '$BRANCH_KERNEL' + shallow-clone: true + wipe-workspace: false + clean: + before: true + triggers: + - timed: "H 23 * * *" + publishers: + - email: + notify-every-unstable-build: false + recipients: '$EMAIL_NOTIFICATIONS' + send-to-individuals: false + - archive: + allow-empty: false + artifacts: output/**/* + case-sensitive: true + default-excludes: true + fingerprint: false + only-if-success: false + properties: + - build-discarder: + num-to-keep: 10 + wrappers: + - ansicolor: + colormap: xterm diff --git a/scripts/kernel/build.sh b/scripts/kernel/build.sh new file mode 100755 index 0000000..cc69a0d --- /dev/null +++ b/scripts/kernel/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh -ex +IMAGE="debian-bookworm-osmo-ttcn3-testenv" +SCRIPT_DIR="$(realpath "$(dirname "$0")")" + +mkdir -p output + +podman run \ + --rm \ + -v "$SCRIPT_DIR:/scripts/kernel/" \ + -v "$PWD:$PWD" \ + -w "$PWD" \ + "$IMAGE" \ + timeout 3h sh -exc ' + make defconfig + scripts/kconfig/merge_config.sh -m .config /scripts/kernel/fragment.config + make olddefconfig + make "-j$(nproc)" + cp arch/x86/boot/bzImage output/linux + ' | tee output/build.log diff --git a/scripts/kernel/fragment.config b/scripts/kernel/fragment.config new file mode 100644 index 0000000..b6e2071 --- /dev/null +++ b/scripts/kernel/fragment.config @@ -0,0 +1,275 @@ +# CONFIG_ACPI_BGRT is not set +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_EFI_STUB is not set +CONFIG_FAILOVER=y +CONFIG_FDDI=y +CONFIG_GTP=y +CONFIG_HAMRADIO=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_SET=y +CONFIG_LEGACY_VSYSCALL_EMULATE=y +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +CONFIG_LIBCRC32C=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_NAT=y +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +CONFIG_NET_9P=y +CONFIG_NET_FAILOVER=y +CONFIG_NF_LOG_COMMON=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_LOG_IPV6=y +CONFIG_OVERLAY_FS=y +CONFIG_PAGE_REPORTING=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_PCIEAER=y +# CONFIG_R8169 is not set +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RAS=y +# CONFIG_RCU_TRACE is not set +# CONFIG_REALTEK_PHY is not set +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_OSSEMUL=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_UEVENT_HELPER=y +# CONFIG_USB is not set +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_ACPI_EXTLOG is not set +# CONFIG_ACRN_GUEST is not set +# CONFIG_AIX_PARTITION is not set +CONFIG_AMIGA_PARTITION=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +# CONFIG_ATARI_PARTITION is not set +# CONFIG_AX25 is not set +CONFIG_BALLOON_COMPACTION=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_CMDLINE_PARTITION is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_CRYPTO_ENGINE=y +CONFIG_CRYPTO_LIB_DES=y +# CONFIG_DEFXX is not set +# CONFIG_DRM_VIRTIO_GPU is not set +CONFIG_EDAC=y +# CONFIG_EDAC_AMD64 is not set +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=y +# CONFIG_EDAC_E752X is not set +# CONFIG_EDAC_I10NM is not set +# CONFIG_EDAC_I3000 is not set +# CONFIG_EDAC_I3200 is not set +# CONFIG_EDAC_I5000 is not set +# CONFIG_EDAC_I5100 is not set +# CONFIG_EDAC_I5400 is not set +# CONFIG_EDAC_I7300 is not set +# CONFIG_EDAC_I7CORE is not set +# CONFIG_EDAC_I82975X is not set +# CONFIG_EDAC_IE31200 is not set +# CONFIG_EDAC_IGEN6 is not set +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_PND2 is not set +# CONFIG_EDAC_SBRIDGE is not set +# CONFIG_EDAC_SKX is not set +# CONFIG_EDAC_X38 is not set +CONFIG_HALTPOLL_CPUIDLE=y +# CONFIG_HW_RANDOM_VIRTIO is not set +# CONFIG_HYPERV is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_NAT=y +# CONFIG_IP6_NF_SECURITY is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_TARGET_MASQUERADE=y +# CONFIG_IP6_NF_TARGET_NPT is not set +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_ARPTABLES is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +# CONFIG_IP_NF_SECURITY is not set +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_REDIRECT is not set +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPMAC is not set +# CONFIG_IP_SET_HASH_IPMARK is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_MAC is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETIFACE is not set +# CONFIG_IP_SET_HASH_NETNET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_HASH_NETPORTNET is not set +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_SET_MAX=256 +# CONFIG_JAILHOUSE_GUEST is not set +CONFIG_KARMA_PARTITION=y +CONFIG_KVM_GUEST=y +# CONFIG_LDM_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MEMORY_BALLOON=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +# CONFIG_MOUSE_PS2_VMMOUSE is not set +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_OSF is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +CONFIG_NETFILTER_XT_CONNMARK=y +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_SET is not set +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +# CONFIG_NET_9P_DEBUG is not set +CONFIG_NET_9P_VIRTIO=y +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_EMATCH_IPSET is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NF_CONNTRACK_AMANDA is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_OSF_PARTITION=y +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_METACOPY is not set +CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PTP_1588_CLOCK_KVM=y +# CONFIG_PTP_1588_CLOCK_VMW is not set +# CONFIG_PVH is not set +CONFIG_SGI_PARTITION=y +# CONFIG_SKFP is not set +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_SEQ_MIDI_EVENT=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SUN_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_VIRTIO=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_INPUT=y +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VIRTIO_NET=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_X86_HV_CALLBACK_VECTOR=y +# CONFIG_X86_X2APIC is not set +# CONFIG_XEN is not set + +CONFIG_DYNAMIC_DEBUG=y + +# For libgtpnl's qemu tests +CONFIG_NAMESPACES=y +CONFIG_NET_NS=y +CONFIG_VETH=y -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id64a1a778fa38eec20498c36b390332f75d7d3f5 Gerrit-Change-Number: 38345 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: move ggsn testuite

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: move ggsn testuite ...................................................................... jobs/ttcn3-testsuites-testenv: move ggsn testuite Run the GGSN testsuite in all combinations (osmo-ggsn, osmo-ggsn with various kernels and kernel gtp-u, open5gs) with testenv. Depends: osmo-ttcn3-hacks I3f9db4325d5928c809cc99bc82d9cb82bf9e71eb Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 --- M jobs/ttcn3-testsuites-testenv.yml M jobs/ttcn3-testsuites.yml 2 files changed, 67 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/46/38346/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index b5180f1..77237d9 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -10,8 +10,11 @@ See <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Tests…"> TTCN3 Testsuite</a> for more information. - Arguments: <code>{args}</code> + Arguments: <code>{args}</code> + + Kernel: <code>{kernel}</code> timer: "@midnight" + kernel: "" node: ttcn3 jobs: - "{job-name}" @@ -93,6 +96,34 @@ args: -b osmocom:nightly timer: H 07 * * * + - ttcn3-ggsn-test: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_*' + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --debian-kernel + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel-net-next: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + kernel: net-next + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel-torvalds: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + kernel: torvalds + timer: H 07 * * * + + - ttcn3-ggsn-test-ogs: + testsuite: ggsn + args: -b osmocom:nightly -c open5gs + timer: H 07 * * * + email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + # --------------------------------------------- # Debian latest # --------------------------------------------- @@ -148,6 +179,28 @@ timer: H 10 * * * disabled: true # disable until > 0.1.x release + - ttcn3-ggsn-test-latest: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_*' + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_*' --kernel-debian + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest-net-next: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + kernel: net-next + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest-torvalds: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + kernel: torvalds + timer: H 10 * * * + # --------------------------------------------- # Debian nightly + io_uring (OS#6357) # --------------------------------------------- @@ -199,6 +252,11 @@ args: -b osmocom:nightly:asan -c generic timer: H 12 * * * + - ttcn3-ggsn-test-asan: + testsuite: ggsn + args: -b osmocom:nightly:asan -c 'osmo_ggsn_*' + timer: H 12 * * * + - job-template: name: '{job-name}' project-type: freestyle @@ -216,10 +274,15 @@ - shell: |- DISTRO="debian:bookworm" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" + KERNEL="{kernel}" podman pull "$IMAGE" - rm -rf logs _cache + rm -rf logs _cache .linux + + if [ -n "$KERNEL" ]; then + wget -q -O .linux "https://jenkins.osmocom.org/jenkins/job/build-kernel-$KERNEL/lastSuccessful…" + fi set +x # Don't output the color codes we set here export TESTENV_COLOR_DEBUG="$(printf '\e[0;94m')" # light blue @@ -229,6 +292,7 @@ export TESTENV_COLOR_CRITICAL="$(printf '\e[1;91m')" # bold, red export TESTENV_SOURCE_HIGHLIGHT_COLORS="esc" export TESTENV_NO_IMAGE_UP_TO_DATE_CHECK=1 + export TESTENV_NO_KVM=1 set -x ./testenv.py run \ @@ -241,7 +305,7 @@ # Free up space from downloaded apt packages, build artifacts etc. # The osmo-ttcn3-hacks deps dir and ccache are persistent. - rm -rf _cache + rm -rf _cache .linux scm: - git: diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 98becb5..55eb9aa 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -26,57 +26,6 @@ timer: H 04 * * * - nplab-sua-test: timer: H 04 * * * - - ttcn3-ggsn-test: - timer: H 04 * * * - - ttcn3-ggsn-test-kernel: - timer: H 04 * * * - description: | - Test osmo-ggsn master with the Debian kernel. - - ttcn3-ggsn-test-kernel-net-next: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn master with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> - net-next.git</a>. - - ttcn3-ggsn-test-kernel-torvalds: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn master with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> - torvalds/linux.git</a>. - - ttcn3-ggsn-test-kernel-latest: - timer: H 04 * * * - description: | - Test osmo-ggsn latest with the Debian kernel. - - ttcn3-ggsn-test-kernel-latest-net-next: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn latest with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> - net-next.git</a>. - - ttcn3-ggsn-test-kernel-latest-torvalds: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn latest with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> - torvalds/linux.git</a>. - - ttcn3-ggsn-test-ogs: - timer: H 04 * * * - description: | - Test open5gs-smfd + open5gs-upfd main. - email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - ttcn3-pcu-test: timer: H 04 * * * - ttcn3-pcu-test-sns: @@ -136,8 +85,6 @@ timer: H 07 * * * - nplab-sua-test-latest: timer: H 08 * * * - - ttcn3-ggsn-test-latest: - timer: H 08 * * * - ttcn3-msc-test-latest: timer: H 08 * * * - ttcn3-pcu-test-latest: @@ -205,8 +152,6 @@ timer: H 12 * * * - ttcn3-gbproxy-test-asan: timer: H 12 * * * - - ttcn3-ggsn-test-asan: - timer: H 12 * * * - ttcn3-hnbgw-test-asan: timer: H 12 * * * - ttcn3-msc-test-asan: @@ -244,53 +189,6 @@ # Translate job name to docker-playground dir and relevant # environment variables case "{job-name}" in - ttcn3-ggsn-test-kernel) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - # Run against debian's kernel - export KERNEL_TEST=1 - ;; - ttcn3-ggsn-test-kernel-net-next) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" - export KERNEL_REMOTE_NAME="net-next" - export KERNEL_BRANCH="main" - ;; - ttcn3-ggsn-test-kernel-torvalds) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" - export KERNEL_REMOTE_NAME="torvalds" - export KERNEL_BRANCH="master" - ;; - ttcn3-ggsn-test-kernel-latest) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - ;; - ttcn3-ggsn-test-kernel-latest-net-next) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" - export KERNEL_REMOTE_NAME="net-next" - export KERNEL_BRANCH="main" - ;; - ttcn3-ggsn-test-kernel-latest-torvalds) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" - export KERNEL_REMOTE_NAME="torvalds" - export KERNEL_BRANCH="master" - ;; TTCN3-centos7-*-latest) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos7\-/ttcn3-/ | sed s/\-latest$//)" export IMAGE_SUFFIX="latest-centos7" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 Gerrit-Change-Number: 38346 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: remove mongodb-org.list

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38337?usp=email ) Change subject: testenv: podman: remove mongodb-org.list ...................................................................... testenv: podman: remove mongodb-org.list Remove mongodb-org.list at the end of building the podman image, as we only need to install mongodb once in the container but won't use the repository afterwards. This avoids checking the mongodb repository in "apt update". Change-Id: I5a0455a4dbf8a31366bff65fd011fd5494b64ea7 --- M _testenv/data/podman/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/38337/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 42b0635..013c03d 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -121,4 +121,5 @@ apt-get install -y mongodb-org && \ apt-get clean && \ cd / && \ - rm -rf /tmp/mongodb + rm -rf /tmp/mongodb && \ + rm /etc/apt/sources.list.d/mongodb-org.list -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0455a4dbf8a31366bff65fd011fd5494b64ea7 Gerrit-Change-Number: 38337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: requirements: find programs in /usr/sbin

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38336?usp=email ) Change subject: testenv: requirements: find programs in /usr/sbin ...................................................................... testenv: requirements: find programs in /usr/sbin Fix that testenv complains about a missing setcap program, if it is in /usr/sbin/setcap and /usr/sbin is not in PATH as it is the case with Debian. We actually run setcap with sudo when it is needed, and in that case /usr/sbin gets added to PATH in Debian. Fix for: [testenv] Missing program: setcap Change-Id: Ibbccba013ac38415ef46467f97bef846b848cf39 --- M _testenv/testenv/requirements.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/38336/1 diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 7badbe9..d65e436 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -38,6 +38,12 @@ abort = False for program in programs: if not shutil.which(program): + if os.path.exists(os.path.join("/usr/sbin", program)): + # Debian: some programs such as setcap are in /usr/sbin, which + # is not in PATH unless using sudo. Therefore "shutil.which()" + # won't find it. + continue + logging.error(f"Missing program: {program}") if program == "ttcn3_compiler": -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38336?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibbccba013ac38415ef46467f97bef846b848cf39 Gerrit-Change-Number: 38336 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2024