Repository navigation
Commit f41e680
ccc: add the cell-level O-RRMPolicyRatio control (#49)
* ccc: add the cell-level O-RRMPolicyRatio control
xDevSM had E2SM-CCC only for REPORT. CccRrmPolicyRatioControl sends the
CONTROL Style 2 message (Header Format 1, Message Format 2) that sets
the min, max, and dedicated PRB ratios of a slice in one cell. It needs
no UE ID, unlike the RC slice-level PRB quota, which OCUDU accepts only
with the gnb_du_ue_id of a connected UE on that slice.
- find_ccc_function_id() takes the RAN function ID from the e2mgr info,
because gNBs assign it at E2 Setup. It accepts the xDevSM CCC OID and
the OID that OCUDU announces (1.3.6.1.4.1.53148.1.6.2.4).
- send_policies() checks every slice before it sends the first control,
so an invalid slice cannot leave a policy half applied.
- One slice per message, because OCUDU checks only the first structure.
- The dedicated ratio is at least 1, because OCUDU reads 0 as a missing
field and fails the control.
Tested on OCUDU release_26_10 with RU05 and three UEs on three slices:
the gNB acknowledged every control, and a 10% max ratio on one slice cut
that UE from 74 to 16 Mbit/s downlink.
Assisted-by: Claude:claude-opus-5-5
* ccc: decode the control outcome of an acknowledge as E2SM-CCC JSON
CccRrmPolicyRatioControl inherited the acknowledge handling of
xAppControlService. With a registered callback, that handling gives
the outcome octets of each RIC Control Acknowledge to
decode_control_ack(), which runs the native E2SM-DAPP decoder
dapp_dec_ctrl_out_asn on them. OCUDU sends a JSON E2SM-CCC Control
Outcome, so the ASN.1 decoder got JSON.
- xAppControlService._decode_ack() is now the decode step of both
acknowledge handlers. It still calls decode_control_ack(), so the
E2SM-DAPP services do not change. The hook is the one of the
develop-ccc-ca branch.
- CccRrmPolicyRatioControl overrides it with decode_ccc_control_ack(),
which returns a CccControlAck with a CccControlOutcome. The names and
the shape come from develop-ccc-ca.
- CccControlOutcome reads the fields that OCUDU sends: Format 2
listOfCellsForControlOutcome, with or without the
controlOutcomeFormat wrapper, accepted structures with their
currentValuesOfAttributes, and failed structures with their cause.
- nr_cell_id_of(), with the name and signature of develop-ccc-ca.
The tests use the outcome that convert_to_e2sm_response() and
pack_ric_control_response() of OCUDU build (feature/e2sm_ccc_report).
Assisted-by: Claude:claude-opus-5-5
* ccc: follow E2SM-CCC v08 in the RRMPolicyRatio control, decode failures
Review of the O-RRMPolicyRatio control against O-RAN.WG3.TS.E2SM-CCC-R005-v08.00
and TS 28.541:
- Old Values carry the resource type and member of each slice: the E2
node finds the instance to change from them (§8.1.5), and the member
list has at least one entry (§9.3.17). The old ratios are still left
out, because the xApp does not read them.
- dedicated_ratio defaults to 0 and is sent as given; the 0 -> 1 clamp
is gone. Each slice needs dedicated <= min <= max, and the min ratios
of one call sum to at most 100 (TS 28.541).
- sst must be 0..255, mcc 3 digits and mnc 2 or 3 digits, as in the
E2SM-CCC JSON schema.
- send_policies() sends all slices in one control, so the cell applies
them together and a failing slice cannot leave half a policy behind.
- xAppControlService._decode_ack() decodes nothing by default and each
Service Model overrides it. DAppPrbMaskControl keeps the E2SM-DAPP
decoder; the RC controls give their callbacks the RMR summary again
instead of a DAppControlAck.
- ricxappframe patch 003 adds ControlFailureMsg, the RICControlFailure
counterpart of the ControlAckMsg of patch 002. decode_ccc_control_ack()
reads both, so a failed control reaches the fail callback as a
CccControlAck with its outcome and its E2AP cause. It needs riclibe2ap
with the fixed failure decoder (aferaudo/libe2ap_package a10875d on dev).
- The README keeps the OCUDU limits in one bullet.
Assisted-by: Claude:claude-opus-5-5
* ricxappframe: size the control request buffer to the message (patch 004)
ControlRequestMsg.encode() encoded into a fixed 1024-byte buffer, so an E2SM-CCC control for two or more slices failed with 'Could not create payload.', and it returned the whole buffer, so every control went out as 1024 bytes. The buffer now fits the message and encode() returns only the PDU, with its length in bytes (riclibe2ap returns bits). Reported on PR 49.
Assisted-by: Claude:claude-opus-5-5
---------
Co-authored-by: Feraudo <aferaudo34@gmail.com>
Co-authored-by: Angelo Feraudo <33128793+aferaudo@users.noreply.github.com>1 parent 5cacc5a commit f41e680
14 files changed
Lines changed: 833 additions & 6 deletions
File tree
- src/xdevsm
- decorators
- ccc
- dApp/control
- ricxappframe_patches
- sm_framework/py_oran/ccc
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
234 | 235 | | |
235 | 236 | | |
236 | 237 | | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
237 | 273 | | |
238 | 274 | | |
239 | 275 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
273 | 272 | | |
274 | 273 | | |
275 | 274 | | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
276 | 281 | | |
277 | 282 | | |
278 | 283 | | |
| |||
282 | 287 | | |
283 | 288 | | |
284 | 289 | | |
285 | | - | |
| 290 | + | |
286 | 291 | | |
287 | 292 | | |
288 | 293 | | |
289 | 294 | | |
290 | 295 | | |
291 | 296 | | |
292 | 297 | | |
293 | | - | |
| 298 | + | |
294 | 299 | | |
295 | 300 | | |
296 | 301 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
64 | 65 | | |
65 | 66 | | |
66 | 67 | | |
| 68 | + | |
| 69 | + | |
67 | 70 | | |
68 | 71 | | |
69 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
60 | 90 | | |
61 | 91 | | |
62 | 92 | | |
| |||
0 commit comments