Merge "Fixed JSON format bug in Cell-RF JSON body"

diff --git a/e2sim/e2sm_examples/kpm_e2sm/README~ b/e2sim/e2sm_examples/kpm_e2sm/README~
deleted file mode 100644 (file)
index 0ae429d..0000000
--- a/e2sim/e2sm_examples/kpm_e2sm/README~
+++ /dev/null
@@ -1,6 +0,0 @@
-
-For this simulation, we make the following assumptions:
-DU ID can differ and we assign a separate ID
-CU-CP and CU-UP are always the same
-Cell Identities are different
-

diff --git a/e2sim/e2sm_examples/kpm_e2sm/e2sim-dev_1.0.0_amd64.deb b/e2sim/e2sm_examples/kpm_e2sm/e2sim-dev_1.0.0_amd64.deb
deleted file mode 100644 (file)
index 2e62d12..0000000
Binary files a/e2sim/e2sm_examples/kpm_e2sm/e2sim-dev_1.0.0_amd64.deb and /dev/null differ

diff --git a/e2sim/e2sm_examples/kpm_e2sm/e2sim_1.0.0_amd64.deb b/e2sim/e2sm_examples/kpm_e2sm/e2sim_1.0.0_amd64.deb
deleted file mode 100644 (file)
index 06c5543..0000000
Binary files a/e2sim/e2sm_examples/kpm_e2sm/e2sim_1.0.0_amd64.deb and /dev/null differ

diff --git a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
index 773c938..af4a87f 100644 (file)
--- a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
+++ b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
@@ -241,7 +241,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
              
            }
            
-           neighbor_str += "{\"CID\" : \"" + std::to_string(nextNbCell) + "\", \"Cell-RF\" : \"{\"rsrp\": " + std::to_string(nextNbRsrp) +
+           neighbor_str += "{\"CID\" : \"" + std::to_string(nextNbCell) + "\", \"Cell-RF\" : {\"rsrp\": " + std::to_string(nextNbRsrp) +
              ", \"rsrq\": " + std::to_string(nextNbRsrq) + ", \"rssinr\": " + std::to_string(nextNbRssinr) + "}}";
            
          }