Build failure of network:osmocom:latest/osmo-sip-connector in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Raspbian_10/armv7l Package network:osmocom:latest/osmo-sip-connector failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild24:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-sip-connector in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-sip-connector failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in openSUSE_Factory_ARM/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-msc failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild24:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libasn1c in Debian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_10/armv7l Package network:osmocom:nightly/libasn1c failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild02:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-smlc in openSUSE_Factory_ARM/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-smlc/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-smlc failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-smlc Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libsmpp34 in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Raspbian_10/armv7l Package network:osmocom:nightly/libsmpp34 failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild01:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb22:12) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud115:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bsc[master]: vty: add new attribute for vendor-specific commands
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/21684 )
Change subject: vty: add new attribute for vendor-specific commands
..
vty: add new attribute for vendor-specific commands
Change-Id: I2254cdf8c4be85c89819d0f831102ee71349b188
Related: SYS#4918
---
M include/osmocom/bsc/vty.h
M src/osmo-bsc/osmo_bsc_main.c
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/21684/1
diff --git a/include/osmocom/bsc/vty.h b/include/osmocom/bsc/vty.h
index d2361b0..cfdcbfc 100644
--- a/include/osmocom/bsc/vty.h
+++ b/include/osmocom/bsc/vty.h
@@ -40,6 +40,7 @@
BSC_VTY_ATTR_RESTART_ABIS_OML_LINK = 0,
BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK,
BSC_VTY_ATTR_NEW_LCHAN,
+ BSC_VTY_ATTR_VENDOR_SPECIFIC,
/* NOTE: up to 32 entries */
};
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index ca00ba0..df5235e 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -660,11 +660,14 @@
"This command applies on A-bis RSL link
(re)establishment",
[BSC_VTY_ATTR_NEW_LCHAN] = \
"This command applies for newly created lchans",
+ [BSC_VTY_ATTR_VENDOR_SPECIFIC] = \
+ "This command/parameter is BTS vendor specific",
},
.usr_attr_letters = {
[BSC_VTY_ATTR_RESTART_ABIS_OML_LINK]= 'o',
[BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK]= 'r',
[BSC_VTY_ATTR_NEW_LCHAN]= 'l',
+ [BSC_VTY_ATTR_VENDOR_SPECIFIC] = 'v',
},
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21684
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2254cdf8c4be85c89819d0f831102ee71349b188
Gerrit-Change-Number: 21684
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: Implement ip.access coding of MS/BS Power Control Parameters
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/21683 )
Change subject: Implement ip.access coding of MS/BS Power Control Parameters
..
Implement ip.access coding of MS/BS Power Control Parameters
Change-Id: I3798a6a02132bafe8f1fef6e93bbb42036d76ac9
Related: SYS#4918
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/bts_trx.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/bts_trx.c
5 files changed, 302 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/21683/1
diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 2b05418..ff246f6 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -188,6 +188,10 @@
void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx);
void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts);
+ /* MS/BS Power Control paramaters encoding functions (optional) */
+ void (*enc_ms_power_params)(struct msgb *msg, const struct gsm_bts_trx
*trx);
+ void (*enc_bs_power_params)(struct msgb *msg, const struct gsm_bts_trx
*trx);
+
/* Should SI2bis and SI2ter be disabled by default on this BTS model? */
bool force_combined_si;
diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h
index 5888c63..eff3fdd 100644
--- a/include/osmocom/bsc/bts_trx.h
+++ b/include/osmocom/bsc/bts_trx.h
@@ -22,6 +22,74 @@
struct gsm_abis_mo mo;
};
+/* MS/BS Power related measurement averaging algo */
+enum trx_power_ctrl_meas_avg_algo {
+ TRX_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00,
+ TRX_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01,
+ TRX_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02,
+ TRX_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03,
+ /* EWMA is an Osmocom specific algo */
+ TRX_PWR_CTRL_MEAS_AVG_ALGO_EWMA = 0x04,
+};
+
+/* MS/BS Power related measurement parameters */
+struct trx_power_ctrl_meas_params {
+ /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */
+ uint8_t lower_thresh; /* lower (decreasing) direction */
+ uint8_t upper_thresh; /* upper (increasing) direction */
+
+ /* Threshold Comparators for lower (decreasing) direction */
+ uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */
+ uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */
+ /* Threshold Comparators for upper (increasing) direction */
+ uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */
+ uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */
+
+ /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */
+ uint8_t h_reqave;
+ uint8_t h_reqt;
+
+ /* AVG algorithm and its specific parameters */
+ enum trx_power_ctrl_meas_avg_algo algo;
+ union {
+ /* Exponentially Weighted Moving Average */
+ struct {
+ /* Smoothing factor: higher the value - less smoothing
*/
+ uint8_t alpha; /* 1 .. 99 (in %) */
+ } ewma;
+ };
+};
+
+enum trx_power_ctrl_dir {
+ TRX_PWR_CTRL_DIR_UL, /* MS Power Control */
+ TRX_PWR_CTRL_DIR_DL, /* BS Power Control */
+};
+
+enum trx_power_ctrl_mode {
+ /* Do not send MS/BS Power Control IEs */
+ TRX_PWR_CTRL_MODE_NONE = 0,
+ /* Send MS/BS Power IE only (with target level) */
+ TRX_PWR_CTRL_MODE_STATIC,
+ /* Send MS/BS Power [Parameters] IEs (dynamic mode) */
+ TRX_PWR_CTRL_MODE_DYN_BTS,
+};
+
+/* MS/BS Power Control Parameters */
+struct trx_power_ctrl_params {
+ /* Power Control direction: Uplink or Downlink */
+ enum trx_power_ctrl_dir dir;
+ /* Power Control mode to be used by the BTS */
+ enum trx_power_ctrl_mode mode;
+
+ /* Power change step size (dynamic mode only) */
+ uint8_t inc_step_size_db; /* increasing direction */
+ uint8_t red_step_size_db; /* reducing direction */
+
+ /* Measurement averaging parameters for RxLev & RxQual */
+ struct trx_power_ctrl_meas_params rxqual_meas;
+ struct trx_power_ctrl_meas_params rxlev_meas;
+};
+
/* One TRX in a BTS */
struct gsm_bts_trx {
/* list header in bts->trx_list */
@@ -51,6 +119,10 @@
int nominal_power; /* in dBm */
unsigned int max_power_red; /* in actual dB */
+ /* MS/BS Power Control parameters */
+ struct trx_power_ctrl_params ms_power_ctrl;
+ struct trx_power_ctrl_params bs_power_ctrl;
+
union {
struct {
struct {
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index f8ea5a5..0793bea 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -486,6 +486,39 @@
}
}
+static void enc_power_control_params(struct msgb *msg,
Change in osmo-bsc[master]: vty: add commands for MS/BS Power Control parameters
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/21685 )
Change subject: vty: add commands for MS/BS Power Control parameters
..
vty: add commands for MS/BS Power Control parameters
Change-Id: Ifd6ea29c3b9dbaccf92856131d5fb2e352b84eb2
Related: SYS#4918
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 353 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/21685/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index c98a254..80cbee0 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -4828,6 +4828,346 @@
return CMD_SUCCESS;
}
+#define BS_POWER_CONTROL_CMD \
+ "bs-power-control"
+#define MS_POWER_CONTROL_CMD \
+ "ms-power-control"
+#define POWER_CONTROL_CMD \
+ "(" BS_POWER_CONTROL_CMD "|" MS_POWER_CONTROL_CMD ")"
+
+#define BS_POWER_CONTROL_DESC \
+ "BS (Downlink) power control\n"
+#define MS_POWER_CONTROL_DESC \
+ "MS (Uplink) power control\n"
+#define POWER_CONTROL_DESC \
+ BS_POWER_CONTROL_DESC MS_POWER_CONTROL_DESC
+
+#define POWER_CONTROL_PARAMS(trx) \
+ (strcmp(argv[0], BS_POWER_CONTROL_CMD) == 0) ? \
+ >bs_power_ctrl : >ms_power_ctrl
+
+DEFUN_USRATTR(cfg_trx_no_power_ctrl,
+ cfg_trx_no_power_ctrl_cmd,
+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
+ X(BSC_VTY_ATTR_NEW_LCHAN),
+ "no " POWER_CONTROL_CMD,
+ NO_STR POWER_CONTROL_DESC)
+{
+ struct trx_power_ctrl_params *params;
+ struct gsm_bts_trx *trx = vty->index;
+
+ params = POWER_CONTROL_PARAMS(trx);
+ params->mode = TRX_PWR_CTRL_MODE_NONE;
+
+ return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(cfg_trx_power_ctrl_mode,
+ cfg_trx_power_ctrl_mode_cmd,
+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
+ X(BSC_VTY_ATTR_NEW_LCHAN),
+ POWER_CONTROL_CMD " mode (static|dyn-bts)",
+ POWER_CONTROL_DESC "Power control mode\n"
+ "Instruct the MS/BTS to use a static power level (default)\n"
+ "Power control to be performed dynamically by the BTS itself\n")
+{
+ struct trx_power_ctrl_params *params;
+ struct gsm_bts_trx *trx = vty->index;
+
+ params = POWER_CONTROL_PARAMS(trx);
+ if (strcmp(argv[1], "static") == 0)
+ params->mode = TRX_PWR_CTRL_MODE_STATIC;
+ else if (strcmp(argv[1], "dyn-bts") == 0)
+ params->mode = TRX_PWR_CTRL_MODE_DYN_BTS;
+
+ return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(cfg_trx_power_ctrl_step_size,
+ cfg_trx_power_ctrl_step_size_cmd,
+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
+ X(BSC_VTY_ATTR_NEW_LCHAN),
+ POWER_CONTROL_CMD " step-size inc <2-6> red <2-4>",
+ POWER_CONTROL_DESC "Set power change step size (for dynamic
mode)\n"
+ "Increase step size (default is 4 dB)\n"
+ "Step size (2, 4, or 6 dB)\n"
+ "Reduce step size (default is 2 dB)\n"
+ "Step size (2 or 4 dB)\n")
+{
+ struct trx_power_ctrl_params *params;
+ struct gsm_bts_trx *trx = vty->index;
+
+ if (atoi(argv[1]) % 2 || atoi(argv[2]) % 2) {
+ vty_out(vty, "%% Power change step size must be "
+ "an even number%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ params = POWER_CONTROL_PARAMS(trx);
+ params->inc_step_size_db = atoi(argv[1]);
+ params->red_step_size_db = atoi(argv[2]);
+
+ return CMD_SUCCESS;
+}
+
+#define POWER_CONTROL_MEAS_RXLEV_DESC \
+ "RxLev value (signal strength, 0 is worst, 63 is best)\n"
+#define POWER_CONTROL_MEAS_RXQUAL_DESC \
+ "RxQual value (signal quality, 0 is best, 7 is worst)\n"
+
+DEFUN_USRATTR(cfg_trx_power_ctrl_rxlev_thresh,
+ cfg_trx_power_ctrl_rxlev_thresh_cmd,
+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
+ X(BSC_VTY_ATTR_NEW_LCHAN),
+ POWER_CONTROL_CMD " rxlev-thresh lower <0-63> upper <0-63>",
+ POWER_CONTROL_DESC "Set target RxLev thresholds (for dynamic
mode)\n"
+ "Lower RxLev value (default is 32, i.e. -78 dBm)\n"
+ "Lower " POWER_CONTROL_MEAS_RXLEV_DESC
+ "Upper RxLev value (default is 38, i.e. -72 dBm)\n"
+ "Upper " POWER_CONTROL_MEAS_RXLEV_DESC)
+{
+ struct trx_power_ctrl_params *params;
+ struct gsm_bts_trx *trx = vty->index;
+ int lower = atoi(argv[1]);
+ int upper = atoi(argv[2]);
+
+ if (lower > upper) {
+ vty_out(vty, "%% Lower 'rxlev-thresh' (%d) must be less than
upper (%d)%s",
+ lower, upper, VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ params = POWER_CONTROL_PARAMS(trx);
+ params->rxlev_meas.lower_thresh = lower;
+ params->rxlev_meas.upper_thresh = upper;
+
+ return CMD_SUCCESS;
Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb15:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb18:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was goat03:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sgsn in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb56:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/neocon in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/neocon/Raspbian_10/armv7l Package network:osmocom:latest/neocon failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest neocon Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-2:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bts in xUbuntu_19.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb55:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/eclipse-titan in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Testing/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: connect to back-other-opensuse:5253: Connection timed out (worker was goat13:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud129:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud111:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb27:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/limesuite in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/limesuite/Debian_Testing/x86_64 Package network:osmocom:latest/limesuite failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest limesuite Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was sheep88:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/open5gs in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/xUbuntu_20.04/x86_64 Package network:osmocom:latest/open5gs failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud120:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 199s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 199s] [COMPILING libboard/qmod/source/card_pres.c] [ 200s] [COMPILING libboard/qmod/source/wwan_led.c] [ 200s] [COMPILING libboard/qmod/source/i2c.c] [ 200s] [COMPILING libboard/qmod/source/board_qmod.c] [ 200s] [COMPILING apps/dfu/main.c] [ 200s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 200s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 201s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 201s] Memory region Used Size Region Size %age Used [ 201s] rom: 16588 B16 KB101.25% [ 201s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 201s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 201s] collect2: error: ld returned 1 exit status [ 201s] % [ 201s] make[2]: *** [Makefile:234: flash] Error 1 [ 201s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 201s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] dh_auto_build: error: make -j1 returned exit code 2 [ 201s] make: *** [debian/rules:16: build] Error 25 [ 201s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 201s] ### VM INTERACTION START ### [ 204s] [ 192.148231] sysrq: Power Off [ 204s] [ 192.157762] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] lamb21 failed "build simtrace2_0.7.0.69.aadd.dsc" at Sat Dec 12 01:56:14 UTC 2020. [ 204s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] [COMPILING apps/dfu/main.c] [ 163s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 163s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 164s] Memory region Used Size Region Size %age Used [ 164s] rom: 16580 B16 KB101.20% [ 164s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 164s] collect2: error: ld returned 1 exit status [ 164s] % [ 164s] make[2]: *** [Makefile:234: flash] Error 1 [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 164s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] dh_auto_build: error: make -j1 returned exit code 2 [ 164s] make: *** [debian/rules:16: build] Error 25 [ 164s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 164s] ### VM INTERACTION START ### [ 167s] [ 154.769510] sysrq: Power Off [ 167s] [ 154.774671] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb18 failed "build simtrace2_0.7.0.69.aadd.dsc" at Sat Dec 12 01:55:05 UTC 2020. [ 167s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud106:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_10/i586 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb03:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb01:13) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/eclipse-titan in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Raspbian_10/armv7l Package network:osmocom:latest/eclipse-titan failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild01:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-ttcn3-hacks[master]: pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681 )
Change subject: pcu: Fix counter expectancies after LLC UI dummy frame fixes in
PCU
..
pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU
Recent commit 7d0f9a0ec383fcfca934731bd6979b6be6629c90 in osmo-pcu.git
fixed situation where lots of unneeded LLC UI dummy frames where being
sent. As a result, osmo-pcu correctly counts less dl rlcmac payload
bytes being sent, so we must adjust our test expectancies.
Related: OS#4849
Change-Id: I01c34a0948094b17cc0d67e613cd9b756f78c372
---
M pcu/PCU_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 0c56348..facaa59 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1955,7 +1955,7 @@
{ name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c",
min := 0, max := 0},
{ name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1,
max := 1},
{ name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 0,
max := 0},
- { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 112, max := 112},
+ { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 64, max := 64},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min
:= 0, max := 0}
};
f_statsd_expect(expect);
@@ -2495,7 +2495,7 @@
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c",
min := 1, max := 1},
{ name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1,
max := 1},
{ name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 1,
max := 1},
- { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 28, max := 28},
+ { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 10, max := 10},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min
:= 26, max := 26}
};
f_statsd_expect(expect);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I01c34a0948094b17cc0d67e613cd9b756f78c372
Gerrit-Change-Number: 21681
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-pcu[master]: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/21682 )
Change subject: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION
value_string
..
rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string
Change-Id: I1b327bf955069ab10b2c6aa643ecf975fa23c1b5
---
M src/gsm_rlcmac.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index abb1e59..9b8782d 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -5318,7 +5318,7 @@
{ MT_PACKET_PAUSE, "Pkt Pause" },
{ MT_PACKET_ENHANCED_MEASUREMENT_REPORT,"Pkt Enchanced Meas Report" },
{ MT_ADDITIONAL_MS_RAC, "Additional MS RAC" },
-{ MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Changte
Notification" },
+{ MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification"
},
{ MT_PACKET_SI_STATUS, "Pkt SI Status" },
{ MT_ENHANCED_MEASUREMENT_REPORT, "Enchanced Meas Report" },
{ 0, NULL }
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21682
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I1b327bf955069ab10b2c6aa643ecf975fa23c1b5
Gerrit-Change-Number: 21682
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in pysim[master]: Readme.md: update apt-get invocation for python3 dep.
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/21680 ) Change subject: Readme.md: update apt-get invocation for python3 dep. .. Patch Set 1: > Patch Set 1: Code-Review+1 > > Keep in mind that pySim has not yet fully migrated to Python 3, see: > > https://gerrit.osmocom.org/c/pysim/+/15504 sure. it just broke for me on normal 'useage' with a recent checkout and this fixed it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/21680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b Gerrit-Change-Number: 21680 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 11 Dec 2020 19:29:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: Readme.md: update apt-get invocation for python3 dep.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/21680 ) Change subject: Readme.md: update apt-get invocation for python3 dep. .. Patch Set 1: Code-Review+1 Keep in mind that pySim has not yet fully migrated to Python 3, see: https://gerrit.osmocom.org/c/pysim/+/15504 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/21680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b Gerrit-Change-Number: 21680 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 11 Dec 2020 19:15:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681 ) Change subject: pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I01c34a0948094b17cc0d67e613cd9b756f78c372 Gerrit-Change-Number: 21681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 11 Dec 2020 19:11:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21682 ) Change subject: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b327bf955069ab10b2c6aa643ecf975fa23c1b5 Gerrit-Change-Number: 21682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 11 Dec 2020 19:10:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/21682 )
Change subject: rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION
value_string
..
rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string
Change-Id: I1b327bf955069ab10b2c6aa643ecf975fa23c1b5
---
M src/gsm_rlcmac.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/82/21682/1
diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index abb1e59..9b8782d 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -5318,7 +5318,7 @@
{ MT_PACKET_PAUSE, "Pkt Pause" },
{ MT_PACKET_ENHANCED_MEASUREMENT_REPORT,"Pkt Enchanced Meas Report" },
{ MT_ADDITIONAL_MS_RAC, "Additional MS RAC" },
-{ MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Changte
Notification" },
+{ MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification"
},
{ MT_PACKET_SI_STATUS, "Pkt SI Status" },
{ MT_ENHANCED_MEASUREMENT_REPORT, "Enchanced Meas Report" },
{ 0, NULL }
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21682
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I1b327bf955069ab10b2c6aa643ecf975fa23c1b5
Gerrit-Change-Number: 21682
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681 )
Change subject: pcu: Fix counter expectancies after LLC UI dummy frame fixes in
PCU
..
pcu: Fix counter expectancies after LLC UI dummy frame fixes in PCU
Recent commit 7d0f9a0ec383fcfca934731bd6979b6be6629c90 in osmo-pcu.git
fixed situation where lots of unneeded LLC UI dummy frames where being
sent. As a result, osmo-pcu correctly counts less dl rlcmac payload
bytes being sent, so we must adjust our test expectancies.
Related: OS#4849
Change-Id: I01c34a0948094b17cc0d67e613cd9b756f78c372
---
M pcu/PCU_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/81/21681/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 0c56348..facaa59 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1955,7 +1955,7 @@
{ name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c",
min := 0, max := 0},
{ name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1,
max := 1},
{ name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 0,
max := 0},
- { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 112, max := 112},
+ { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 64, max := 64},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min
:= 0, max := 0}
};
f_statsd_expect(expect);
@@ -2495,7 +2495,7 @@
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c",
min := 1, max := 1},
{ name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1,
max := 1},
{ name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 1,
max := 1},
- { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 28, max := 28},
+ { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min
:= 10, max := 10},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min
:= 26, max := 26}
};
f_statsd_expect(expect);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21681
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I01c34a0948094b17cc0d67e613cd9b756f78c372
Gerrit-Change-Number: 21681
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in pysim[master]: Readme.md: update apt-get invocation for python3 dep.
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/21680 ) Change subject: Readme.md: update apt-get invocation for python3 dep. .. Readme.md: update apt-get invocation for python3 dep. Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/21680/1 diff --git a/README.md b/README.md index 7074ffa..105ca3f 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ Example for Debian: - apt-get install python-pyscard python-serial python-pip - pip install pytlv + apt-get install python3-pyscard python3-serial python3-pip + pip3 install pytlv Mailing List -- To view, visit https://gerrit.osmocom.org/c/pysim/+/21680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b Gerrit-Change-Number: 21680 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in docker-playground[master]: gbproxy-test-fr: Avoid dumpcap failing to write to /data
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21679 ) Change subject: gbproxy-test-fr: Avoid dumpcap failing to write to /data .. gbproxy-test-fr: Avoid dumpcap failing to write to /data Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718 --- M ttcn3-gbproxy-test-fr/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 0c2ec43..7038810 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -24,6 +24,8 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/gbproxy-tester +# if we don't change permissiosn, dumpcap fails to write (despite starting it as root!) +chmod a+w $VOL_BASE_DIR/gbproxy-tester cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/ mkdir $VOL_BASE_DIR/gbproxy -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718 Gerrit-Change-Number: 21679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in docker-playground[master]: gbproxy-test-fr: Avoid dumpcap failing to write to /data
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21679 ) Change subject: gbproxy-test-fr: Avoid dumpcap failing to write to /data .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718 Gerrit-Change-Number: 21679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 17:12:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: gbproxy-test-fr: Avoid dumpcap failing to write to /data
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21679 ) Change subject: gbproxy-test-fr: Avoid dumpcap failing to write to /data .. gbproxy-test-fr: Avoid dumpcap failing to write to /data Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718 --- M ttcn3-gbproxy-test-fr/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/79/21679/1 diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 0c2ec43..7038810 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -24,6 +24,8 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/gbproxy-tester +# if we don't change permissiosn, dumpcap fails to write (despite starting it as root!) +chmod a+w $VOL_BASE_DIR/gbproxy-tester cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/ mkdir $VOL_BASE_DIR/gbproxy -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73dbdb4d85342e5fccd5ea4d9927f3244293d718 Gerrit-Change-Number: 21679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678 )
Change subject: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
..
ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
Change-Id: Id97fb22e0018739a07e46ecaf26463248554f276
---
M ttcn3-dumpcap-start.sh
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh
index aa3814a..4832b6d 100755
--- a/ttcn3-dumpcap-start.sh
+++ b/ttcn3-dumpcap-start.sh
@@ -30,7 +30,14 @@
kill_rm_pidfile $PIDFILE_NETCAT
kill_rm_pidfile $PIDFILE_PCAP
-if [ -x $DUMPCAP ]; then
+if [ ! -x $DUMPCAP ]; then
+ echo "Missing required dumpcap binary at ${DUMPCAP}"
+ exit 31
+fi
+
+if [ "$(id -u)" = "0" ]; then
+ CMD="$DUMPCAP -q"
+else
CAP_ERR="1"
if [ -x /sbin/setcap ]; then
# N. B: this check requires libcap2-bin package
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id97fb22e0018739a07e46ecaf26463248554f276
Gerrit-Change-Number: 21678
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: laforge
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678 ) Change subject: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id97fb22e0018739a07e46ecaf26463248554f276 Gerrit-Change-Number: 21678 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Dec 2020 16:22:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678 )
Change subject: ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
..
ttcn3-dumpcap-start.sh: Accept running as root or setuid dumpcap
Change-Id: Id97fb22e0018739a07e46ecaf26463248554f276
---
M ttcn3-dumpcap-start.sh
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/78/21678/1
diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh
index aa3814a..4832b6d 100755
--- a/ttcn3-dumpcap-start.sh
+++ b/ttcn3-dumpcap-start.sh
@@ -30,7 +30,14 @@
kill_rm_pidfile $PIDFILE_NETCAT
kill_rm_pidfile $PIDFILE_PCAP
-if [ -x $DUMPCAP ]; then
+if [ ! -x $DUMPCAP ]; then
+ echo "Missing required dumpcap binary at ${DUMPCAP}"
+ exit 31
+fi
+
+if [ "$(id -u)" = "0" ]; then
+ CMD="$DUMPCAP -q"
+else
CAP_ERR="1"
if [ -x /sbin/setcap ]; then
# N. B: this check requires libcap2-bin package
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21678
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id97fb22e0018739a07e46ecaf26463248554f276
Gerrit-Change-Number: 21678
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-sysmon in Debian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_10/armv7l Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:15) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in docker-playground[master]: debian-stretch-titan: Add wireshark-common for dumpcap
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/21677 ) Change subject: debian-stretch-titan: Add wireshark-common for dumpcap .. debian-stretch-titan: Add wireshark-common for dumpcap We need dumpcap by ttcn3-dumpcap-start.sh Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 --- M debian-stretch-titan/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/77/21677/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 Gerrit-Change-Number: 21677 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset
Change in docker-playground[master]: debian-stretch-titan: Add wireshark-common for dumpcap
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21677 ) Change subject: debian-stretch-titan: Add wireshark-common for dumpcap .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 Gerrit-Change-Number: 21677 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 15:26:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: Add wireshark-common for dumpcap
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21677 ) Change subject: debian-stretch-titan: Add wireshark-common for dumpcap .. debian-stretch-titan: Add wireshark-common for dumpcap We need dumpcap by ttcn3-dumpcap-start.sh Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 --- M debian-stretch-titan/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 3c9f672..74bc420 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -24,11 +24,12 @@ RUNapt-get update && \ apt-get upgrade -y && \ - apt-get -y install \ + DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends --no-install-suggests \ build-essential \ git \ procps \ tcpdump \ + wireshark-common \ vim \ netcat-openbsd \ && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 Gerrit-Change-Number: 21677 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in docker-playground[master]: debian-stretch-titan: Add wirshark-common for dumpcap
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21677 ) Change subject: debian-stretch-titan: Add wirshark-common for dumpcap .. debian-stretch-titan: Add wirshark-common for dumpcap We need dumpcap by ttcn3-dumpcap-start.sh Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 --- M debian-stretch-titan/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/77/21677/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 3c9f672..74bc420 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -24,11 +24,12 @@ RUNapt-get update && \ apt-get upgrade -y && \ - apt-get -y install \ + DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends --no-install-suggests \ build-essential \ git \ procps \ tcpdump \ + wireshark-common \ vim \ netcat-openbsd \ && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0879710ff200bde7f77584dfb69cfb14f02f5d69 Gerrit-Change-Number: 21677 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21676 ) Change subject: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump .. ttcn3-gbproxy-test: Use dumpcap instead of tcpdump This is required for creating proper pcap files with both ethernet and framerelay/hdlc traffic. Change-Id: Id237c25b12e70a89f12bd6d745b09c3abf9b7a7a --- M ttcn3-gbproxy-test/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 47f788f..9a92c4a 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -23,8 +23,8 @@ VOLUME /data -RUNln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / +RUNln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg COPY pipework /usr/bin/pipework -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id237c25b12e70a89f12bd6d745b09c3abf9b7a7a Gerrit-Change-Number: 21676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21676 ) Change subject: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id237c25b12e70a89f12bd6d745b09c3abf9b7a7a Gerrit-Change-Number: 21676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 14:46:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21676 ) Change subject: ttcn3-gbproxy-test: Use dumpcap instead of tcpdump .. ttcn3-gbproxy-test: Use dumpcap instead of tcpdump This is required for creating proper pcap files with both ethernet and framerelay/hdlc traffic. Change-Id: Id237c25b12e70a89f12bd6d745b09c3abf9b7a7a --- M ttcn3-gbproxy-test/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/76/21676/1 diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 47f788f..9a92c4a 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -23,8 +23,8 @@ VOLUME /data -RUNln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / +RUNln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg COPY pipework /usr/bin/pipework -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id237c25b12e70a89f12bd6d745b09c3abf9b7a7a Gerrit-Change-Number: 21676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: sysmocom resources.conf.prod: Update modem paths + add new modems aft...
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 ) Change subject: sysmocom resources.conf.prod: Update modem paths + add new modems after HW upgrade .. sysmocom resources.conf.prod: Update modem paths + add new modems after HW upgrade Change-Id: I346a5bb38270a32695ec73994179bd75d873b67a --- M sysmocom/resources.conf.prod 1 file changed, 20 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod index 0444cf4..461ada9 100644 --- a/sysmocom/resources.conf.prod +++ b/sysmocom/resources.conf.prod @@ -212,43 +212,57 @@ ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'sim'] +- label: sierra_3rd + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + ki: '97E2DAF5841D011F134E048E3B36D109' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['2g', 'sms', 'voice', 'ussd', 'sim'] + +- label: sierra_4th + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + ki: '6F7B518177DD550BDDDF1C9087BF4E48' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['2g', 'sms', 'voice', 'ussd', 'sim'] + - label: gobi2k - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.2/1-5.2.5' ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sim'] - label: ec20_1 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.2/1-5.2.6' ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_2 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.2' ki: '278B899D126C31F3B24D21E3EB556530' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_3 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.3' ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_4 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.5' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.5' ki: 'A41F06F39DE3B0295C178A674D3E3636' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_5 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.6' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.6' ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I346a5bb38270a32695ec73994179bd75d873b67a Gerrit-Change-Number: 21673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: sysmocom resources.conf.prod: Update modem paths + add new modems aft...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 ) Change subject: sysmocom resources.conf.prod: Update modem paths + add new modems after HW upgrade .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I346a5bb38270a32695ec73994179bd75d873b67a Gerrit-Change-Number: 21673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 14:37:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start: Fix path of setcap
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 ) Change subject: ttcn3-tcpdump-start: Fix path of setcap .. ttcn3-tcpdump-start: Fix path of setcap if we test if /sbin/setcap exists, we als should execute it from that path, as running from a normal user doesn't have /sbin included in $PATH Change-Id: I5131f869f86e6d136e0485da5e3749abbfc951e3 --- M ttcn3-tcpdump-start.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 3ad14c0..e905d8a 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -39,7 +39,7 @@ CAP_ERR="1" if [ -x /sbin/setcap ]; then # N. B: this check requires libcap2-bin package - setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP + /sbin/setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP CAP_ERR="$?" fi if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5131f869f86e6d136e0485da5e3749abbfc951e3 Gerrit-Change-Number: 21675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start: Fix path of setcap
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 ) Change subject: ttcn3-tcpdump-start: Fix path of setcap .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5131f869f86e6d136e0485da5e3749abbfc951e3 Gerrit-Change-Number: 21675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 14:36:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Properly capture HDLC/FR traffic in addition to ethernet
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21674 )
Change subject: gbproxy: Properly capture HDLC/FR traffic in addition to
ethernet
..
gbproxy: Properly capture HDLC/FR traffic in addition to ethernet
We cannot use "-i all" but must list each interface separately,
which is only supported by dumpcap. We also must write pcapng
files.
Change-Id: Id412af3bb6bcad5e0f2cf40a6dc497d7e4f3d948
---
M gbproxy/GBProxy_Tests.default
A ttcn3-dumpcap-start.sh
A ttcn3-dumpcap-stop.sh
3 files changed, 152 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.default b/gbproxy/GBProxy_Tests.default
index 799ac32..8634b49 100644
--- a/gbproxy/GBProxy_Tests.default
+++ b/gbproxy/GBProxy_Tests.default
@@ -1,3 +1,7 @@
+[DEFINE]
+TCPDUMP_START := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-start.sh"
+TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-stop.sh"
+
[LOGGING]
FileMask := LOG_ALL | TTCN_MATCHING;
diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh
new file mode 100755
index 000..aa3814a
--- /dev/null
+++ b/ttcn3-dumpcap-start.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# contrary to ttcn3-tcpdump-start.sh, this version is dumpcap-only and
+# needed when we want to capture from interfaces of different link
+# types. It will also store the results as pcap-ng, not plain old pcap.
+
+PIDFILE_PCAP=/tmp/pcap.pid
+DUMPCAP=/usr/bin/dumpcap
+
+PIDFILE_NETCAT=/tmp/netcat.pid
+NETCAT=/bin/nc
+GSMTAP_PORT=4729
+
+TESTCASE=$1
+
+kill_rm_pidfile() {
+ if [ -e $1 ]; then
+ kill "$(cat "$1")"
+ rm $1
+ fi
+}
+
+echo "-- $TESTCASE --"
+date
+
+if [ "z$TTCN3_PCAP_PATH" = "z" ]; then
+ TTCN3_PCAP_PATH=/tmp
+fi
+
+kill_rm_pidfile $PIDFILE_NETCAT
+kill_rm_pidfile $PIDFILE_PCAP
+
+if [ -x $DUMPCAP ]; then
+CAP_ERR="1"
+if [ -x /sbin/setcap ]; then
+ # N. B: this check requires libcap2-bin package
+ /sbin/setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP
+ CAP_ERR="$?"
+fi
+if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then
+ CMD="$DUMPCAP -q"
+else
+ echo "NOTE: unable to use dumpcap due to missing capabilities or suid
bit"
+ exit 32
+fi
+fi
+
+# Create a dummy sink for GSMTAP packets
+$NETCAT -l -u -k -p $GSMTAP_PORT >/dev/null 2>$TESTCASE.netcat.stderr &
+PID=$!
+echo $PID > $PIDFILE_NETCAT
+
+# generate the list of interface arguments. For capturing from
+# interfaces of different link-layer types, we cannot use "-i all"
+# but must use dumpcap with each individual interface name. We also
+# must write pcapng files, as only those can record the interface of
+# each packet
+ADDL_ARGS=""
+for f in /sys/class/net/*; do
+ DEV=`basename $f`
+ if [[ "$DEV" == "hdlcnet"* ]]; then
+ # skip these as we only want the hdlcX devices, avoid capturing
twice on both sides
+ continue
+ elif [[ "$DEV" == "hdlc"* ]]; then
+ # these are the user-side of the FR links, which is
+ # what we interface with from our test suite, emulating
+ # a BSS.
+ ADDL_ARGS="${ADDL_ARGS} -i ${DEV}"
+ elif [[ "$DEV" == "eth"* ]]; then
+ # we blindly assume that "normal" docker network devices
+ # are called ethXXX
+ ADDL_ARGS="${ADDL_ARGS} -i ${DEV}"
+ fi
+done
+
+$CMD -s 1500 -n ${ADDL_ARGS} -w "$TTCN3_PCAP_PATH/$TESTCASE.pcapng"
>$TTCN3_PCAP_PATH/$TESTCASE.pcapng.stdout 2>&1 &
+PID=$!
+echo $PID > $PIDFILE_PCAP
+
+# Wait until packet dumper creates the pcap file and starts recording.
+# We generate some traffic until we see packet dumper catches it.
+# Timeout is 10 seconds.
+ping 127.0.0.1 >/dev/null 2>&1 &
+PID=$!
+i=0
+while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcapng" ] ||
+ [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcapng")" -eq 32 ]
+do
+ echo "Waiting for packet dumper to start... $i"
+ sleep 1
+ i=$((i+1))
+ if [ $i -eq 10 ]; then
+ break
+ fi
+done
+kill $PID
diff --git a/ttcn3-dumpcap-stop.sh b/ttcn3-dumpcap-stop.sh
new file mode 100755
index 000..e13fbc0
--- /dev/null
+++ b/ttcn3-dumpcap-stop.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+PIDFILE_PCAP=/tmp/pcap.pid
+PIDFILE_NETCAT=/tmp/netcat.pid
+TESTCASE=$1
+VERDICT="$2"
+
+kill_rm_pidfile() {
+if [ -e $1 ]; then
+PSNAME="$(ps -q "$(cat "$1")" -o comm=)"
+ if [ "$PSNAME" != "sudo" ]; then
+ kill "$(cat "$1")"
+ else
+ # NOTE: This requires you to be root or something like
+ # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers
file
+ sudo kill "$(cat "$1")"
+ fi
+ rm $1
+fi
+}
+
+date
+
+if [ x"$VERDICT" = x"pass" ]; then
+ echo -e "\033[1;32m== $TESTCASE $VERDICT ==\033[0m"
+else
+ echo -e
Change in osmo-ttcn3-hacks[master]: gbproxy: Properly capture HDLC/FR traffic in addition to ethernet
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21674 ) Change subject: gbproxy: Properly capture HDLC/FR traffic in addition to ethernet .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id412af3bb6bcad5e0f2cf40a6dc497d7e4f3d948 Gerrit-Change-Number: 21674 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 14:35:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start: Fix path of setcap
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 ) Change subject: ttcn3-tcpdump-start: Fix path of setcap .. ttcn3-tcpdump-start: Fix path of setcap if we test if /sbin/setcap exists, we als should execute it from that path, as running from a normal user doesn't have /sbin included in $PATH Change-Id: I5131f869f86e6d136e0485da5e3749abbfc951e3 --- M ttcn3-tcpdump-start.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/21675/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 3ad14c0..e905d8a 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -39,7 +39,7 @@ CAP_ERR="1" if [ -x /sbin/setcap ]; then # N. B: this check requires libcap2-bin package - setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP + /sbin/setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP CAP_ERR="$?" fi if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5131f869f86e6d136e0485da5e3749abbfc951e3 Gerrit-Change-Number: 21675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Properly capture HDLC/FR traffic in addition to ethernet
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21674 )
Change subject: gbproxy: Properly capture HDLC/FR traffic in addition to
ethernet
..
gbproxy: Properly capture HDLC/FR traffic in addition to ethernet
We cannot use "-i all" but must list each interface separately,
which is only supported by dumpcap. We also must write pcapng
files.
Change-Id: Id412af3bb6bcad5e0f2cf40a6dc497d7e4f3d948
---
M gbproxy/GBProxy_Tests.default
A ttcn3-dumpcap-start.sh
A ttcn3-dumpcap-stop.sh
3 files changed, 152 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/74/21674/1
diff --git a/gbproxy/GBProxy_Tests.default b/gbproxy/GBProxy_Tests.default
index 799ac32..8634b49 100644
--- a/gbproxy/GBProxy_Tests.default
+++ b/gbproxy/GBProxy_Tests.default
@@ -1,3 +1,7 @@
+[DEFINE]
+TCPDUMP_START := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-start.sh"
+TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-stop.sh"
+
[LOGGING]
FileMask := LOG_ALL | TTCN_MATCHING;
diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh
new file mode 100755
index 000..aa3814a
--- /dev/null
+++ b/ttcn3-dumpcap-start.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# contrary to ttcn3-tcpdump-start.sh, this version is dumpcap-only and
+# needed when we want to capture from interfaces of different link
+# types. It will also store the results as pcap-ng, not plain old pcap.
+
+PIDFILE_PCAP=/tmp/pcap.pid
+DUMPCAP=/usr/bin/dumpcap
+
+PIDFILE_NETCAT=/tmp/netcat.pid
+NETCAT=/bin/nc
+GSMTAP_PORT=4729
+
+TESTCASE=$1
+
+kill_rm_pidfile() {
+ if [ -e $1 ]; then
+ kill "$(cat "$1")"
+ rm $1
+ fi
+}
+
+echo "-- $TESTCASE --"
+date
+
+if [ "z$TTCN3_PCAP_PATH" = "z" ]; then
+ TTCN3_PCAP_PATH=/tmp
+fi
+
+kill_rm_pidfile $PIDFILE_NETCAT
+kill_rm_pidfile $PIDFILE_PCAP
+
+if [ -x $DUMPCAP ]; then
+CAP_ERR="1"
+if [ -x /sbin/setcap ]; then
+ # N. B: this check requires libcap2-bin package
+ /sbin/setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP
+ CAP_ERR="$?"
+fi
+if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then
+ CMD="$DUMPCAP -q"
+else
+ echo "NOTE: unable to use dumpcap due to missing capabilities or suid
bit"
+ exit 32
+fi
+fi
+
+# Create a dummy sink for GSMTAP packets
+$NETCAT -l -u -k -p $GSMTAP_PORT >/dev/null 2>$TESTCASE.netcat.stderr &
+PID=$!
+echo $PID > $PIDFILE_NETCAT
+
+# generate the list of interface arguments. For capturing from
+# interfaces of different link-layer types, we cannot use "-i all"
+# but must use dumpcap with each individual interface name. We also
+# must write pcapng files, as only those can record the interface of
+# each packet
+ADDL_ARGS=""
+for f in /sys/class/net/*; do
+ DEV=`basename $f`
+ if [[ "$DEV" == "hdlcnet"* ]]; then
+ # skip these as we only want the hdlcX devices, avoid capturing
twice on both sides
+ continue
+ elif [[ "$DEV" == "hdlc"* ]]; then
+ # these are the user-side of the FR links, which is
+ # what we interface with from our test suite, emulating
+ # a BSS.
+ ADDL_ARGS="${ADDL_ARGS} -i ${DEV}"
+ elif [[ "$DEV" == "eth"* ]]; then
+ # we blindly assume that "normal" docker network devices
+ # are called ethXXX
+ ADDL_ARGS="${ADDL_ARGS} -i ${DEV}"
+ fi
+done
+
+$CMD -s 1500 -n ${ADDL_ARGS} -w "$TTCN3_PCAP_PATH/$TESTCASE.pcapng"
>$TTCN3_PCAP_PATH/$TESTCASE.pcapng.stdout 2>&1 &
+PID=$!
+echo $PID > $PIDFILE_PCAP
+
+# Wait until packet dumper creates the pcap file and starts recording.
+# We generate some traffic until we see packet dumper catches it.
+# Timeout is 10 seconds.
+ping 127.0.0.1 >/dev/null 2>&1 &
+PID=$!
+i=0
+while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcapng" ] ||
+ [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcapng")" -eq 32 ]
+do
+ echo "Waiting for packet dumper to start... $i"
+ sleep 1
+ i=$((i+1))
+ if [ $i -eq 10 ]; then
+ break
+ fi
+done
+kill $PID
diff --git a/ttcn3-dumpcap-stop.sh b/ttcn3-dumpcap-stop.sh
new file mode 100755
index 000..e13fbc0
--- /dev/null
+++ b/ttcn3-dumpcap-stop.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+PIDFILE_PCAP=/tmp/pcap.pid
+PIDFILE_NETCAT=/tmp/netcat.pid
+TESTCASE=$1
+VERDICT="$2"
+
+kill_rm_pidfile() {
+if [ -e $1 ]; then
+PSNAME="$(ps -q "$(cat "$1")" -o comm=)"
+ if [ "$PSNAME" != "sudo" ]; then
+ kill "$(cat "$1")"
+ else
+ # NOTE: This requires you to be root or something like
+ # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers
file
+ sudo kill "$(cat "$1")"
+ fi
+ rm $1
+fi
+}
+
+date
+
+if [ x"$VERDICT" = x"pass" ]; then
+ echo -e "\033[1;32m== $TESTCASE $VERDICT ==\033[0m"
Change in osmo-gsm-tester[master]: sysmocom resources.conf.prod: Update modem paths + add new modems aft...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 ) Change subject: sysmocom resources.conf.prod: Update modem paths + add new modems after HW upgrade .. sysmocom resources.conf.prod: Update modem paths + add new modems after HW upgrade Change-Id: I346a5bb38270a32695ec73994179bd75d873b67a --- M sysmocom/resources.conf.prod 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/73/21673/1 diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod index 0444cf4..461ada9 100644 --- a/sysmocom/resources.conf.prod +++ b/sysmocom/resources.conf.prod @@ -212,43 +212,57 @@ ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'sim'] +- label: sierra_3rd + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + ki: '97E2DAF5841D011F134E048E3B36D109' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['2g', 'sms', 'voice', 'ussd', 'sim'] + +- label: sierra_4th + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + ki: '6F7B518177DD550BDDDF1C9087BF4E48' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['2g', 'sms', 'voice', 'ussd', 'sim'] + - label: gobi2k - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.2/1-5.2.5' ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sim'] - label: ec20_1 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.2/1-5.2.6' ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_2 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.2' ki: '278B899D126C31F3B24D21E3EB556530' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_3 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.3' ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_4 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.5' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.5' ki: 'A41F06F39DE3B0295C178A674D3E3636' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20_5 - path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.3/1-5.3.6' + path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.1/1-5.1.6' ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I346a5bb38270a32695ec73994179bd75d873b67a Gerrit-Change-Number: 21673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in docker-playground[master]: Introduce osmo-ran docker image set up
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21263 ) Change subject: Introduce osmo-ran docker image set up .. Patch Set 6: I would in general prefer to keep them separate since in general there's no 100% matching in package naming between distributions, and there's already some different ones, so adding new packages later on doesn't require re-splitting them again. But if you really consider the other way is better and it makes sense to spend time on that please confirm so. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If5d22e9fa818310cbb4adc34bd7aceb4416ec969 Gerrit-Change-Number: 21263 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 11:37:39 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/21672 )
Change subject: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
..
ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
osmo-gbproxy-master is derived from osmo-sgsn-mater, and the former
needs to be re-built to catch up with osmo-sgsn.git changes (Where
the osmo-gbproxy source code is located)
Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b
---
M ttcn3-gbproxy-test-fr/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index dce891d..0c2ec43 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -16,6 +16,7 @@
. ../jenkins-common.sh
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
+ "osmo-sgsn-$IMAGE_SUFFIX" \
"osmo-gbproxy-$IMAGE_SUFFIX" \
"ttcn3-gbproxy-test"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21672
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b
Gerrit-Change-Number: 21672
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21672 ) Change subject: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b Gerrit-Change-Number: 21672 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 11:16:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21672 )
Change subject: ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
..
ttcn3-gbproxy-test-fr: depend also on osmo-sgsn-master
osmo-gbproxy-master is derived from osmo-sgsn-mater, and the former
needs to be re-built to catch up with osmo-sgsn.git changes (Where
the osmo-gbproxy source code is located)
Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b
---
M ttcn3-gbproxy-test-fr/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/72/21672/1
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index dce891d..0c2ec43 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -16,6 +16,7 @@
. ../jenkins-common.sh
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
+ "osmo-sgsn-$IMAGE_SUFFIX" \
"osmo-gbproxy-$IMAGE_SUFFIX" \
"ttcn3-gbproxy-test"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21672
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8abc9f89d19d657403569b7705cd923342ff300b
Gerrit-Change-Number: 21672
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21572 ) Change subject: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I909443b540dbf75146297f1d7f94940690be6c0d Gerrit-Change-Number: 21572 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 11:11:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: rework gprs_ns2_fr_connect*()
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21486 ) Change subject: gprs_ns2: rework gprs_ns2_fr_connect*() .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e1374b0e979b3293302c5ed46a91a58f3a5a916 Gerrit-Change-Number: 21486 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Dec 2020 11:10:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: add member name to bind
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21485 ) Change subject: gprs_ns2: add member name to bind .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1d66b7b3b12da12db8b5e6bd08c1beff085b3e Gerrit-Change-Number: 21485 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 11:07:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: move allocation of the SNS fsm into create_nse
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21571 ) Change subject: gprs_ns2: move allocation of the SNS fsm into create_nse .. Patch Set 4: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/21571/2/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/21571/2/src/gb/gprs_ns2.c@693 PS2, Line 693: snprintf(sns, sizeof(sns), "nse-%d-sns", nsei); NSE%05u-SNS so stay in line with e.g. the BSSGP FSM https://gerrit.osmocom.org/c/libosmocore/+/21571/2/src/gb/gprs_ns2.c@694 PS2, Line 694: nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, NULL); _alloc(nse, sns); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I64e1f3dcc63d38e65bb486c9ac08d4032b7ad222 Gerrit-Change-Number: 21571 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 11:00:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Introduce osmo-ran docker image set up
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21263 ) Change subject: Introduce osmo-ran docker image set up .. Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/21263/6/osmo-ran/Dockerfile File osmo-ran/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/21263/6/osmo-ran/Dockerfile@42 PS6, Line 42: less \ : apt-utils \ : strace \ : tcpdump \ : telnet \ : vim \ : osmo-bsc \ : osmo-bsc-ipaccess-utils \ : osmo-bts-trx \ : osmo-mgw \ : osmo-pcu \ : osmo-trx-ipc \ : osmo-trx-uhd && \ except of apt-utils the two lists seem identical. Might make sense to keep the common list of packages in some variable and then use it in both clauses? Not critical, but would IMHO increase maintainability and have less risk of breaking only either of the two at some later change. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If5d22e9fa818310cbb4adc34bd7aceb4416ec969 Gerrit-Change-Number: 21263 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 10:07:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix log messages in timeout situations
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671 )
Change subject: gbproxy: Fix log messages in timeout situations
..
gbproxy: Fix log messages in timeout situations
Printing an unbound 'rx' variable when nothing was received due to
timeout is somehow not really useful. Print what we expected to
receive.
Change-Id: I4fee89baa954736ae8298b63667297dd57d8ec4f
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 655e396..2077e0f 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -765,7 +765,7 @@
mtc.stop;
}
[] T.timeout {
- setverdict(fail, "Timeout waiting for BSSGP on SGSN side: ",
rx);
+ setverdict(fail, "Timeout waiting for BSSGP on SGSN side: ",
exp_rx);
mtc.stop;
}
}
@@ -788,7 +788,7 @@
mtc.stop;
}
[] T.timeout {
- setverdict(fail, "Timeout waiting for BSSGP on PCU side: ", rx);
+ setverdict(fail, "Timeout waiting for BSSGP on PCU side: ",
exp_rx);
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fee89baa954736ae8298b63667297dd57d8ec4f
Gerrit-Change-Number: 21671
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix log messages in timeout situations
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671 ) Change subject: gbproxy: Fix log messages in timeout situations .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fee89baa954736ae8298b63667297dd57d8ec4f Gerrit-Change-Number: 21671 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 10:04:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover_test: set a fake osmo_mgcpc_ep_ci pointer
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21662 ) Change subject: handover_test: set a fake osmo_mgcpc_ep_ci pointer .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc22001bf9e9874dd3f44f0acac8b6a4c1069aa7 Gerrit-Change-Number: 21662 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Dec 2020 10:02:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover_test: adjust logging for reproducability
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21661 ) Change subject: handover_test: adjust logging for reproducability .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8ebcaf16cd14881a3a41616dcff175e173db9ae8 Gerrit-Change-Number: 21661 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Dec 2020 10:02:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover_test: send ho detection
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21660 ) Change subject: handover_test: send ho detection .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib676e74f23ef9cd1b55262117822b0e110013bdc Gerrit-Change-Number: 21660 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Dec 2020 10:02:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover_test: log sending ho complete
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21659 ) Change subject: handover_test: log sending ho complete .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I540e880f9aafb92be03c35086340de1968b26836 Gerrit-Change-Number: 21659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Dec 2020 10:01:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Fix bvci check in gbprox_rx_ptp_from_*
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21663 )
Change subject: gbproxy: Fix bvci check in gbprox_rx_ptp_from_*
..
gbproxy: Fix bvci check in gbprox_rx_ptp_from_*
The check for bvci in _rx_ptp_from_* was always false.
Change-Id: I16a0284ba3201c146c307db6997a416589d7e693
Related: OS#4472
---
M src/gbproxy/gb_proxy.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 06023c4..ed4dbeb 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -250,7 +250,7 @@
LOGP(DGPRS, LOGL_DEBUG, "%s Rx %s\n", log_pfx, pdut_name);
- if (ns_bvci == 0 && ns_bvci == 1) {
+ if (ns_bvci == 0 || ns_bvci == 1) {
LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not PTP\n", log_pfx,
ns_bvci);
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
@@ -360,7 +360,7 @@
LOGP(DGPRS, LOGL_DEBUG, "%s Rx %s\n", log_pfx, pdut_name);
- if (ns_bvci == 0 && ns_bvci == 1) {
+ if (ns_bvci == 0 || ns_bvci == 1) {
LOGP(DGPRS, LOGL_NOTICE, "%s BVCI is not PTP\n", log_pfx);
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21663
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I16a0284ba3201c146c307db6997a416589d7e693
Gerrit-Change-Number: 21663
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Implement handling of BVC Flow Control
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21616 )
Change subject: gbproxy: Implement handling of BVC Flow Control
..
gbproxy: Implement handling of BVC Flow Control
We must locally terminate + acknowledge any inbound BSSGP-FC-BVC,
and ourselves trigger the transmission of BSSGP-FC-BVC to each
SGSN in the pool.
Related: OS#4891
Depends: libosmcoore.git Ie59be6761177c43456898be9148727f15861a622
Change-Id: Ib6495e5de4bfcf748a98e08743d1a8f2565f8b69
---
M src/gbproxy/gb_proxy.c
1 file changed, 50 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 4f8c0e6..06023c4 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -291,6 +291,8 @@
rate_ctr_inc(>cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);
return tx_status_from_tlvp(rc, msg);
}
+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch
*/
+ msgb_bcid(msg) = (void *)
switch (bgph->pdu_type) {
case BSSGP_PDUT_UL_UNITDATA:
@@ -331,9 +333,7 @@
LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n",
pdut_name);
break;
case BSSGP_PDUT_FLOW_CONTROL_BVC:
- /* TODO: Implement via FSM */
- //rc = osmo_fsm_inst_dispatch(bss_bvc->fi, FIXME, );
- LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n",
pdut_name);
+ osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC,
msg);
break;
case BSSGP_PDUT_STATUS:
/* TODO: Implement by inspecting the contained PDU */
@@ -352,7 +352,9 @@
struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
const char *pdut_name = osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type);
struct gbproxy_bvc *sgsn_bvc, *bss_bvc;
+ struct tlv_parsed tp;
char log_pfx[32];
+ int rc;
snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/SGSN)-BVC(%05u/??)",
nse->nsei, ns_bvci);
@@ -386,10 +388,39 @@
rate_ctr_inc(_bvc->ctrg->ctr[GBPROX_PEER_CTR_DROPPED]);
return bssgp_tx_status(BSSGP_CAUSE_BVCI_BLOCKED, _bvci, msg);
}
+
+ /* DL_UNITDATA has a different header than all other uplink PDUs */
+ if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {
+ const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *)
msgb_bssgph(msg);
+ if (msgb_bssgp_len(msg) < sizeof(*budh))
+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL,
msg);
+ rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1,
bgph->pdu_type, budh->data,
+msgb_bssgp_len(msg) - sizeof(*budh),
0, 0, DGPRS, log_pfx);
+ /* populate TLLI from the fixed headser into the TLV-parsed
array so later code
+* doesn't have to worry where the TLLI came from */
+ tp.lv[BSSGP_IE_TLLI].len = 4;
+ tp.lv[BSSGP_IE_TLLI].val = (const uint8_t *) >tlli;
+ } else {
+ rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1,
bgph->pdu_type, bgph->data,
+msgb_bssgp_len(msg) - sizeof(*bgph),
0, 0, DGPRS, log_pfx);
+ }
+ if (rc < 0) {
+
rate_ctr_inc(>cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);
+ return tx_status_from_tlvp(rc, msg);
+ }
+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch
*/
+ msgb_bcid(msg) = (void *)
+
OSMO_ASSERT(sgsn_bvc->cell);
bss_bvc = sgsn_bvc->cell->bss_bvc;
- return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);
+ switch (bgph->pdu_type) {
+ case BSSGP_PDUT_FLOW_CONTROL_BVC_ACK:
+ return osmo_fsm_inst_dispatch(sgsn_bvc->fi,
BSSGP_BVCFSM_E_RX_FC_BVC_ACK, msg);
+ default:
+ return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);
+ }
+
}
/***
@@ -532,9 +563,24 @@
}
}
+/* BVC FSM informs us about BVC-FC PDU receive */
+static void bss_ptp_bvc_fc_bvc(uint16_t nsei, uint16_t bvci, const struct
bssgp2_flow_ctrl *fc, void *priv)
+{
+ struct gbproxy_bvc *bss_bvc = priv;
+ struct gbproxy_cell *cell = bss_bvc->cell;
+
+ if (!cell)
+ return;
+
+ /* FIXME: actually split the bandwidth among the SGSNs! */
+
+ dispatch_to_all_sgsn_bvc(cell, BSSGP_BVCFSM_E_REQ_FC_BVC, (void *) fc);
+}
+
static const struct bssgp_bvc_fsm_ops bss_ptp_bvc_fsm_ops = {
.reset_notification = bss_ptp_bvc_reset_notif,
.state_chg_notification = bss_ptp_bvc_state_chg_notif,
+ .rx_fc_bvc = bss_ptp_bvc_fc_bvc,
};
/* BVC FSM informs us about a
Change in osmo-sgsn[master]: gbproxy: Don't create an extra msgb copy for SGSN DL SIG
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21615 )
Change subject: gbproxy: Don't create an extra msgb copy for SGSN DL SIG
..
gbproxy: Don't create an extra msgb copy for SGSN DL SIG
That copy may have made sense while we were doing patching/buffering,
but we're not doing any of that anymore.
Related: OS#4472
Change-Id: I207a869ffac8bf60104f80f9ed58faf0021e5e95
---
M src/gbproxy/gb_proxy.c
1 file changed, 9 insertions(+), 17 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index a920906..4f8c0e6 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -886,9 +886,9 @@
}
/* Receive an incoming signalling message from the SGSN-side NS-VC */
-static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb
*orig_msg, uint16_t ns_bvci)
+static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb *msg,
uint16_t ns_bvci)
{
- struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(orig_msg);
+ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
uint8_t pdu_type = bgph->pdu_type;
const char *pdut_name = osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type);
struct gbproxy_config *cfg = nse->cfg;
@@ -896,7 +896,6 @@
struct tlv_parsed tp;
int data_len;
uint16_t bvci;
- struct msgb *msg;
char log_pfx[32];
int rc = 0;
int cause;
@@ -908,29 +907,25 @@
if (ns_bvci != 0 && ns_bvci != 1) {
LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n",
log_pfx, ns_bvci);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) {
LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling
BVC\n", log_pfx, pdut_name);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_DL)) {
LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink
direction\n", log_pfx, pdut_name);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
- msg = bssgp_msgb_copy(orig_msg, "rx_sig_from_sgsn");
- /* Update message info */
- bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);
- data_len = msgb_bssgp_len(orig_msg) - sizeof(*bgph);
+ data_len = msgb_bssgp_len(msg) - sizeof(*bgph);
rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1, pdu_type,
bgph->data, data_len, 0, 0,
DGPRS, log_pfx);
if (rc < 0) {
rc = tx_status_from_tlvp(rc, msg);
- msgb_free(msg);
rate_ctr_inc(>ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);
return rc;
}
@@ -1017,24 +1012,21 @@
case BSSGP_PDUT_RAN_INFO_ERROR:
case BSSGP_PDUT_RAN_INFO_APP_ERROR:
/* FIXME: route based in RIM Routing IE */
- rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL,
orig_msg);
+ rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);
break;
default:
LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name);
rate_ctr_inc(>ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);
- rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
break;
}
- msgb_free(msg);
-
return rc;
err_no_bvc:
LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find BVC\n", pdut_name);
rate_ctr_inc(>ctrg-> ctr[GBPROX_GLOB_CTR_INV_RAI]);
- msgb_free(msg);
- return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21615
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I207a869ffac8bf60104f80f9ed58faf0021e5e95
Gerrit-Change-Number: 21615
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Introduce new DOBJ log category; log object allocation/release
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21614 )
Change subject: gbproxy: Introduce new DOBJ log category; log object
allocation/release
..
gbproxy: Introduce new DOBJ log category; log object allocation/release
Related: OS#4472
Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484
---
M include/osmocom/sgsn/debug.h
M include/osmocom/sgsn/gb_proxy.h
M src/gbproxy/gb_proxy_main.c
M src/gbproxy/gb_proxy_peer.c
4 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h
index 507b70c..da819d5 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -39,6 +39,7 @@
DIUCS,
DSIGTRAN,
DGTP,
+ DOBJ,
Debug_LastEntry,
};
diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index e61b991..8892cf4 100644
--- a/include/osmocom/sgsn/gb_proxy.h
+++ b/include/osmocom/sgsn/gb_proxy.h
@@ -142,6 +142,11 @@
#define LOGPBVC(BVC, LEVEL, FMT, ARGS...) \
LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS)
+#define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \
+ LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS)
+#define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \
+ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS)
+
/* gb_proxy_vty .c */
int gbproxy_vty_init(void);
diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c
index 318f3dc..7ef9302 100644
--- a/src/gbproxy/gb_proxy_main.c
+++ b/src/gbproxy/gb_proxy_main.c
@@ -209,6 +209,12 @@
.description = "GPRS Network Service (NS)",
.enabled = 1, .loglevel = LOGL_INFO,
},
+ [DOBJ] = {
+ .name = "DOBJ",
+ .description = "GbProxy object allocation/release",
+ .enabled = 1,
+ .color = "\033[38;5;121m"
+ },
};
static const struct log_info gprs_log_info = {
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index ed7df32..c38b2f7 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -86,6 +86,11 @@
hash_add(nse->bvcs, >list, bvc->bvci);
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Created\n");
+
+ /* We leave allocating the bvc->fi to the caller, as the FSM details
depend
+* on the type of BVC (SIG/PTP) and role (SGSN/BSS) */
+
return bvc;
}
@@ -96,6 +101,8 @@
if (!bvc)
return;
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Destroying\n");
+
hash_del(>list);
rate_ctr_group_free(bvc->ctrg);
@@ -167,6 +174,8 @@
hash_add(cfg->cells, >list, cell->bvci);
+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Created\n");
+
return cell;
}
@@ -201,6 +210,8 @@
if (!cell)
return;
+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Destroying\n");
+
/* remove from cfg.cells */
hash_del(>list);
@@ -225,6 +236,8 @@
for (i = 0; i < ARRAY_SIZE(cell->sgsn_bvc); i++) {
if (!cell->sgsn_bvc[i]) {
cell->sgsn_bvc[i] = bvc;
+ LOGPCELL_CAT(cell, DOBJ, LOGL_DEBUG, "CELL linked to
SGSN\n");
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_DEBUG, "BVC linked to
CELL\n");
return true;
}
}
@@ -255,6 +268,8 @@
hash_init(nse->bvcs);
+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Created\n");
+
return nse;
}
@@ -267,6 +282,8 @@
if (!nse)
return;
+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Destroying\n");
+
hash_del(>list);
hash_for_each_safe(nse->bvcs, i, tmp, bvc, list)
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21614
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484
Gerrit-Change-Number: 21614
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21613 )
Change subject: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
..
gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
As we now have gbproxy_bvc on both the SGSN and the BSS side
with the same BVCI, using the BVCI alone will no longer render
unique indexes.
Related: OS#4472
Change-Id: I13f3c9e69562a56ad7d3742fdeb2ba48f134fdaa
---
M src/gbproxy/gb_proxy_peer.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index a0586fe..ed7df32 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -77,7 +77,7 @@
return NULL;
bvc->bvci = bvci;
- bvc->ctrg = rate_ctr_group_alloc(bvc, _ctrg_desc, bvci);
+ bvc->ctrg = rate_ctr_group_alloc(bvc, _ctrg_desc, (nse->nsei << 16)
| bvci);
if (!bvc->ctrg) {
talloc_free(bvc);
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21613
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I13f3c9e69562a56ad7d3742fdeb2ba48f134fdaa
Gerrit-Change-Number: 21613
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix log messages in timeout situations
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671 )
Change subject: gbproxy: Fix log messages in timeout situations
..
gbproxy: Fix log messages in timeout situations
Printing an unbound 'rx' variable when nothing was received due to
timeout is somehow not really useful. Print what we expected to
receive.
Change-Id: I4fee89baa954736ae8298b63667297dd57d8ec4f
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/71/21671/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 655e396..2077e0f 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -765,7 +765,7 @@
mtc.stop;
}
[] T.timeout {
- setverdict(fail, "Timeout waiting for BSSGP on SGSN side: ",
rx);
+ setverdict(fail, "Timeout waiting for BSSGP on SGSN side: ",
exp_rx);
mtc.stop;
}
}
@@ -788,7 +788,7 @@
mtc.stop;
}
[] T.timeout {
- setverdict(fail, "Timeout waiting for BSSGP on PCU side: ", rx);
+ setverdict(fail, "Timeout waiting for BSSGP on PCU side: ",
exp_rx);
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21671
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fee89baa954736ae8298b63667297dd57d8ec4f
Gerrit-Change-Number: 21671
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: gbproxy: Implement handling of BVC Flow Control
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21616 ) Change subject: gbproxy: Implement handling of BVC Flow Control .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6495e5de4bfcf748a98e08743d1a8f2565f8b69 Gerrit-Change-Number: 21616 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Dec 2020 09:52:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Fix bvci check in gbprox_rx_ptp_from_*
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21663 ) Change subject: gbproxy: Fix bvci check in gbprox_rx_ptp_from_* .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16a0284ba3201c146c307db6997a416589d7e693 Gerrit-Change-Number: 21663 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Dec 2020 09:52:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Introduce new DOBJ log category; log object allocation/release
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21614 ) Change subject: gbproxy: Introduce new DOBJ log category; log object allocation/release .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484 Gerrit-Change-Number: 21614 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Dec 2020 09:51:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21613 ) Change subject: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I13f3c9e69562a56ad7d3742fdeb2ba48f134fdaa Gerrit-Change-Number: 21613 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Dec 2020 09:51:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy major rewrite for SGSN pool support
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21612 ) Change subject: gbproxy major rewrite for SGSN pool support .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie0746f17927a9509c3806cc80dc1a31d25df7937 Gerrit-Change-Number: 21612 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Dec 2020 09:51:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21669 )
Change subject: sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port
..
sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port
For 12+ days, suspend/resume related SGSN + PCU TTCN3 tets have been failing.
It was the introduction of the BSSGP_CT:GLOBAL test port in
I40d973d80709f5d56f59247e8647b52754f09bc8 +
I805372f3024a0ec2491a24422e02c0bc6dc669d2 which caused the related PDUs
now to no longer show up where they used to.
Change-Id: I1977302fef4868dc1c330bc6f48f6a6608949393
Closes: OS#4902
---
M library/BSSGP_Emulation.ttcnpp
M pcu/PCU_Tests.ttcn
M pcu/SGSN_Components.ttcn
M sgsn/SGSN_Tests.ttcn
4 files changed, 12 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 633eee2..5eef645 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -155,6 +155,7 @@
/* one port array for each client; allows talking to up to 3 BVC/Cell
(handover, ...) */
port BSSGP_PT BSSGP[3]; /* PTP-BVC */
port BSSGP_PT BSSGP_SIG[3]; /* Signaling BVC */
+ port BSSGP_PT BSSGP_GLOBAL[3]; /* Signaling BVC */
port BSSGP_PROC_PT BSSGP_PROC[3]; /* registration /
deregistration */
};
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index dad0873..0c56348 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -327,7 +327,7 @@
T.start(2.0);
alt {
- [] BSSGP_SIG[0].receive(tr_BSSGP_SUSPEND(tlli,
mp_gb_cfg.bvc[0].cell_id.ra_id)) {
+ [] BSSGP_GLOBAL[0].receive(tr_BSSGP_SUSPEND(tlli,
mp_gb_cfg.bvc[0].cell_id.ra_id)) {
setverdict(pass);
}
[] T.timeout {
diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn
index ca1dec6..18f3992 100644
--- a/pcu/SGSN_Components.ttcn
+++ b/pcu/SGSN_Components.ttcn
@@ -101,6 +101,7 @@
connect(self:BSSGP_PROC[i], vc_BVC:BSSGP_PROC);
f_bssgp_client_register(mmctx.imsi, mmctx.tlli);
}
+ connect(self:BSSGP_GLOBAL[0], bssgp_component:GLOBAL);
}
/* Establish BSSGP connection to PCU */
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 0b298bb..8e7d6e4 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -480,14 +480,17 @@
connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_SP);
connect(vc_conn:BSSGP_SIG[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);
connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_PROC);
+ connect(vc_conn:BSSGP_GLOBAL[0], gb[0].vc_BSSGP:GLOBAL);
connect(vc_conn:BSSGP[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_SP);
connect(vc_conn:BSSGP_SIG[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);
connect(vc_conn:BSSGP_PROC[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_PROC);
+ connect(vc_conn:BSSGP_GLOBAL[1], gb[1].vc_BSSGP:GLOBAL);
connect(vc_conn:BSSGP[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_SP);
connect(vc_conn:BSSGP_SIG[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);
connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_PROC);
+ connect(vc_conn:BSSGP_GLOBAL[2], gb[2].vc_BSSGP:GLOBAL);
/* FIXME: support multiple RNCs */
if (g_ranap_enable) {
@@ -868,13 +871,13 @@
friend function f_bssgp_suspend(integer ran_idx := 0) runs on BSSGP_ConnHdlr
return OCT1 {
timer T := 5.0;
var PDU_BSSGP rx_pdu;
- BSSGP_SIG[ran_idx].send(ts_BSSGP_SUSPEND(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id));
+ BSSGP_GLOBAL[ran_idx].send(ts_BSSGP_SUSPEND(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id));
T.start;
alt {
- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_SUSPEND_ACK(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {
+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_SUSPEND_ACK(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {
return
rx_pdu.pDU_BSSGP_SUSPEND_ACK.suspend_Reference_Number.suspend_Reference_Number_value;
}
- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_SUSPEND_NACK(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {
+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_SUSPEND_NACK(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {
setverdict(fail, "SUSPEND-NACK in response to SUSPEND for TLLI
", g_pars.tlli);
mtc.stop;
}
@@ -888,11 +891,11 @@
friend function f_bssgp_resume(OCT1 susp_ref, integer ran_idx := 0) runs on
BSSGP_ConnHdlr {
timer T := 5.0;
- BSSGP_SIG[ran_idx].send(ts_BSSGP_RESUME(g_pars.tlli,
g_pars.bssgp_cell_id[ran_idx].ra_id, susp_ref));
+ BSSGP_GLOBAL[ran_idx].send(ts_BSSGP_RESUME(g_pars.tlli,
Change in osmo-ttcn3-hacks[master]: sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21669 ) Change subject: sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1977302fef4868dc1c330bc6f48f6a6608949393 Gerrit-Change-Number: 21669 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Dec 2020 09:50:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
