dapps 0.1.1__tar.gz → 0.2.0__tar.gz

{dapps-0.1.1 → dapps-0.2.0}/.github/ISSUE_TEMPLATE/new_sm.yml

@@ -77,7 +77,7 @@ body:
     id: paired_issue
     attributes:
       label: Paired libe3 issue / PR (if any)
-      placeholder: "wineslab/dApp-libe3#123"
+      placeholder: "wineslab/libe3#123"
     validations:
       required: false
 

{dapps-0.1.1 → dapps-0.2.0}/.github/PULL_REQUEST_TEMPLATE.md

@@ -43,7 +43,7 @@ These mirror what CI (`.github/workflows/test.yml`) enforces. **All boxes must b
 
 ## Twin-repo coordination
 
-dapps is paired with [`libe3`](https://github.com/wineslab/dApp-libe3) and [`dApp-openairinterface5g`](https://github.com/wineslab/dApp-openairinterface5g). Breaking changes to the twin repos are not accepted.
+dapps is paired with [`libe3`](https://github.com/wineslab/libe3) and [`dApp-openairinterface5g`](https://github.com/wineslab/dApp-openairinterface5g). Breaking changes to the twin repos are not accepted.
 
 - [ ] This PR does not break the E3 wire protocol, OR a paired PR exists in the affected twin repo (link below).
 

{dapps-0.1.1 → dapps-0.2.0}/CONTRIBUTING.md

@@ -58,7 +58,7 @@ The following are **mandatory** for every contribution. PRs that do not meet the
 
 ### Service Models and twin-repo coordination
 
-This repository is part of a framework that includes [`libe3`](https://github.com/wineslab/dApp-libe3) (the gNB-side E3 agent) and [`dApp-openairinterface5g`](https://github.com/wineslab/dApp-openairinterface5g) (the OAI fork). PRs that change the E3 wire protocol or add a new Service Model must come with a paired PR in the affected twin repo, linked from the PR description.
+This repository is part of a framework that includes [`libe3`](https://github.com/wineslab/libe3) (the gNB-side E3 agent) and [`dApp-openairinterface5g`](https://github.com/wineslab/dApp-openairinterface5g) (the OAI fork). PRs that change the E3 wire protocol or add a new Service Model must come with a paired PR in the affected twin repo, linked from the PR description.
 
 ## Code of Conduct
 

{dapps-0.1.1 → dapps-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dapps
-Version: 0.1.1
+Version: 0.2.0
 Summary: A library for creating and connecting dApps to Open RAN units.
 Keywords: dApps,O-RAN,5G,cellular,networks
 Author-Email: Andrea Lacava <thecave003@gmail.com>
@@ -28,14 +28,16 @@ Provides-Extra: cnn
 Requires-Dist: libiq; extra == "cnn"
 Provides-Extra: gui
 Requires-Dist: flask; extra == "gui"
-Requires-Dist: flask-socketio; extra == "gui"
+Requires-Dist: flask-sock; extra == "gui"
+Requires-Dist: flask-cors; extra == "gui"
 Requires-Dist: matplotlib; extra == "gui"
 Provides-Extra: network
 Requires-Dist: pysctp; extra == "network"
 Provides-Extra: all
 Requires-Dist: pysctp; extra == "all"
 Requires-Dist: flask; extra == "all"
-Requires-Dist: flask-socketio; extra == "all"
+Requires-Dist: flask-sock; extra == "all"
+Requires-Dist: flask-cors; extra == "all"
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: influxdb_client; extra == "all"
 Requires-Dist: libiq; extra == "all"

dapps-0.2.0/VERSION

@@ -0,0 +1 @@
+0.2.0

{dapps-0.1.1 → dapps-0.2.0}/examples/spectrum_dapp.py

@@ -9,7 +9,11 @@ import time
 import logging
 
 from e3interface.e3_connector import E3LinkLayer, E3TransportLayer
-from spectrum.spectrum_dapp import SpectrumSharingDApp, compute_fft_size
+from spectrum.spectrum_dapp import (
+    SpectrumSharingDApp,
+    compute_fft_size,
+    make_periodic_toggle_callback,
+)
 from spectrum.threshold_detector import StaticThresholdDetector, AdaptiveThresholdDetector
 
 LOG_DIR = '/tmp/'
@@ -23,17 +27,15 @@ def stop_program(time_to_wait, dapp: SpectrumSharingDApp):
 
 def main(args):
     if args.model:
-        try:
-            from libiq.classifier.cnn import Classifier
-        except ModuleNotFoundError:
-            print(
-                "Optional dependencies to run this example are not installed.\n"
-                "Fix this by running:\n\n"
-                "    pip install libiq  # OR\n"
-                "    pip install dapps[cnn] (minimal) # OR\n"
-                "    pip install dapps[all] (preferred)\n"
-            )
-            exit(-1)
+        # CNN signal classification is not wired into SpectrumSharingDApp; a
+        # classifier= kwarg would fall through to **kwargs and be dropped, so
+        # --model (and --time-window/--moving-avg-window/--extraction-window)
+        # would silently do nothing. Fail loudly instead.
+        raise SystemExit(
+            "--model (CNN signal classification) is not supported by "
+            "SpectrumSharingDApp; remove --model and the associated "
+            "--time-window/--moving-avg-window/--extraction-window flags."
+        )
 
     # This value really depends on the RF conditions and the RU used and
     # should be carefully calibrated.
@@ -81,16 +83,6 @@ def main(args):
             f" | window: {args.average_over_frames} frames"
         )
 
-    classifier = None
-    if args.model:
-        classifier = Classifier(
-            time_window=args.time_window,
-            input_vector=fft_size,
-            moving_avg_window=args.moving_avg_window,
-            extraction_window=args.extraction_window,
-            model_path=args.model,
-        )
-
     dapp = SpectrumSharingDApp(
         detector=detector,
         save_iqs=args.save_iqs,
@@ -100,14 +92,21 @@ def main(args):
         energyGui=args.energy_gui,
         iqPlotterGui=args.iq_plotter_gui,
         dashboard=args.demo_gui,
-        classifier=classifier,
+        viz_web_port=args.viz_web_port,
+        viz_zmq_port=args.viz_zmq_port,
+        external_viz=args.external_viz,
         center_freq=args.center_freq,
         num_prbs=args.num_prbs,
         e_sampling=args.e,
         num_subcarrier_spacing=args.num_subcarrier_spacing,
         sampling_threshold=args.sampling_threshold,
+        max_samples_per_file=args.max_samples_per_file,
+        fp16_beta=args.fp16_beta,
+        sensing_only=args.sensing_only,
+        strict_sensing=args.strict_sensing,
+        min_sensing_symbols=args.min_sensing_symbols,
+        encoding_method=args.encoding_method,
         ground_truth=args.ground_truth,
-        show_controls=args.show_controls,
         dapp_name="SpectrumSharing",
         dapp_version="1.0.0",
         vendor="WinesLab",
@@ -137,7 +136,29 @@ def main(args):
                 )
     time.sleep(1)
 
-    dapp.send_subscription_request()
+    if not dapp.send_subscription_request():
+        # send_subscription_request returns True only if the gNB accepted both
+        # the L1-KPM (RF=2) and Spectrum (RF=1) subscriptions; anything else
+        # means the dApp would run deaf, so abort with a non-zero exit.
+        dapp.stop()
+        raise SystemExit("[FATAL] gNB did not accept the dApp subscriptions; aborting")
+
+    # Optional sensing-policy toggle.  When --toggle-period > 0, installs
+    # a periodic on/off toggle that flips the gNB's masked UL TDA
+    # selector via spectrum_sm ctrl_id=2.  Operator must have configured
+    # additional_ul_tdas in the gNB (e.g. "0:7") for the scheduler to
+    # have a short TDA to switch to.  See examples/README or the gNB
+    # boot log ([additional] tag) to verify.
+    if args.toggle_period > 0:
+        print(f"[INFO] Installing sensing-policy toggle: "
+              f"period={args.toggle_period}s "
+              f"n_slots={args.toggle_n_slots} "
+              f"mask_when_on=0x{args.toggle_mask:04x}")
+        dapp.set_sensing_policy_logic(make_periodic_toggle_callback(
+            period_s=args.toggle_period,
+            n_slots=args.toggle_n_slots,
+            mask_when_on=args.toggle_mask,
+        ))
 
     if args.timed:
         timer = threading.Thread(target=stop_program, args=(args.timed, dapp), daemon=False)
@@ -167,7 +188,8 @@ if __name__ == "__main__":
     parser.add_argument('--save-iqs', action='store_true', default=False,
                         help="Save I/Q samples to SigMF files")
     parser.add_argument('--control', action='store_true', default=False,
-                        help="Send PRB blacklist control messages to the gNB")
+                        help="Send PRB-block control messages to the gNB when "
+                             "PRBs are detected above the noise threshold")
     parser.add_argument('--noise-floor-threshold', type=int, default=None,
                         help="Detection threshold in dB (static) or dB above noise floor (adaptive)")
     parser.add_argument('--use-adaptive-noise-floor', action='store_true', default=False,
@@ -184,7 +206,13 @@ if __name__ == "__main__":
     parser.add_argument('--iq-plotter-gui', action='store_true', default=False,
                         help="Enable IQ time-domain plotter")
     parser.add_argument('--demo-gui', action='store_true', default=False,
-                        help="Enable dashboard visualization")
+                        help="Publish per-slot subcarrier power to the visualizer")
+    parser.add_argument('--viz-web-port', type=int, default=5001,
+                        help="Visualizer web UI port (default 5001)")
+    parser.add_argument('--viz-zmq-port', type=int, default=5559,
+                        help="ZMQ port the dApp publishes on / the visualizer reads (default 5559)")
+    parser.add_argument('--external-viz', action='store_true', default=False,
+                        help="Don't spawn the visualizer; publish to an already-running one")
     parser.add_argument('--num-prbs', type=int, default=106,
                         help="Number of PRBs")
     parser.add_argument('--num-subcarrier-spacing', type=int, default=30,
@@ -205,14 +233,68 @@ if __name__ == "__main__":
                         help="Samples to retain after CNN energy peak detection")
     parser.add_argument('--sampling-threshold', type=int, default=5,
                         help="Render a new dashboard frame every N IQ batches (visualization only, does not affect IQ delivery or recording)")
+    parser.add_argument('--max-samples-per-file', type=int, default=46_080_000,
+                        help="Rotate the SigMF capture file once a segment reaches "
+                             "this many true IQ samples (default 46080000). Each "
+                             "indication is kept whole, so a segment may exceed the "
+                             "threshold by up to one indication's worth of samples. "
+                             "Segment wall-clock duration depends on the capture rate. "
+                             "Only used with --save-iqs.")
     parser.add_argument('--ground-truth', type=str, default='', metavar='LABEL',
                         help="Initial ground truth label written into IQ annotations "
                              "(only used with --save-iqs). "
                              "Updatable at runtime via the dashboard GUI "
                              "when --demo-gui is also set.")
-    parser.add_argument('--show-controls', action='store_true', default=False,
-                        help="Show tunable controls (sampling threshold) in the dashboard GUI. "
-                             "Only meaningful with --demo-gui.")
+    parser.add_argument('--fp16-beta', type=float, default=1.0 / 2048.0,
+                        help="FP16 IQ rescale factor; MUST match the gNB "
+                             "E3Configuration.fp16_beta (the reader rescales by "
+                             "1/beta). Default 1/2048 matches the gNB code default; "
+                             "the X410 sample conf overrides it to 0.0078125 (1/128).")
+    parser.add_argument('--encoding-method', type=str, default='asn1',
+                        choices=['asn1', 'json'],
+                        help="Wire encoding for Spectrum-* envelopes (default: asn1).")
+    parser.add_argument('--no-sensing-only', dest='sensing_only',
+                        action='store_false', default=True,
+                        help="Disable the sensing-window filter. By default the dApp uses the "
+                             "sensing ranges from the Spectrum SM (RF=1) to slice the detector "
+                             "input to sensing-PUSCH cells; passing this flag uses every cell.")
+    parser.add_argument('--strict-sensing', dest='strict_sensing',
+                        action='store_true', default=False,
+                        help="Stricter sensing filter: drop any slot whose sensing window "
+                             "doesn't cover the full slot (i.e. any UE PUSCH was granted "
+                             "in that slot). Eliminates UE CP/spectral bleed at the cost "
+                             "of a sparser waterfall under heavy UE traffic. Requires "
+                             "--sensing-only (the default).")
+    parser.add_argument('--min-sensing-symbols', type=int, default=1,
+                        help="Minimum number of kept symbols required to emit the slot to "
+                             "the dashboard. Default 1: display every slot that has any "
+                             "sensing symbol — keeps the waterfall scrolling even under "
+                             "heavy UE UL where the MAC scheduler leaves only one free "
+                             "symbol per slot. Set to 2 to drop the typical \"only sym 13 "
+                             "survived\" partial-sensing slots (evens out brightness at "
+                             "the cost of dashboard freezes under load). Set to 14 to "
+                             "require fully-clean slots (equivalent to "
+                             "--strict-sensing).")
+
+    # --- Optional sensing-policy toggle ----------------------------- #
+    # Drives the gNB's masked UL TDA selector via spectrum_sm ctrl_id=2.
+    # Disabled by default (toggle-period=0); set --toggle-period to a
+    # positive value to enable.  Requires additional_ul_tdas (e.g. "0:7")
+    # on the gNB so the scheduler has a short TDA to switch to.
+    parser.add_argument('--toggle-period', type=float, default=0.0,
+                        metavar='SECONDS',
+                        help="Toggle the gNB sensing policy on/off every N seconds "
+                             "(0 = disabled, default).  When > 0, alternates between "
+                             "installing the mask (active) and clearing it (deactivate).  "
+                             "Requires additional_ul_tdas configured on the gNB.")
+    parser.add_argument('--toggle-n-slots', type=int, default=20,
+                        help="numb_slots_frame of the gNB for the per-slot mask "
+                             "(mu=1 -> 20).  Must match the gNB exactly or the gNB "
+                             "will NACK the policy with an n_slots mismatch.")
+    parser.add_argument('--toggle-mask', type=lambda s: int(s, 0), default=0x3F80,
+                        metavar='HEX',
+                        help="14-bit symbol bitmap applied uniformly to every slot "
+                             "when the toggle is active (default 0x3F80 = syms 7..13).")
 
     args = parser.parse_args()
     print("Start dApp")

{dapps-0.1.1 → dapps-0.2.0}/libiqsaver/include/iqsaver/iqsaver.hpp

@@ -4,7 +4,7 @@
 //
 // libiqsaver is a SigMF-compliant IQ-sample writer with sample-count and
 // time-based file rotation, deferred annotations, and a configurable SigMF
-// extension namespace (default: "spear:"). The library is the C++ backend
+// extension namespace (default: "dapp:"). The library is the C++ backend
 // for the Python `iq_saver` package used by the SPEAR spectrum dApp; it is
 // also usable directly as a standalone C++ library installed via CMake +
 // pkg-config (libiqsaver.pc).

{dapps-0.1.1 → dapps-0.2.0}/libiqsaver/include/iqsaver/types.hpp

@@ -19,7 +19,7 @@ struct IQSaverConfig {
     std::string filename;
     std::optional<uint64_t> max_samples_per_file;
     std::optional<double>   rotation_interval;
-    std::string extension_namespace = "spear";
+    std::string extension_namespace = "dapp";
     // JSON-encoded object of extra global metadata fields. Keys whose names
     // do not already start with `core:` or `<extension_namespace>:` are
     // prefixed with `<extension_namespace>:` before being written.

{dapps-0.1.1 → dapps-0.2.0}/libiqsaver/src/iq_saver_writer.cpp

@@ -29,6 +29,12 @@ namespace {
 
 constexpr const char* kSigMFVersion = "1.0.0";
 
+// Fallback version stamped in the SigMF `core:extensions` entry for the
+// configured extension namespace when the caller supplies no `schema_version`
+// in extra metadata. Callers (e.g. the spectrum dApp) that co-version their
+// namespace pass an explicit `schema_version`, which takes precedence.
+constexpr const char* kDefaultExtensionVersion = "1.0.0";
+
 double now_seconds() {
     using namespace std::chrono;
     return duration_cast<duration<double>>(
@@ -189,6 +195,18 @@ struct IQSaverWriter::Impl {
         if (!config.hw_info.empty()) {
             record_global["core:hw"] = config.hw_info;
         }
+        // Declare the extension namespace we stamp so SigMF readers know which
+        // extension the `<ns>:*` fields belong to. Version is co-versioned with
+        // the namespace: use the caller's `schema_version` when provided, else
+        // fall back to kDefaultExtensionVersion. `optional=false` — the `<ns>:*`
+        // geometry/domain fields are required to interpret the recording.
+        record_global["core:extensions"] = json::array(
+            {json{{"name", config.extension_namespace},
+                  {"version",
+                   extra_metadata.value(
+                       "schema_version",
+                       std::string(kDefaultExtensionVersion))},
+                  {"optional", false}}});
         for (auto it = extra_metadata.begin(); it != extra_metadata.end();
              ++it) {
             if (it.key() == "sampling_threshold") continue;
@@ -314,9 +332,15 @@ struct IQSaverWriter::Impl {
                           std::optional<double> timestamp) {
         double ts = timestamp.value_or(now_seconds());
 
-        // Rotation check (mirrors Python if/elif at iq_saver.py:244-250)
+        // Rotation check. max_samples_per_file is a count of true IQ *samples*,
+        // so it is compared against iq_sample_count — NOT frame_count, which
+        // counts save_samples() calls. The check runs before the write so each
+        // call's samples stay whole within one segment; a segment therefore
+        // reaches *at least* max_samples_per_file and may exceed it by up to one
+        // call's worth of samples. It is a rotation threshold, not a hard cap —
+        // splitting a single call across files would fragment an indication.
         if (config.max_samples_per_file.has_value() &&
-            frame_count >= *config.max_samples_per_file) {
+            iq_sample_count >= *config.max_samples_per_file) {
             rotate_file(ts);
         } else if (config.rotation_interval.has_value() &&
                    file_start_time.has_value() &&

{dapps-0.1.1 → dapps-0.2.0}/libiqsaver/swig/iqsaver_swig.hpp

@@ -33,7 +33,7 @@ struct IQSaverConfigSwig {
     // Negative => unset.
     long long   max_samples_per_file = -1;
     double      rotation_interval    = -1.0;
-    std::string extension_namespace  = "spear";
+    std::string extension_namespace  = "dapp";
     std::string extra_metadata_json  = "{}";
 };
 

{dapps-0.1.1 → dapps-0.2.0}/pyproject.toml

@@ -43,12 +43,13 @@ Source = "https://github.com/wineslab/dApp-library"
 [project.optional-dependencies]
 api = ["influxdb_client"]
 cnn = ["libiq"]
-gui = ["flask", "flask-socketio", "matplotlib"]
+gui = ["flask", "flask-sock", "flask-cors", "matplotlib"]
 network = ["pysctp"]
 all = [
     "pysctp",
     "flask",
-    "flask-socketio",
+    "flask-sock",
+    "flask-cors",
     "matplotlib",
     "influxdb_client",
     "libiq",

{dapps-0.1.1 → dapps-0.2.0}/src/dapp/dapp.py

@@ -127,8 +127,11 @@ class DApp(ABC):
         else:
             dapp_logger.warning(f"Subscription response not positive: {data}")
 
-    def send_subscription_request(self, subscriptionTime: int | None = None, periodicity: int | None = None) -> bool: 
+    def send_subscription_request(self, subscriptionTime: int | None = None, periodicity: int | None = None) -> bool:
         self.e3_interface.add_subscription_callback(self.dapp_id, self.manage_subscription_response)
+
+        self.e3_interface.add_indication_callback(self.dapp_id, 0, self._handle_indication)
+        self.e3_interface.add_xapp_control_callback(self.dapp_id, 0, self._handle_xapp_control)
         dapp_logger.debug(f"Subscription callbacks: {self.e3_interface.subscription_callbacks}")
         scheduled = self.e3_interface.send_subscription_request(
                 self.dapp_id,
@@ -148,7 +151,7 @@ class DApp(ABC):
         pass
 
     @abstractmethod
-    def _handle_indication(self, dapp_identifier: int, data: bytes):
+    def _handle_indication(self, dapp_identifier: int, ran_function_id: int, data: bytes):
         # This in the future might become a class
         pass
 

{dapps-0.1.1 → dapps-0.2.0}/src/e3interface/defs/e3.json

@@ -344,150 +344,72 @@
     },
     "E3-PDU": {
       "type": "object",
+      "required": ["type", "id"],
       "properties": {
-        "id": {
-          "$ref": "#/$defs/E3-MessageID"
-        },
-        "msg": {
-          "oneOf": [
-            {
-              "type": "object",
-              "properties": {
-                "setupRequest": {
-                  "$ref": "#/$defs/E3-SetupRequest"
-                }
-              },
-              "required": [
-                "setupRequest"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "setupResponse": {
-                  "$ref": "#/$defs/E3-SetupResponse"
-                }
-              },
-              "required": [
-                "setupResponse"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "subscriptionRequest": {
-                  "$ref": "#/$defs/E3-SubscriptionRequest"
-                }
-              },
-              "required": [
-                "subscriptionRequest"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "subscriptionDelete": {
-                  "$ref": "#/$defs/E3-SubscriptionDelete"
-                }
-              },
-              "required": [
-                "subscriptionDelete"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "subscriptionResponse": {
-                  "$ref": "#/$defs/E3-SubscriptionResponse"
-                }
-              },
-              "required": [
-                "subscriptionResponse"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "indicationMessage": {
-                  "$ref": "#/$defs/E3-IndicationMessage"
-                }
-              },
-              "required": [
-                "indicationMessage"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "dAppControlAction": {
-                  "$ref": "#/$defs/E3-DAppControlAction"
-                }
-              },
-              "required": [
-                "dAppControlAction"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "dAppReport": {
-                  "$ref": "#/$defs/E3-DAppReport"
-                }
-              },
-              "required": [
-                "dAppReport"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "xAppControlAction": {
-                  "$ref": "#/$defs/E3-XAppControlAction"
-                }
-              },
-              "required": [
-                "xAppControlAction"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "releaseMessage": {
-                  "$ref": "#/$defs/E3-ReleaseMessage"
-                }
-              },
-              "required": [
-                "releaseMessage"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "messageAck": {
-                  "$ref": "#/$defs/E3-MessageAck"
-                }
-              },
-              "required": [
-                "messageAck"
-              ],
-              "additionalProperties": false
-            }
+        "type": {
+          "type": "string",
+          "enum": [
+            "setupRequest",
+            "setupResponse",
+            "subscriptionRequest",
+            "subscriptionDelete",
+            "subscriptionResponse",
+            "indicationMessage",
+            "dAppControlAction",
+            "dAppReport",
+            "xAppControlAction",
+            "releaseMessage",
+            "messageAck"
           ]
-        }
+        },
+        "id": { "$ref": "#/$defs/E3-MessageID" },
+        "timestamp": { "type": "integer", "minimum": 0 }
       },
-      "required": [
-        "id",
-        "msg"
+      "oneOf": [
+        {
+          "properties": { "type": { "const": "setupRequest" } },
+          "allOf": [ { "$ref": "#/$defs/E3-SetupRequest" } ]
+        },
+        {
+          "properties": { "type": { "const": "setupResponse" } },
+          "allOf": [ { "$ref": "#/$defs/E3-SetupResponse" } ]
+        },
+        {
+          "properties": { "type": { "const": "subscriptionRequest" } },
+          "allOf": [ { "$ref": "#/$defs/E3-SubscriptionRequest" } ]
+        },
+        {
+          "properties": { "type": { "const": "subscriptionDelete" } },
+          "allOf": [ { "$ref": "#/$defs/E3-SubscriptionDelete" } ]
+        },
+        {
+          "properties": { "type": { "const": "subscriptionResponse" } },
+          "allOf": [ { "$ref": "#/$defs/E3-SubscriptionResponse" } ]
+        },
+        {
+          "properties": { "type": { "const": "indicationMessage" } },
+          "allOf": [ { "$ref": "#/$defs/E3-IndicationMessage" } ]
+        },
+        {
+          "properties": { "type": { "const": "dAppControlAction" } },
+          "allOf": [ { "$ref": "#/$defs/E3-DAppControlAction" } ]
+        },
+        {
+          "properties": { "type": { "const": "dAppReport" } },
+          "allOf": [ { "$ref": "#/$defs/E3-DAppReport" } ]
+        },
+        {
+          "properties": { "type": { "const": "xAppControlAction" } },
+          "allOf": [ { "$ref": "#/$defs/E3-XAppControlAction" } ]
+        },
+        {
+          "properties": { "type": { "const": "releaseMessage" } },
+          "allOf": [ { "$ref": "#/$defs/E3-ReleaseMessage" } ]
+        },
+        {
+          "properties": { "type": { "const": "messageAck" } },
+          "allOf": [ { "$ref": "#/$defs/E3-MessageAck" } ]
+        }
       ]
     }
   }