From 8bc584ce802bbd7ec3b8061f3bfeaf227e0f892d Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Tue, 1 Feb 2022 14:51:54 +0900
Subject: [PATCH] [CX] Update test code

---
 configs/volte.yaml.in          | 22 +++++++++++-----------
 tests/volte/cx-test.c          | 23 ++++++++++++++++++++---
 tests/volte/diameter-cx-path.c |  3 +--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/configs/volte.yaml.in b/configs/volte.yaml.in
index 0f65e9c44..eb26d7ef0 100644
--- a/configs/volte.yaml.in
+++ b/configs/volte.yaml.in
@@ -44,15 +44,15 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 001
-        mnc: 01
+        mcc: 901
+        mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
+        mcc: 901
+        mnc: 70
+      tac: 1
     security:
         integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
@@ -115,20 +115,20 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 901
+          mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 901
+          mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 901
+          mnc: 70
         s_nssai:
           - sst: 1
     security:
diff --git a/tests/volte/cx-test.c b/tests/volte/cx-test.c
index 67f6c871f..a5d63c000 100644
--- a/tests/volte/cx-test.c
+++ b/tests/volte/cx-test.c
@@ -309,13 +309,30 @@ static void test1_func(abts_case *tc, void *data)
     /* DELAY for setup IMS */
     ogs_msleep(100);
 
-    /* Send UEContextReleaseRequest */
-    sendbuf = test_s1ap_build_ue_context_release_request(test_ue,
-            S1AP_Cause_PR_radioNetwork, S1AP_CauseRadioNetwork_user_inactivity);
+    /* Send Detach Request */
+    emmbuf = testemm_build_detach_request(test_ue, 1, true, false);
+    ABTS_PTR_NOTNULL(tc, emmbuf);
+    sendbuf = test_s1ap_build_initial_ue_message(
+            test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true);
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testenb_s1ap_send(s1ap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Receive OLD UEContextReleaseCommand */
+    enb_ue_s1ap_id = test_ue->enb_ue_s1ap_id;
+
+    recvbuf = testenb_s1ap_read(s1ap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    tests1ap_recv(test_ue, recvbuf);
+
+    /* Send OLD UEContextReleaseComplete */
+    sendbuf = test_s1ap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testenb_s1ap_send(s1ap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    test_ue->enb_ue_s1ap_id = enb_ue_s1ap_id;
+
     /* Receive UEContextReleaseCommand */
     recvbuf = testenb_s1ap_read(s1ap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
diff --git a/tests/volte/diameter-cx-path.c b/tests/volte/diameter-cx-path.c
index 97e9e98c9..b523f180f 100644
--- a/tests/volte/diameter-cx-path.c
+++ b/tests/volte/diameter-cx-path.c
@@ -277,8 +277,7 @@ static void test_cx_uaa_cb(void *data, struct msg **msg)
         }
     }
 
-    ogs_assert(!err && exp_err &&
-            result_code == OGS_DIAM_CX_FIRST_REGISTRATION);
+    ogs_assert(!err && exp_err);
 
     /* Free the message */
     ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);