This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26153 )
Change subject: pcu: Use lower case for for counters assignment_{UL,DL}
......................................................................
pcu: Use lower case for for counters assignment_{UL,DL}
The counters were renamed recently to be lower-case.
Tests on older version will still work by checking the older name.
Change-Id: I417d3bb12b5af2f50dce6bc9dbb705b7d7a52bce
Depends: osmo-pcu.git Change-Id: I8de29c7e9dd8b17719dfeb784380c685377ce117
Related: SYS#4878
---
M pcu/PCU_Tests.ttcn
1 file changed, 42 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/26153/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 2cc6fad..5754451 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -2390,11 +2390,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
};
f_statsd_expect(expect);
@@ -2412,11 +2412,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
};
f_statsd_expect(expect);
@@ -2438,11 +2438,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
};
f_statsd_expect(expect);
@@ -2721,13 +2721,22 @@
var StatsDExpects expect := {
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 0, max := 0},
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1},
- { 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 := 64, max := 64},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 0, max := 0}
};
+ if (mp_osmo_pcu_newer_than_0_9_0) {
+ expect := expect & {
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0}
+ };
+ } else {
+ expect := expect & {
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0}
+ };
+ }
f_statsd_expect(expect);
f_shutdown(__BFILE__, __LINE__, final := true);
@@ -3148,11 +3157,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 1, max := 1 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
};
f_statsd_expect(expect);
@@ -3551,12 +3560,22 @@
var StatsDExpects expect := {
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1},
- { 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 := 10, max := 10},
{ name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 26, max := 26}
};
+ if (mp_osmo_pcu_newer_than_0_9_0) {
+ expect := expect & {
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1}
+ };
+ } else {
+ expect := expect & {
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1}
+ };
+ }
f_statsd_expect(expect);
f_shutdown(__BFILE__, __LINE__, final := true);
@@ -3721,11 +3740,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
@@ -3772,11 +3791,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
@@ -3821,11 +3840,11 @@
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
@@ -3903,9 +3922,9 @@
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
@@ -3948,9 +3967,9 @@
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
@@ -4004,12 +4023,12 @@
{ name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 8, max := 8 },
{ name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := 0, max := 0 },
- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 7, max := 7 },
+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 7, max := 7 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 7, max := 7 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },
{ name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := 1, max := 1 },
- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }
};
f_statsd_expect(expect);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26153
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: I417d3bb12b5af2f50dce6bc9dbb705b7d7a52bce
Gerrit-Change-Number: 26153
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211108/7f0d75c7/attachment.htm>