X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Automation%2FTests%2FResource%2Fresource.robot;h=c37ebaa08d357708d6534bb6813056f75acc90a3;hb=5c9533257e79cc65d506df54105933bf5844e7ab;hp=4b6bcb391cbb25f6a9ba37197573ba3519478af3;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/Resource/resource.robot b/Automation/Tests/Resource/resource.robot
index 4b6bcb3..c37ebaa 100644
--- a/Automation/Tests/Resource/resource.robot
+++ b/Automation/Tests/Resource/resource.robot
@@ -25,47 +25,47 @@ Documentation    Resource file
 
 
 *** Variables ***
-${docker_number}    6
-${docker_number-1}    5
+${docker_number}    8
+${docker_number-1}    7
 ${ip_gnb_simu}	10.0.2.15
 ${ip_e2adapter}	10.0.2.15
 ${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}
 ${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
-#${run_simu_load}   docker run -d --name gnbe2_simu  -h gnb-sim --env gNBipv4=gnb-sim  --env gNBport=5577/sctp  --env duration=600000000000 --env indicationReportRate=1000000000 --env indicationInsertRate=0 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_simu_regular}  docker run -d --name gnbe2_simu  -h gnb-sim --env gNBipv4=gnb-sim  --env gNBport=5577/sctp --env duration=600000000000 --env indicationReportRate=0 --env indicationInsertRate=0  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
 ${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
 ${start_e2}  docker start e2
-${stop_docker_e2}      docker stop 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
-${start_e2}  docker start e2
 ${stop_docker_e2}      docker stop e2
+${restart_docker_sim}      docker restart gnbe2_simu
 ${Run_Config}       docker exec gnbe2_simu pkill gnbe2_simu -INT
-${Save_sim_log}      docker logs gnbe2_simu > gnb.log
-${Save_e2mgr_log}   docker logs e2mgr > e2mgr.log
-${Save_rsm_log}   docker logs rsm > rsm.log
-${Save_e2adapter_log}   docker logs e2adapter > e2adapter.log
 ${403_reset_message}    "Activity X2_RESET rejected. RAN current state DISCONNECTED does not allow its execution "
-${e2mgr_log_filename}    e2mgr.log
-${gnb_log_filename}    gnb.log
-${rsm_log_filename}    rsm.log
-${e2adapter_log_filename}    e2adapter.log
-
+${stop_routingmanager_sim}  docker stop rm_sim
+${start_routingmanager_sim}  docker start rm_sim