From 76021babc7353f87d4251345bd44d4a42e8abac3 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 12 Nov 2020 17:05:11 +0100
Subject: [PATCH] cell_modifiers: refactor HO cell configs

* rename intrafreq vs intraenb
* add missing mandatory params

Change-Id: Icc1fe5c1711ecbed2f1b8b1e6a0b51c2d28ec651
---
 .../mod-enb-cells-inter-freq-ho.conf          | 31 -------------------
 ... mod-enb-cells-intraenb-intrafreq-ho.conf} |  6 +++-
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 sysmocom/scenarios/mod-enb-cells-inter-freq-ho.conf
 rename sysmocom/scenarios/{mod-enb-cells-intra-freq-ho.conf => mod-enb-cells-intraenb-intrafreq-ho.conf} (69%)

diff --git a/sysmocom/scenarios/mod-enb-cells-inter-freq-ho.conf b/sysmocom/scenarios/mod-enb-cells-inter-freq-ho.conf
deleted file mode 100644
index 75765c2e..00000000
--- a/sysmocom/scenarios/mod-enb-cells-inter-freq-ho.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# HO config for intra-frequency HO between two cells (same EARFCN) on different RF ports (srsENB)
-modifiers:
-  enb:
-  - id: 0x19B
-    enable_measurements: true
-    cell_list:
-    - cell_id: 0x01
-      pci: 0x01
-      dl_earfcn: 2850
-      root_seq_idx: 204
-      rf_port: 0
-      scell_list: []
-      ncell_list:
-      - enb_id: 0x19C
-        cell_id: 0x02
-        pci: 0x02
-        dl_earfcn: 2850
-  - id: 0x19C
-    enable_measurements: true
-    cell_list:
-    - cell_id: 0x02
-      pci: 0x02
-      dl_earfcn: 2850
-      root_seq_idx: 205
-      rf_port: 0
-      scell_list: []
-      ncell_list:
-      - enb_id: 0x19B
-        cell_id: 0x01
-        pci: 0x01
-        dl_earfcn: 2850
diff --git a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
similarity index 69%
rename from sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf
rename to sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
index 0dc337cc..8b6f569d 100644
--- a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf
+++ b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
@@ -1,9 +1,11 @@
-# HO config for intra-frequency HO between two cells (same EARFCN) on different RF ports (srsENB)
+# Cell config for Intra eNB HO, two cells on same frequencey (same EARFCN) on different RF ports (srsENB)
 modifiers:
   enb:
   - cell_list:
     - cell_id: 0x01
       pci: 0x01
+      tac: 0x0007
+      root_seq_idx: 204
       dl_earfcn: 2850
       rf_port: 0
       scell_list: []
@@ -14,6 +16,8 @@ modifiers:
         dl_earfcn: 2850
     - cell_id: 0x02
       pci: 0x02
+      tac: 0x0007
+      root_seq_idx: 207
       dl_earfcn: 2850
       rf_port: 1
       scell_list: []