<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26153">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Use lower case for for counters assignment_{UL,DL}<br><br>The counters were renamed recently to be lower-case.<br>Tests on older version will still work by checking the older name.<br><br>Change-Id: I417d3bb12b5af2f50dce6bc9dbb705b7d7a52bce<br>Depends: osmo-pcu.git Change-Id: I8de29c7e9dd8b17719dfeb784380c685377ce117<br>Related: SYS#4878<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 42 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/26153/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 2cc6fad..5754451 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -2390,11 +2390,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span>@@ -2412,11 +2412,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span>@@ -2438,11 +2438,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span>@@ -2721,13 +2721,22 @@</span><br><span> </span><br><span> var StatsDExpects expect := {</span><br><span> { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 0, max := 0},</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0},</span><br><span> { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1},</span><br><span> { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 0, max := 0},</span><br><span> { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 64, max := 64},</span><br><span> { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 0, max := 0}</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect := expect & {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect := expect & {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span>@@ -3148,11 +3157,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span>@@ -3551,12 +3560,22 @@</span><br><span> </span><br><span> var StatsDExpects expect := {</span><br><span> { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1},</span><br><span> { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1},</span><br><span> { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 1, max := 1},</span><br><span> { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 10, max := 10},</span><br><span> { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 26, max := 26}</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect := expect & {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect := expect & {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 1, max := 1},</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 1, max := 1}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span>@@ -3721,11 +3740,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span>@@ -3772,11 +3791,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span>@@ -3821,11 +3840,11 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span>@@ -3903,9 +3922,9 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span>@@ -3948,9 +3967,9 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span>@@ -4004,12 +4023,12 @@</span><br><span> { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 8, max := 8 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 7, max := 7 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul", mtype := "c", min := 7, max := 7 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 7, max := 7 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span> { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_dl", mtype := "c", min := 0, max := 0 }</span><br><span> };</span><br><span> f_statsd_expect(expect);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26153">change 26153</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26153"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I417d3bb12b5af2f50dce6bc9dbb705b7d7a52bce </div>
<div style="display:none"> Gerrit-Change-Number: 26153 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>