[M] Change in osmo-ttcn3-hacks[master]: RemSIM/server: Add test to verify maintenance mapping
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43838?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: RemSIM/server: Add test to verify maintenance mapping ...................................................................... RemSIM/server: Add test to verify maintenance mapping While have a regular mapping, add a maintenance mapping to a different client but to the same bank/slot. Expect the regular mapping to be suspended while the maintenance mapping exist. After maintenance mapping is deleted, expect the regular mapping to be resumed. Related: SYS#8159 Change-Id: I091dfe999b5b3473c67d6874ca31d238ee75b70e --- M remsim/RSRES.ttcn M remsim/RemsimServer_Tests.ttcn 2 files changed, 142 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/remsim/RSRES.ttcn b/remsim/RSRES.ttcn index a988b66..7ccd817 100644 --- a/remsim/RSRES.ttcn +++ b/remsim/RSRES.ttcn @@ -61,7 +61,8 @@ UNACKNOWLEDGED, ACTIVE, DELETE_REQ, - DELETING + DELETING, + INACTIVE }; type record JsSlotmap { diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 4dce01f..22a8c31 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -37,12 +37,15 @@ } /* run a HTTP PUT to add a new slotmap to the remsim-server */ -function f_rsres_post_slotmap(JsSlotmap slotmap, template integer exp_sts := 201) +function f_rsres_post_slotmap(JsSlotmap slotmap, template integer exp_sts := 201, integer priority := 0) runs on http_CT return HTTPResponse { var charstring body := oct2char(f_enc_JsSlotmap(slotmap)); var HTTPMessage http_resp; - http_resp := f_http_transact(url := "/api/backend/v1/slotmaps", method := "POST", - body := body, exp := tr_HTTP_Resp(exp_sts)) + var charstring url := "/api/backend/v1/slotmaps"; + if (priority != 0) { + url := url & "?priority=" & int2str(priority); + } + http_resp := f_http_transact(url := url, method := "POST", body := body, exp := tr_HTTP_Resp(exp_sts)) return http_resp.response; } @@ -57,12 +60,15 @@ /* run a HTTP DELETE to remove a slotmap from te remsim-server */ -function f_rsres_delete_slotmap(BankSlot bs, template integer exp_sts := 200) +function f_rsres_delete_slotmap(BankSlot bs, template integer exp_sts := 200, integer priority := 0) runs on http_CT return HTTPResponse { var HTTPMessage http_resp; var integer slotmap_id := bs.bankId * 65536 + bs.slotNr; - http_resp := f_http_transact(url := "/api/backend/v1/slotmaps/" & int2str(slotmap_id), - method := "DELETE", exp := tr_HTTP_Resp(exp_sts)); + var charstring url := "/api/backend/v1/slotmaps/" & int2str(slotmap_id); + if (priority != 0) { + url := url & "?priority=" & int2str(priority); + } + http_resp := f_http_transact(url := url, method := "DELETE", exp := tr_HTTP_Resp(exp_sts)); return http_resp.response; } @@ -301,12 +307,16 @@ } -function f_ensure_slotmaps(template JsSlotmaps maps) +function f_ensure_slotmaps(template JsSlotmaps maps, integer priority := 0) runs on http_CT { var JsRoot js; + var charstring url := "/api/backend/v1/slotmaps"; /* check that it is actually added */ - js := f_rsres_get("/api/backend/v1/slotmaps"); + if (priority != 0) { + url := url & "?priority=" & int2str(priority); + } + js := f_rsres_get(url); if (match(js.slotmaps, maps)) { setverdict(pass); } else { @@ -316,16 +326,16 @@ /* verify that exactly only one slotmap exists (the specified one) */ function f_ensure_slotmap_exists_only(template ClientSlot cslot, template BankSlot bslot, - template SlotmapState state := ?) + template SlotmapState state := ?, integer priority := 0) runs on http_CT { - f_ensure_slotmaps({ tr_JsSlotmap(bslot, cslot, state) } ); + f_ensure_slotmaps({ tr_JsSlotmap(bslot, cslot, state) }, priority); } /* verify that exactly only one slotmap exists (possibly among others) */ function f_ensure_slotmap_exists(template ClientSlot cslot, template BankSlot bslot, - template SlotmapState state := ?) + template SlotmapState state := ?, integer priority := 0) runs on http_CT { - f_ensure_slotmaps({ *, tr_JsSlotmap(bslot, cslot, state), * } ); + f_ensure_slotmaps({ *, tr_JsSlotmap(bslot, cslot, state), * }, priority); } @@ -661,6 +671,123 @@ } +/* Create a regular mapping between client and bank, then override it via priority mapping. */ +function f_TC_slotmap_switch_priority_mapping() runs on test_CT { + var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, testcasename())); + var BankSlot bslot := valueof(ts_BankSlot(1, 2)); + var ClientSlot cslot1 := valueof(ts_ClientSlot(3, 4)); + var ClientSlot cslot2 := valueof(ts_ClientSlot(5, 6)); + var JsSlotmap sm1 := valueof(ts_JsSlotmap(bslot, cslot1)); + var JsSlotmap sm2 := valueof(ts_JsSlotmap(bslot, cslot2)); + + f_init(); + f_rsres_init(); + + /* Create a band and two clients. */ + f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); + rspro[0].rspro_bank_id := bslot.bankId; + rspro[0].rspro_bank_nslots := 8; + f_rspro_connect_client(0); + + rspro_id := valueof(ts_CompId(remsimClient, "client1")); + f_rspro_init(rspro[1], mp_server_ip, mp_server_port, rspro_id, 1); + rspro[1].rspro_client_slot := cslot1; + f_rspro_connect_client(1); + + rspro_id := valueof(ts_CompId(remsimClient, "client2")); + f_rspro_init(rspro[2], mp_server_ip, mp_server_port, rspro_id, 2); + rspro[2].rspro_client_slot := cslot2; + f_rspro_connect_client(2); + + /* 1. Create regular mapping. */ + + /* Create a new slotmap via HTTP. */ + f_rsres_post_slotmap(sm1); + + /* Expect the slotmap to be pushed to bank and ACK it. */ + as_rspro_create_mapping(0, sm1.client, sm1.bank); + + /* An immediate slotmaps check doesn't work. */ + f_sleep(1.0); + + /* Verify that the slotmap exists and is ACTIVE. */ + f_ensure_slotmap_exists_only(sm1.client, sm1.bank, ACTIVE); + + /* Expect the client to be configured to connect to bank. */ + as_rspro_cfg_client_bank(1, sm1.bank, ?); + + /* 2. Create higher priority mapping, while having a regular mapping. */ + + /* Create a new slotmap via HTTP. It uses the same bankd/slot */ + f_rsres_post_slotmap(sm2, priority := 1); + + /* Expect the slotmap to be removed from bank. */ + as_rspro_remove_mapping(0, sm1.client, sm1.bank); + + /* Verify the slotmap is removed from client by setting IP/port to '0'. */ + as_rspro_cfg_client_bank(1, ?, tr_IpPort(ts_IPv4("0.0.0.0"), 0)); + + /* Expect the higher piority slotmap to be pushed to bank and ACK it. */ + as_rspro_create_mapping(0, sm2.client, sm2.bank); + + /* Expect the second client to be configured to connect to bank. */ + as_rspro_cfg_client_bank(2, sm2.bank, ?); + + /* An immediate slotmaps check doesn't work. */ + f_sleep(1.0); + + /* Verify that the regular slotmap is INACTIVE. */ + f_ensure_slotmap_exists_only(sm1.client, sm1.bank, INACTIVE); + + /* Verify that the higher piority slotmap exists and is ACTIVE. */ + f_ensure_slotmap_exists_only(sm2.client, sm2.bank, ACTIVE, 1); + + /* 3. Delete higher priority mapping while still having regular mapping. */ + + /* Delete the maintenance slotmap via REST. */ + f_rsres_delete_slotmap(sm2.bank, priority := 1); + + /* Expect the higher piority slotmap to be removed from bank. */ + as_rspro_remove_mapping(0, sm2.client, sm2.bank); + + /* Verify the higher piority slotmap is removed from client by setting IP/port to '0'. */ + as_rspro_cfg_client_bank(2, ?, tr_IpPort(ts_IPv4("0.0.0.0"), 0)); + + /* Expect the regular INACTIVE slotmap to be pushed to bank and ACK it. */ + as_rspro_create_mapping(0, sm1.client, sm1.bank); + + /* Expect the client to be configured to connect to bank. */ + as_rspro_cfg_client_bank(1, sm1.bank, ?); + + /* An immediate slotmaps check doesn't work. */ + f_sleep(1.0); + + /* Verify that the slotmap exists and is ACTIVE. */ + f_ensure_slotmap_exists_only(sm1.client, sm1.bank, ACTIVE); + + /* 3. Delete regular mapping. */ + + /* delete the slotmap via REST */ + f_rsres_delete_slotmap(sm1.bank); + + /* an immediate slotmaps check doesn't work */ + f_sleep(1.0); + + /* verify the slotmap is gone from REST interface immediately */ + f_ensure_slotmaps({}); + + /* verify the slotmap is removed from bankd */ + as_rspro_remove_mapping(0, sm1.client, sm1.bank); + + /* verify the slotmap is removed from client by setting IP/port to '0' */ + as_rspro_cfg_client_bank(1, ?, tr_IpPort(ts_IPv4("0.0.0.0"), 0)); +} + +/* Create a regular mapping between client and bank, then override it via higher piority mapping. */ +testcase TC_slotmap_switch_priority_mapping() runs on test_CT { + f_TC_slotmap_switch_priority_mapping(); +} + /* TODO @@ -689,6 +816,7 @@ execute( TC_slotmap_del_active() ); execute( TC_slotmap_del_active_client() ); execute( TC_slotmap_add_active_bank() ); + execute( TC_slotmap_switch_priority_mapping() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43838?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I091dfe999b5b3473c67d6874ca31d238ee75b70e Gerrit-Change-Number: 43838 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas@eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
laforge