From: ec472j Date: Wed, 8 Apr 2020 13:44:48 +0000 (+0300) Subject: [RICPLT-209] - automation refactory setup X-Git-Tag: R5_RC~101^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0995008bd70d98ea5c374f71f710b920d2939765;p=ric-plt%2Fe2mgr.git [RICPLT-209] - automation refactory setup Change-Id: I4fef3b7a35b5df3c6f1da5529473aec0af28b9d3 Signed-off-by: ec472j --- diff --git a/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot b/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot index 3ce8a50..b575dd8 100644 --- a/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot +++ b/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot @@ -12,10 +12,8 @@ Library ../Scripts/e2t_db_script.py Test New E2T Send Init Stop E2 - - ${result}= cleanup_db.flush_and_restore_without_e2t_keys + ${result}= cleanup_db.flush Should Be Equal As Strings ${result} True - Start E2 prepare logs for tests diff --git a/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot b/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot deleted file mode 100644 index 3397099..0000000 --- a/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################## -# -# Copyright (c) 2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################## -# -# This source code is part of the near-RT RIC (RAN Intelligent Controller) -# platform project (RICP). -# - -*** Settings *** -Suite Setup Prepare Enviorment -Resource ../Resource/resource.robot -Resource ../Resource/Keywords.robot -Resource ../Resource/scripts_variables.robot -Library OperatingSystem -Library ../Scripts/find_rmr_message.py -Library ../Scripts/rsmscripts.py -Library REST ${url} - - - - -*** Test Cases *** -Run Endc setup request - Post Request setup node b endc-setup - Integer response status 204 - -Get request gnb - Sleep 1s - Get Request node b gnb test2 - Integer response status 200 - String response body ranName test2 - String response body ip ${ip_e2adapter} - String response body connectionStatus CONNECTED - Integer response body port 49999 - String response body nodeType GNB - String response body globalNbId plmnId 42f490 - String response body globalNbId nbId 000004 - String response body gnb servedNrCells 0 servedNrCellInformation cellId 42f490:000007fff0 - String response body gnb servedNrCells 0 servedNrCellInformation configuredStac 0000 - String response body gnb servedNrCells 0 servedNrCellInformation servedPlmns 0 "42f490" - String response body gnb servedNrCells 0 servedNrCellInformation nrMode TDD - String response body gnb servedNrCells 0 servedNrCellInformation choiceNrMode tdd nrFreqInfo nrArFcn 650056 - Integer response body gnb servedNrCells 0 servedNrCellInformation choiceNrMode tdd nrFreqInfo frequencyBands 0 nrFrequencyBand 78 - String response body gnb servedNrCells 0 servedNrCellInformation choiceNrMode tdd transmissionBandwidth nrscs SCS30 - String response body gnb servedNrCells 0 servedNrCellInformation choiceNrMode tdd transmissionBandwidth ncnrb NRB162 - -prepare logs for tests - Remove log files - Save logs - - -ENDC - RAN Connected message going to be sent - ${result} find_rmr_message.verify_logs ${EXECDIR} ${e2mgr_log_filename} ${RAN_CONNECTED_message_type} ${Meid_test2} - Should Be Equal As Strings ${result} True - -RSM RESOURCE STATUS REQUEST message not sent - ${result} find_rmr_message.verify_logs ${EXECDIR} ${rsm_log_filename} ${RIC_RES_STATUS_REQ_message_type_successfully_sent} ${RAN_NAME_test2} - Should Be Equal As Strings ${result} False - -Verify RSM RAN info doesn't exist in redis - ${result}= rsmscripts.verify_rsm_ran_info_start_false - Should Be Equal As Strings ${result} False - diff --git a/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot b/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot index 00660aa..ac8f70a 100644 --- a/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot +++ b/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot @@ -29,36 +29,17 @@ Library REST ${url} *** Test Cases *** -Run x2 setup - Post Request setup node b x-2 - Integer response status 204 - Sleep 2s - GET /v1/nodeb/test1 - Integer response status 200 - String response body ranName test1 - Integer response body port 5577 - String response body connectionStatus CONNECTED -Run endc setup - Post Request setup node b endc-setup - Integer response status 204 - Sleep 2s - GET /v1/nodeb/test2 - Integer response status 200 - String response body ranName test2 - String response body connectionStatus CONNECTED Get all node ids GET v1/nodeb/ids Sleep 2s Integer response status 200 - String response body 0 inventoryName test1 - String response body 0 globalNbId plmnId 02f829 - String response body 0 globalNbId nbId 007ab0 - String response body 1 inventoryName test2 - String response body 1 globalNbId plmnId 42f490 - String response body 1 globalNbId nbId 000004 + String response body 0 inventoryName ${ranName} + String response body 0 globalNbId plmnId 02F829 + String response body 0 globalNbId nbId 001100000011000000110000 + diff --git a/Automation/Tests/GetNodeB-GNB/GetNodeB-GNB_test.robot b/Automation/Tests/GetNodeB-GNB/GetNodeB-GNB_test.robot new file mode 100644 index 0000000..ac39305 --- /dev/null +++ b/Automation/Tests/GetNodeB-GNB/GetNodeB-GNB_test.robot @@ -0,0 +1,58 @@ +############################################################################## +# +# Copyright (c) 2019 AT&T Intellectual Property. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +############################################################################## +# +# This source code is part of the near-RT RIC (RAN Intelligent Controller) +# platform project (RICP). +# + + +*** Settings *** +Suite Setup Prepare Enviorment +Resource ../Resource/resource.robot +Resource ../Resource/Keywords.robot +Resource ../Resource/scripts_variables.robot +Library OperatingSystem +Library ../Scripts/find_rmr_message.py +Library ../Scripts/rsmscripts.py +Library REST ${url} + + + + +*** Test Cases *** + + +Get request gnb + Sleep 2s + Get Request node b gnb + Integer response status 200 + String response body ranName ${ranname} + String response body connectionStatus CONNECTED + String response body nodeType GNB + String response body associatedE2tInstanceAddress ${e2tinstanceaddress} + Integer response body gnb ranFunctions 0 ranFunctionId 1 + Integer response body gnb ranFunctions 0 ranFunctionRevision 1 + Integer response body gnb ranFunctions 1 ranFunctionId 2 + Integer response body gnb ranFunctions 1 ranFunctionRevision 1 + Integer response body gnb ranFunctions 2 ranFunctionId 3 + Integer response body gnb ranFunctions 2 ranFunctionRevision 1 + + + + + diff --git a/Automation/Tests/ENDC-Setup/__init__.robot b/Automation/Tests/GetNodeB-GNB/__init__.robot similarity index 96% rename from Automation/Tests/ENDC-Setup/__init__.robot rename to Automation/Tests/GetNodeB-GNB/__init__.robot index daa06c4..f98c6aa 100644 --- a/Automation/Tests/ENDC-Setup/__init__.robot +++ b/Automation/Tests/GetNodeB-GNB/__init__.robot @@ -21,4 +21,4 @@ # *** Settings *** -Documentation endc-Setup +Documentation GetNodeb-GNB diff --git a/Automation/Tests/KeepAlive/keep_alive_test.robot b/Automation/Tests/KeepAlive/keep_alive_test.robot index f83aa36..89e1b87 100644 --- a/Automation/Tests/KeepAlive/keep_alive_test.robot +++ b/Automation/Tests/KeepAlive/keep_alive_test.robot @@ -31,74 +31,51 @@ Library REST ${url} *** Test Cases *** -X2 - Setup Test - Post Request setup node b x-2 - Integer response status 204 - -X2 - Get Nodeb - Get Request Node B Enb test1 +Get request gnb + Sleep 2s + Get Request node b gnb Integer response status 200 - String response body ranName test1 - String response body ip ${ip_gnb_simu} - Integer response body port 5577 + String response body ranName ${ranname} String response body connectionStatus CONNECTED - String response body nodeType ENB - String response body associatedE2tInstanceAddress e2t.att.com:38000 - String response body enb enbType MACRO_ENB - Integer response body enb servedCells 0 pci 99 - String response body enb servedCells 0 cellId 02f829:0007ab00 - String response body enb servedCells 0 tac 0102 - String response body enb servedCells 0 broadcastPlmns 0 "02f829" - Integer response body enb servedCells 0 choiceEutraMode fdd ulearFcn 1 - Integer response body enb servedCells 0 choiceEutraMode fdd dlearFcn 1 - String response body enb servedCells 0 choiceEutraMode fdd ulTransmissionBandwidth BW50 - String response body enb servedCells 0 choiceEutraMode fdd dlTransmissionBandwidth BW50 + String response body nodeType GNB + String response body associatedE2tInstanceAddress ${e2tinstanceaddress} + Integer response body gnb ranFunctions 0 ranFunctionId 1 + Integer response body gnb ranFunctions 0 ranFunctionRevision 1 + Integer response body gnb ranFunctions 1 ranFunctionId 2 + Integer response body gnb ranFunctions 1 ranFunctionRevision 1 + Integer response body gnb ranFunctions 2 ranFunctionId 3 + Integer response body gnb ranFunctions 2 ranFunctionRevision 1 + prepare logs for tests Remove log files Save logs -X2 - RAN Connected message going to be sent - ${result} find_rmr_message.verify_logs ${EXECDIR} ${e2mgr_log_filename} ${RAN_CONNECTED_message_type} ${Meid_test1} - Should Be Equal As Strings ${result} True - -RSM RESOURCE STATUS REQUEST message sent - ${result} find_rmr_message.verify_logs ${EXECDIR} ${rsm_log_filename} ${RIC_RES_STATUS_REQ_message_type_successfully_sent} ${RAN_NAME_test1} - Should Be Equal As Strings ${result} True - -Verify RSM RAN info exists in redis - ${result}= rsmscripts.verify_rsm_ran_info_start_false - Should Be Equal As Strings ${result} True - Verify RAN is associated with E2T instance - ${result} e2mdbscripts.verify_ran_is_associated_with_e2t_instance test1 e2t.att.com:38000 + ${result} e2mdbscripts.verify_ran_is_associated_with_e2t_instance ${ranname} ${e2tinstanceaddress} Should Be True ${result} Stop E2T - stop_e2 + Stop E2 Sleep 3s -prepare logs for tests +Prepare logs Remove log files Save logs -Verify Is Dead Message Printed - ${result} find_error_script.find_error ${EXECDIR} ${e2mgr_log_filename} ${e2_is_dead_message_printed} - Should Be Equal As Strings ${result} True - Verify RAN is not associated with E2T instance - Get Request node b enb test1 + Get Request node b gnb Integer response status 200 - String response body ranName test1 + String response body ranName ${ranname} Missing response body associatedE2tInstanceAddress String response body connectionStatus DISCONNECTED Verify E2T instance removed from db - ${result} e2mdbscripts.verify_e2t_instance_key_exists e2t.att.com:38000 + ${result} e2mdbscripts.verify_e2t_instance_key_exists ${e2tinstanceaddress} Should Be True ${result} == False - ${result} e2mdbscripts.verify_e2t_instance_exists_in_addresses e2t.att.com:38000 + ${result} e2mdbscripts.verify_e2t_instance_exists_in_addresses ${e2tinstanceaddress} Should Be True ${result} == False Start E2T - start_e2 \ No newline at end of file + Start E2 \ No newline at end of file diff --git a/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot b/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot index 43c1166..f172c5b 100644 --- a/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot +++ b/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot @@ -37,25 +37,23 @@ prepare logs for tests Setup Ran and verify it's CONNECTED and associated - Post Request setup node b x-2 - Integer response status 204 - Get Request node b enb test1 + Get Request node b gnb Integer response status 200 - String response body ranName test1 + String response body ranName ${ranname} String response body connectionStatus CONNECTED - String response body associatedE2tInstanceAddress e2t.att.com:38000 + String response body associatedE2tInstanceAddress ${e2tinstanceaddress} -Restart simulator - Restart simulator +Stop simulator + Stop Simulator Verify connection status is DISCONNECTED and RAN is not associated with E2T instance - Sleep 5s - GET /v1/nodeb/test1 + Sleep 2s + GET ${getNodeb} Integer response status 200 - String response body ranName test1 + String response body ranName ${ranname} Missing response body associatedE2tInstanceAddress String response body connectionStatus DISCONNECTED Verify E2T instance is NOT associated with RAN - ${result} e2mdbscripts.verify_ran_is_associated_with_e2t_instance test1 e2t.att.com:38000 + ${result} e2mdbscripts.verify_ran_is_associated_with_e2t_instance ${ranname} ${e2tinstanceaddress} Should Be True ${result} == False diff --git a/Automation/Tests/RedButton/RedButton_CONNECTED.robot b/Automation/Tests/RedButton/RedButton_CONNECTED.robot index 6a0f312..dffc874 100644 --- a/Automation/Tests/RedButton/RedButton_CONNECTED.robot +++ b/Automation/Tests/RedButton/RedButton_CONNECTED.robot @@ -32,14 +32,14 @@ Library REST ${url} *** Test Cases *** -Execute X2 setup, verify nodeb connection status is CONNECTED and it's associated to an e2t instance - Execute setup and verify connected and associated +Verify gnb nodeb connection status is CONNECTED and it's associated to an e2t instance + Verify connected and associated Execute Shutdown Execute Shutdown Verify nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for enb + Verify shutdown for gnb Verify E2T instance has no associated RANs Verify E2T instance has no associated RANs diff --git a/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot b/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot index cbb02b4..d20a1fa 100644 --- a/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot +++ b/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot @@ -31,20 +31,18 @@ Library REST ${url} *** Test Cases *** -Execute X2 setup, verify nodeb connection status is CONNECTED and it's associated to an e2t instance - Execute setup and verify connected and associated +Verify gnb nodeb connection status is CONNECTED and it's associated to an e2t instance + Verify connected and associated Execute Shutdown Execute Shutdown Verify nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for enb - -Verify E2T instance has no associated RANs + Verify shutdown for gnb Verify E2T instance has no associated RANs Restart simulator Restart simulator -Execute second X2 setup, verify nodeb connection status is CONNECTED and it's associated to an e2t instance - Execute setup and verify connected and associated \ No newline at end of file +Verify gnb nodeb connection status is CONNECTED and it's associated to an e2t instance + Verify connected and associated \ No newline at end of file diff --git a/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot b/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot deleted file mode 100644 index 7bf7c82..0000000 --- a/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################## -# -# Copyright (c) 2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################## -# -# This source code is part of the near-RT RIC (RAN Intelligent Controller) -# platform project (RICP). -# -*** Settings *** -Suite Setup Prepare Enviorment -Resource ../Resource/resource.robot -Resource ../Resource/Keywords.robot -Resource red_button_keywords.robot -Library OperatingSystem -Library Collections -Library REST ${url} - -*** Variables *** -${stop_docker_e2} docker stop e2adapter - -*** Test Cases *** - -Pre Condition for Connecting - no E2ADAPTER - Run And Return Rc And Output ${stop_docker_e2} - ${result}= Run And Return Rc And Output ${docker_command} - Should Be Equal As Integers ${result[1]} ${docker_number-1} - -Prepare Ran in Connecting connectionStatus - Post Request setup node b endc-setup - Integer response status 204 - Sleep 10s - GET /v1/nodeb/test2 - Integer response status 200 - String response body ranName test2 - String response body connectionStatus DISCONNECTED - -Execute Shutdown - Execute Shutdown - -Verify nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for gnb - -Verify E2T instance has no associated RANs - Verify E2T instance has no associated RANs diff --git a/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot b/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot index fbab47b..7cdf0a6 100644 --- a/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot +++ b/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot @@ -30,15 +30,14 @@ Library Collections Library REST ${url} *** Test Cases *** - -Execute X2 setup, verify nodeb connection status is CONNECTED and it's associated to an e2t instance - Execute setup and verify connected and associated +Verify nodeb connection status is CONNECTED and it's associated to an e2t instance + Verify connected and associated Execute Shutdown Execute Shutdown Verify nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for enb + Verify shutdown for gnb Verify E2T instance has no associated RANs Verify E2T instance has no associated RANs @@ -48,7 +47,7 @@ Execute second Shutdown Execute Shutdown Verify again nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for enb + Verify shutdown for gnb Verify again E2T instance has no associated RANs Verify E2T instance has no associated RANs diff --git a/Automation/Tests/RedButton/red_button_keywords.robot b/Automation/Tests/RedButton/red_button_keywords.robot index c743543..17f7b50 100644 --- a/Automation/Tests/RedButton/red_button_keywords.robot +++ b/Automation/Tests/RedButton/red_button_keywords.robot @@ -27,40 +27,22 @@ Library json Library REST ${url} *** Keywords *** -Execute setup and verify connected and associated - Post Request setup node b x-2 - Integer response status 204 - Get Request node b enb test1 - Integer response status 200 - String response body ranName test1 - String response body connectionStatus CONNECTED - String response body associatedE2tInstanceAddress e2t.att.com:38000 - -Execute setup twice and verify connected setup failed - Post Request setup node b x-2 - Sleep 1s - Post Request setup node b x-2 - Get Request node b enb test1 - String response body connectionStatus CONNECTED_SETUP_FAILED - - -Verify shutdown for enb - Get Request node b enb test1 - Integer response status 200 - String response body ranName test1 - String response body connectionStatus SHUT_DOWN - Missing response body associatedE2tInstanceAddress - +Verify connected and associated + Get Request node b gnb + Integer response status 200 + String response body ranName ${ranName} + String response body connectionStatus CONNECTED + String response body associatedE2tInstanceAddress ${e2tinstanceaddress} Verify shutdown for gnb - Get Request node b gnb test2 + Get Request node b gnb Integer response status 200 - String response body ranName test2 + String response body ranName ${ranName} String response body connectionStatus SHUT_DOWN Missing response body associatedE2tInstanceAddress Verify E2T instance has no associated RANs - ${result} e2mdbscripts.verify_e2t_instance_has_no_associated_rans e2t.att.com:38000 + ${result} e2mdbscripts.verify_e2t_instance_has_no_associated_rans ${e2tinstanceaddress} Should Be True ${result} Execute Shutdown diff --git a/Automation/Tests/Resource/Keywords.robot b/Automation/Tests/Resource/Keywords.robot index eea1ce6..ce07adc 100644 --- a/Automation/Tests/Resource/Keywords.robot +++ b/Automation/Tests/Resource/Keywords.robot @@ -27,105 +27,54 @@ Resource ../Resource/resource.robot Library OperatingSystem *** Keywords *** -Post Request setup node b x-2 - Set Headers ${header} - POST /v1/nodeb/x2-setup ${json} - -Put Request Resource Status Start - Set Headers ${header} - PUT /v1/general/resourcestatus ${resource_status_start_json} - -Put Request Resource Status Stop - Set Headers ${header} - PUT /v1/general/resourcestatus ${resource_status_stop_json} - -Get Request node b enb test1 +Get Request node b gnb Sleep 1s - GET /v1/nodeb/test1 + GET ${getNodeb} + -Get Request node b gnb test2 - Sleep 1s - GET /v1/nodeb/test2 Remove log files Remove File ${EXECDIR}/${gnb_log_filename} Remove File ${EXECDIR}/${e2mgr_log_filename} Remove File ${EXECDIR}/${e2t_log_filename} - Remove File ${EXECDIR}/${rsm_log_filename} - Remove File ${EXECDIR}/${e2e_simu_log_filename} Remove File ${EXECDIR}/${rm_sim_log_filename} - Remove File ${EXECDIR}/${e2adapter_log_filename} Save logs Sleep 1s Run ${Save_sim_log} Run ${Save_e2mgr_log} Run ${Save_e2t_log} - Run ${Save_rsm_log} - Run ${Save_e2e_simu_log} Run ${Save_rm_sim_log} - Run ${Save_e2adapter_log} - - -Post Request setup node b endc-setup - Set Headers ${header} - POST /v1/nodeb/endc-setup ${endcjson} Stop Simulator Run And Return Rc And Output ${stop_simu} - -Prepare Simulator For Load Information - Run And Return Rc And Output ${stop_simu} - Run And Return Rc And Output ${docker_Remove} - ${flush} cleanup_db.flush - Should Be Equal As Strings ${flush} True - Run And Return Rc And Output ${run_simu_load} - ${result}= Run And Return Rc And Output ${docker_command} - Should Be Equal As Integers ${result[1]} ${docker_number} - Prepare Enviorment Log To Console Starting preparations ${starting_timestamp} Evaluate datetime.datetime.now(datetime.timezone.utc).isoformat("T") modules=datetime ${e2t_log_filename} Evaluate "e2t.${SUITE NAME}.log".replace(" ","-") ${e2mgr_log_filename} Evaluate "e2mgr.${SUITE NAME}.log".replace(" ","-") ${gnb_log_filename} Evaluate "gnb.${SUITE NAME}.log".replace(" ","-") - ${rsm_log_filename} Evaluate "rsm.${SUITE NAME}.log".replace(" ","-") - ${e2e_simu_log_filename} Evaluate "e2e_simu.${SUITE NAME}.log".replace(" ","-") ${rm_sim_log_filename} Evaluate "rm_sim.${SUITE NAME}.log".replace(" ","-") - ${e2adapter_log_filename} Evaluate "e2adapter.${SUITE NAME}.log".replace(" ","-") - ${Save_sim_log} Evaluate 'docker logs --since ${starting_timestamp} gnbe2_simu > ${gnb_log_filename}' + ${Save_sim_log} Evaluate 'docker logs --since ${starting_timestamp} gnbe2_oran_simu > ${gnb_log_filename}' ${Save_e2mgr_log} Evaluate 'docker logs --since ${starting_timestamp} e2mgr > ${e2mgr_log_filename}' ${Save_e2t_log} Evaluate 'docker logs --since ${starting_timestamp} e2 > ${e2t_log_filename}' - ${Save_rsm_log} Evaluate 'docker logs --since ${starting_timestamp} rsm > ${rsm_log_filename}' - ${Save_e2e_simu_log} Evaluate 'docker logs --since ${starting_timestamp} e2e_simu > ${e2e_simu_log_filename}' ${Save_rm_sim_log} Evaluate 'docker logs --since ${starting_timestamp} rm_sim > ${rm_sim_log_filename}' - ${Save_e2adapter_log} Evaluate 'docker logs --since ${starting_timestamp} e2adapter > ${e2adapter_log_filename}' - Set Suite Variable ${e2t_log_filename} + Set Suite Variable ${e2t_log_filename} Set Suite Variable ${e2mgr_log_filename} Set Suite Variable ${gnb_log_filename} - Set Suite Variable ${rsm_log_filename} - Set Suite Variable ${e2e_simu_log_filename} Set Suite Variable ${rm_sim_log_filename} - Set Suite Variable ${e2adapter_log_filename} Set Suite Variable ${Save_sim_log} Set Suite Variable ${Save_e2mgr_log} Set Suite Variable ${Save_e2t_log} - Set Suite Variable ${Save_rsm_log} - Set Suite Variable ${Save_e2e_simu_log} Set Suite Variable ${Save_rm_sim_log} - Set Suite Variable ${Save_e2adapter_log} Log To Console Ready to flush db ${flush} cleanup_db.flush Should Be Equal As Strings ${flush} True Run And Return Rc And Output ${stop_simu} - Run And Return Rc And Output ${stop_e2e_simu} Run And Return Rc And Output ${docker_Remove} - Run And Return Rc And Output ${docker_remove_e2e_simu} Run And Return Rc And Output ${run_simu_regular} - Run And Return Rc And Output ${run_e2e_simu_regular} - Run And Return Rc And Output ${restart_e2adapter} Sleep 3s Log To Console Validating dockers are up ${result}= Run And Return Rc And Output ${docker_command} @@ -155,8 +104,7 @@ Stop Dbass Should Be Equal As Integers ${result[1]} ${docker_number-1} Restart simulator - - Run And Return Rc And Output ${restart_docker_sim} + Run And Return Rc And Output ${restart_simu} ${result}= Run And Return Rc And Output ${docker_command} Should Be Equal As Integers ${result[1]} ${docker_number} diff --git a/Automation/Tests/Resource/resource.robot b/Automation/Tests/Resource/resource.robot index c37ebaa..1239b06 100644 --- a/Automation/Tests/Resource/resource.robot +++ b/Automation/Tests/Resource/resource.robot @@ -25,45 +25,26 @@ Documentation Resource file *** Variables *** -${docker_number} 8 -${docker_number-1} 7 -${ip_gnb_simu} 10.0.2.15 -${ip_e2adapter} 10.0.2.15 +${docker_number} 5 +${docker_number-1} 4 ${url} http://localhost:3800 -${url_rsm} http://localhost:4800 -${json_setup_rsm_tests} {"ranIp": "10.0.2.15","ranPort": 36422,"ranName":"test1"} -${json} {"ranIp": "10.0.2.15","ranPort": 5577,"ranName":"test1"} -${endcbadjson} {"ranIp": "a","ranPort": 49999,"ranName":"test2"} -${endcjson} {"ranIp": "10.0.2.15","ranPort": 49999,"ranName":"test2"} -${resetcausejson} {"cause": "misc:not-enough-user-plane-processing-resources"} -${resetbadcausejson} {"cause": "bla" } -${resetbad1causejson} {"cause": } -${resource_status_start_json} {"enableResourceStatus":true} -${resource_status_stop_json} {"enableResourceStatus":false} +${ranName} gnb:208-092-303030 +${getNodeb} /v1/nodeb/${ranName} +${E2tInstanceAddress} 127.0.0.1:38000 ${header} {"Content-Type": "application/json"} ${docker_command} docker ps | grep Up | wc --lines -${run_simu_load} docker run -d --name gnbe2_simu --env gNBipv4=localhost --env gNBport=36422 --env duration=600000000000 --env indicationReportRate=1000000000 --env indicationInsertRate=0 -p 5577:36422/sctp snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/gnbe2_simu:1.0.6 -${stop_e2e_simu} docker stop e2e_simu -${stop_simu} docker stop gnbe2_simu -${run_simu_regular} docker run -d --name gnbe2_simu --env gNBipv4=localhost --env gNBport=36422 --env duration=600000000000 --env indicationReportRate=0 --env indicationInsertRate=0 -p 5577:36422/sctp snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/gnbe2_simu:1.0.6 -${run_e2e_simu_regular} docker run -d --name e2e_simu -p 36422:36422 --net host -it snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/e2sim:1.4.0 sh -c "./build/e2sim 10.0.2.15 36422" -${docker_Remove} docker rm gnbe2_simu -${docker_remove_e2e_simu} docker rm e2e_simu +${stop_simu} docker stop gnbe2_oran_simu +${run_simu_regular} docker run -d --name gnbe2_oran_simu --net host --env gNBipv4=10.0.2.15 --env gNBport=5577 --env ricIpv4=10.0.2.15 --env ricPort=36422 --env nbue=0 snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/gnbe2_oran_simu:3.2-32 +${docker_Remove} docker rm gnbe2_oran_simu ${docker_restart} docker restart e2mgr -${restart_simu} docker restart gnbe2_simu -${restart_e2e_simu} docker restart e2e_simu -${restart_e2adapter} docker restart e2adapter -${restart_rsm} docker restart rsm +${restart_simu} docker restart gnbe2_oran_simu ${start_e2} docker start e2 ${stop_e2} docker stop e2 ${dbass_start} docker run -d --name dbass -p 6379:6379 --env DBAAS_SERVICE_HOST=10.0.2.15 snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/dbass:1.0.0 ${dbass_remove} docker rm dbass ${dbass_stop} docker stop dbass -${restart_simu} docker restart gnbe2_simu +${restart_simu} docker restart gnbe2_oran_simu ${stop_docker_e2} docker stop e2 -${restart_docker_sim} docker restart gnbe2_simu -${Run_Config} docker exec gnbe2_simu pkill gnbe2_simu -INT -${403_reset_message} "Activity X2_RESET rejected. RAN current state DISCONNECTED does not allow its execution " ${stop_routingmanager_sim} docker stop rm_sim ${start_routingmanager_sim} docker start rm_sim diff --git a/Automation/Tests/Resource/scripts_variables.robot b/Automation/Tests/Resource/scripts_variables.robot index 3d7e46a..faa8604 100644 --- a/Automation/Tests/Resource/scripts_variables.robot +++ b/Automation/Tests/Resource/scripts_variables.robot @@ -25,24 +25,11 @@ Documentation Message types resource file *** Variables *** -${configurationupdate_message_type} MType: 10370 -${Meid_test1} Meid: \\"test1\\" -${Meid_test2} Meid: \\"test2\\" -${configurationupdate_ack_message_type} MType: 10371 -${RAN_CONNECTED_message_type} MType: 1200 -${RAN_RESTARTED_message_type} MType: 1210 -${RIC_X2_RESET_REQ_message_type} MType: 10070 -${RIC_X2_RESET_RESP_message_type} MType: 10070 + ${E2_INIT_message_type} MType: 1100 -#${failed_to_retrieve_nodeb_message} failed to retrieve nodeB entity. RanName: test1. -#{#RanReconnectionManager.ReconnectRan - RAN name: test1 - Failed fetching RAN from rNib. Error: dial tcp 172.17.0.2:637 #9: i/o timeout" -${failed_to_retrieve_nodeb_message} RAN name: test1 - Failed fetching RAN from rNib ${first_retry_to_retrieve_from_db} RnibDataService.retry - retrying 1 GetNodeb ${third_retry_to_retrieve_from_db} RnibDataService.retry - after 3 attempts of GetNodeb ${RIC_RES_STATUS_REQ_message_type_successfully_sent} Message type: 10090 - Successfully sent RMR message ${E2_TERM_KEEP_ALIVE_REQ_message_type_successfully_sent} Message type: 1101 - Successfully sent RMR message -${e2_is_dead_message_printed} E2TShutdownManager.Shutdown - E2T e2t.att.com:38000 is Dead, RIP -${RAN_NAME_test1} RAN name: test1 -${RAN_NAME_test2} RAN name: test2 -${E2ADAPTER_Setup_Resp} Send dummy ENDCX2SetupResponse to RIC + diff --git a/Automation/Tests/Scripts/cleanup_db.py b/Automation/Tests/Scripts/cleanup_db.py index 5c8db84..0bae97e 100644 --- a/Automation/Tests/Scripts/cleanup_db.py +++ b/Automation/Tests/Scripts/cleanup_db.py @@ -34,25 +34,12 @@ def flush(): r.flushall() - r.set("{rsm},CFG:GENERAL:v1.0.0" , "{\"enableResourceStatus\":true,\"partialSuccessAllowed\":true,\"prbPeriodic\":true,\"tnlLoadIndPeriodic\":true,\"wwLoadIndPeriodic\":true,\"absStatusPeriodic\":true,\"rsrpMeasurementPeriodic\":true,\"csiPeriodic\":true,\"periodicityMs\":1,\"periodicityRsrpMeasurementMs\":3,\"periodicityCsiMs\":3}") + r.set("{e2Manager},E2TAddresses", "[\"127.0.0.1:38000\"]") - r.set("{e2Manager},E2TAddresses", "[\"e2t.att.com:38000\"]") - - r.set("{e2Manager},E2TInstance:e2t.att.com:38000", "{\"address\":\"e2t.att.com:38000\",\"associatedRanList\":[],\"keepAliveTimestamp\":" + str(int((time.time()+2) * 1000000000)) + ",\"state\":\"ACTIVE\"}") + r.set("{e2Manager},E2TInstance:127.0.0.1:38000","{\"address\":\"127.0.0.1:38000\",\"associatedRanList\":[],\"keepAliveTimestamp\":" + str(int((time.time()+2) * 1000000000)) + ",\"state\":\"ACTIVE\",\"deletionTimeStamp\":0}") return True -def flush_and_restore_without_e2t_keys(): - - c = config.redis_ip_address - - p = config.redis_ip_port - - r = redis.Redis(host=c, port=p, db=0) - r.flushall() - r.set("{rsm},CFG:GENERAL:v1.0.0" , "{\"enableResourceStatus\":true,\"partialSuccessAllowed\":true,\"prbPeriodic\":true,\"tnlLoadIndPeriodic\":true,\"wwLoadIndPeriodic\":true,\"absStatusPeriodic\":true,\"rsrpMeasurementPeriodic\":true,\"csiPeriodic\":true,\"periodicityMs\":1,\"periodicityRsrpMeasurementMs\":3,\"periodicityCsiMs\":3}") - - return True diff --git a/Automation/Tests/Scripts/e2t_db_script.py b/Automation/Tests/Scripts/e2t_db_script.py index add1a9b..bd54b08 100644 --- a/Automation/Tests/Scripts/e2t_db_script.py +++ b/Automation/Tests/Scripts/e2t_db_script.py @@ -33,7 +33,7 @@ def verify_e2t_addresses_key(): r = getRedisClientDecodeResponse() - value = "[\"e2t.att.com:38000\"]" + value = "[\"127.0.0.1:38000\"]" return r.get("{e2Manager},E2TAddresses") == value @@ -42,11 +42,11 @@ def verify_e2t_instance_key(): r = getRedisClientDecodeResponse() - e2_address = "\"address\":\"e2t.att.com:38000\"" + e2_address = "\"address\":\"127.0.0.1:38000\"" e2_associated_ran_list = "\"associatedRanList\":[]" e2_state = "\"state\":\"ACTIVE\"" - e2_db_instance = r.get("{e2Manager},E2TInstance:e2t.att.com:38000") + e2_db_instance = r.get("{e2Manager},E2TInstance:127.0.0.1:38000") if e2_db_instance.find(e2_address) < 0: return False diff --git a/Automation/Tests/Unhappy/Get_All_Nodedb_HttpResponse500.robot b/Automation/Tests/Unhappy/Get_All_Nodedb_HttpResponse500.robot index 74e1552..99df9a3 100644 --- a/Automation/Tests/Unhappy/Get_All_Nodedb_HttpResponse500.robot +++ b/Automation/Tests/Unhappy/Get_All_Nodedb_HttpResponse500.robot @@ -28,7 +28,7 @@ Library REST ${url} Suite Teardown Start Dbass *** Test Cases *** -ENDC-setup - 500 http - 500 RNIB error +Get All nodes - 500 http - 500 RNIB error Stop Dbass GET /v1/nodeb/ids Integer response status 500 diff --git a/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations_tests.robot b/Automation/deprecated/ConfigurationUpdate/ConfigurationUpdate_prepartations_tests.robot similarity index 100% rename from Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations_tests.robot rename to Automation/deprecated/ConfigurationUpdate/ConfigurationUpdate_prepartations_tests.robot diff --git a/Automation/Tests/ConfigurationUpdate/__init__.robot b/Automation/deprecated/ConfigurationUpdate/__init__.robot similarity index 100% rename from Automation/Tests/ConfigurationUpdate/__init__.robot rename to Automation/deprecated/ConfigurationUpdate/__init__.robot diff --git a/Automation/Tests/ENDC_Reset_RAN_TO_RIC/Reset_RAN_Found.robot b/Automation/deprecated/ENDC_Reset_RAN_TO_RIC/Reset_RAN_Found.robot similarity index 100% rename from Automation/Tests/ENDC_Reset_RAN_TO_RIC/Reset_RAN_Found.robot rename to Automation/deprecated/ENDC_Reset_RAN_TO_RIC/Reset_RAN_Found.robot diff --git a/Automation/Tests/ENDC_Reset_RAN_TO_RIC/__init__.robot b/Automation/deprecated/ENDC_Reset_RAN_TO_RIC/__init__.robot similarity index 100% rename from Automation/Tests/ENDC_Reset_RAN_TO_RIC/__init__.robot rename to Automation/deprecated/ENDC_Reset_RAN_TO_RIC/__init__.robot diff --git a/Automation/Tests/ENDC_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot b/Automation/deprecated/ENDC_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot similarity index 100% rename from Automation/Tests/ENDC_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot rename to Automation/deprecated/ENDC_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot diff --git a/Automation/Tests/ENDC_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot b/Automation/deprecated/ENDC_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot similarity index 100% rename from Automation/Tests/ENDC_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot rename to Automation/deprecated/ENDC_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot diff --git a/Automation/Tests/ENDC_Reset_RIC_TO_RAN/__init__.robot b/Automation/deprecated/ENDC_Reset_RIC_TO_RAN/__init__.robot similarity index 100% rename from Automation/Tests/ENDC_Reset_RIC_TO_RAN/__init__.robot rename to Automation/deprecated/ENDC_Reset_RIC_TO_RAN/__init__.robot diff --git a/Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot b/Automation/deprecated/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot similarity index 100% rename from Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot rename to Automation/deprecated/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot diff --git a/Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot b/Automation/deprecated/LoadInfomation/Loadinformation_verify_saving.robot similarity index 100% rename from Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot rename to Automation/deprecated/LoadInfomation/Loadinformation_verify_saving.robot diff --git a/Automation/Tests/LoadInfomation/__init__.robot b/Automation/deprecated/LoadInfomation/__init__.robot similarity index 100% rename from Automation/Tests/LoadInfomation/__init__.robot rename to Automation/deprecated/LoadInfomation/__init__.robot diff --git a/Automation/Tests/RSM_Resource_Status/__init__.robot b/Automation/deprecated/RSM_Resource_Status/__init__.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/__init__.robot rename to Automation/deprecated/RSM_Resource_Status/__init__.robot diff --git a/Automation/Tests/RSM_Resource_Status/resource_status_false_start.robot b/Automation/deprecated/RSM_Resource_Status/resource_status_false_start.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/resource_status_false_start.robot rename to Automation/deprecated/RSM_Resource_Status/resource_status_false_start.robot diff --git a/Automation/Tests/RSM_Resource_Status/resource_status_false_stop.robot b/Automation/deprecated/RSM_Resource_Status/resource_status_false_stop.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/resource_status_false_stop.robot rename to Automation/deprecated/RSM_Resource_Status/resource_status_false_stop.robot diff --git a/Automation/Tests/RSM_Resource_Status/resource_status_keywords.robot b/Automation/deprecated/RSM_Resource_Status/resource_status_keywords.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/resource_status_keywords.robot rename to Automation/deprecated/RSM_Resource_Status/resource_status_keywords.robot diff --git a/Automation/Tests/RSM_Resource_Status/resource_status_true_start.robot b/Automation/deprecated/RSM_Resource_Status/resource_status_true_start.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/resource_status_true_start.robot rename to Automation/deprecated/RSM_Resource_Status/resource_status_true_start.robot diff --git a/Automation/Tests/RSM_Resource_Status/resource_status_true_stop.robot b/Automation/deprecated/RSM_Resource_Status/resource_status_true_stop.robot similarity index 100% rename from Automation/Tests/RSM_Resource_Status/resource_status_true_stop.robot rename to Automation/deprecated/RSM_Resource_Status/resource_status_true_stop.robot diff --git a/Automation/Tests/RedButton/RedButton_CONNECTION_FAILURE.robot b/Automation/deprecated/RedButton/RedButton_DISCONNECTED.robot similarity index 89% rename from Automation/Tests/RedButton/RedButton_CONNECTION_FAILURE.robot rename to Automation/deprecated/RedButton/RedButton_DISCONNECTED.robot index 291171a..9e047f9 100644 --- a/Automation/Tests/RedButton/RedButton_CONNECTION_FAILURE.robot +++ b/Automation/deprecated/RedButton/RedButton_DISCONNECTED.robot @@ -19,7 +19,6 @@ # This source code is part of the near-RT RIC (RAN Intelligent Controller) # platform project (RICP). # - *** Settings *** Suite Setup Prepare Enviorment Resource ../Resource/resource.robot @@ -30,18 +29,18 @@ Library Collections Library REST ${url} + *** Test Cases *** +Verify gnb nodeb connection status is CONNECTED and it's associated to an e2t instance + Verify connected and associated + -Execute X2 setup twice and verify its connection status is CONNECTED_SETUP_FAILED - Execute setup twice and verify connected setup failed Execute Shutdown Execute Shutdown Verify nodeb's connection status is SHUT_DOWN and it's NOT associated to an e2t instance - Verify shutdown for enb + Verify shutdown for gnb Verify E2T instance has no associated RANs Verify E2T instance has no associated RANs - - diff --git a/Automation/Tests/Unhappy/Reset_HttpResponse400.robot b/Automation/deprecated/Unhappy/Reset_HttpResponse400.robot similarity index 100% rename from Automation/Tests/Unhappy/Reset_HttpResponse400.robot rename to Automation/deprecated/Unhappy/Reset_HttpResponse400.robot diff --git a/Automation/Tests/Unhappy/Reset_HttpResponse400_wrongstate.robot b/Automation/deprecated/Unhappy/Reset_HttpResponse400_wrongstate.robot similarity index 100% rename from Automation/Tests/Unhappy/Reset_HttpResponse400_wrongstate.robot rename to Automation/deprecated/Unhappy/Reset_HttpResponse400_wrongstate.robot diff --git a/Automation/Tests/Unhappy/Reset_HttpResponse404.robot b/Automation/deprecated/Unhappy/Reset_HttpResponse404.robot similarity index 100% rename from Automation/Tests/Unhappy/Reset_HttpResponse404.robot rename to Automation/deprecated/Unhappy/Reset_HttpResponse404.robot diff --git a/Automation/Tests/Unhappy/Setup_Request_HttpResponse400.robot b/Automation/deprecated/Unhappy/Setup_Request_HttpResponse400.robot similarity index 100% rename from Automation/Tests/Unhappy/Setup_Request_HttpResponse400.robot rename to Automation/deprecated/Unhappy/Setup_Request_HttpResponse400.robot diff --git a/Automation/Tests/Unhappy/Setup_Request_HttpResponse500.robot b/Automation/deprecated/Unhappy/Setup_Request_HttpResponse500.robot similarity index 100% rename from Automation/Tests/Unhappy/Setup_Request_HttpResponse500.robot rename to Automation/deprecated/Unhappy/Setup_Request_HttpResponse500.robot diff --git a/Automation/Tests/Unhappy/Setup_Request_HttpResponse503.robot b/Automation/deprecated/Unhappy/Setup_Request_HttpResponse503.robot similarity index 100% rename from Automation/Tests/Unhappy/Setup_Request_HttpResponse503.robot rename to Automation/deprecated/Unhappy/Setup_Request_HttpResponse503.robot diff --git a/Automation/Tests/Unhappy/Setup_Request_setup_failure.robot b/Automation/deprecated/Unhappy/Setup_Request_setup_failure.robot similarity index 100% rename from Automation/Tests/Unhappy/Setup_Request_setup_failure.robot rename to Automation/deprecated/Unhappy/Setup_Request_setup_failure.robot diff --git a/Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot b/Automation/deprecated/X2-Setup/X2_Setup_reuqest_test.robot similarity index 100% rename from Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot rename to Automation/deprecated/X2-Setup/X2_Setup_reuqest_test.robot diff --git a/Automation/Tests/X2-Setup/__init__.robot b/Automation/deprecated/X2-Setup/__init__.robot similarity index 100% rename from Automation/Tests/X2-Setup/__init__.robot rename to Automation/deprecated/X2-Setup/__init__.robot diff --git a/Automation/Tests/X2-Setup/x2_setup_existing_assoc_test.robot b/Automation/deprecated/X2-Setup/x2_setup_existing_assoc_test.robot similarity index 100% rename from Automation/Tests/X2-Setup/x2_setup_existing_assoc_test.robot rename to Automation/deprecated/X2-Setup/x2_setup_existing_assoc_test.robot diff --git a/Automation/Tests/X2-Setup/x2_setup_existing_not_assoc_test.robot b/Automation/deprecated/X2-Setup/x2_setup_existing_not_assoc_test.robot similarity index 100% rename from Automation/Tests/X2-Setup/x2_setup_existing_not_assoc_test.robot rename to Automation/deprecated/X2-Setup/x2_setup_existing_not_assoc_test.robot diff --git a/Automation/Tests/X2_Reset_RAN_TO_RIC/Reset_RAN_Found.robot b/Automation/deprecated/X2_Reset_RAN_TO_RIC/Reset_RAN_Found.robot similarity index 100% rename from Automation/Tests/X2_Reset_RAN_TO_RIC/Reset_RAN_Found.robot rename to Automation/deprecated/X2_Reset_RAN_TO_RIC/Reset_RAN_Found.robot diff --git a/Automation/Tests/X2_Reset_RAN_TO_RIC/__init__.robot b/Automation/deprecated/X2_Reset_RAN_TO_RIC/__init__.robot similarity index 100% rename from Automation/Tests/X2_Reset_RAN_TO_RIC/__init__.robot rename to Automation/deprecated/X2_Reset_RAN_TO_RIC/__init__.robot diff --git a/Automation/Tests/X2_Reset_RAN_TO_RIC_Unhappy/Reset_RNIB.robot b/Automation/deprecated/X2_Reset_RAN_TO_RIC_Unhappy/Reset_RNIB.robot similarity index 100% rename from Automation/Tests/X2_Reset_RAN_TO_RIC_Unhappy/Reset_RNIB.robot rename to Automation/deprecated/X2_Reset_RAN_TO_RIC_Unhappy/Reset_RNIB.robot diff --git a/Automation/Tests/X2_Reset_RAN_TO_RIC_Unhappy/__init__.robot b/Automation/deprecated/X2_Reset_RAN_TO_RIC_Unhappy/__init__.robot similarity index 100% rename from Automation/Tests/X2_Reset_RAN_TO_RIC_Unhappy/__init__.robot rename to Automation/deprecated/X2_Reset_RAN_TO_RIC_Unhappy/__init__.robot diff --git a/Automation/Tests/X2_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot b/Automation/deprecated/X2_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot similarity index 100% rename from Automation/Tests/X2_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot rename to Automation/deprecated/X2_Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot diff --git a/Automation/Tests/X2_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot b/Automation/deprecated/X2_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot similarity index 100% rename from Automation/Tests/X2_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot rename to Automation/deprecated/X2_Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot diff --git a/Automation/Tests/X2_Reset_RIC_TO_RAN/__init__.robot b/Automation/deprecated/X2_Reset_RIC_TO_RAN/__init__.robot similarity index 100% rename from Automation/Tests/X2_Reset_RIC_TO_RAN/__init__.robot rename to Automation/deprecated/X2_Reset_RIC_TO_RAN/__init__.robot