X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Automation%2FTests%2FResource%2Fresource.robot;h=dc3398879a2fa2a62a98e67b6be143b6f602f9bd;hb=a07b8597afc9d063a7f37a376a5bcf29ba29b557;hp=90c79b2e469694f8f857a7560f54d587cd1e35dc;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/Resource/resource.robot b/Automation/Tests/Resource/resource.robot
index 90c79b2..dc33988 100644
--- a/Automation/Tests/Resource/resource.robot
+++ b/Automation/Tests/Resource/resource.robot
@@ -25,46 +25,33 @@ 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}
+${set_general_configuration}   /v1/nodeb/parameters
+${set_general_configuration_body}   {"enableRic":false}
+${update_gnb_url}   /v1/nodeb/${ranName}/update
+${update_gnb_body}  {"servedNrCells":[{"servedNrCellInformation":{"cellId":"abcd","choiceNrMode":{"fdd":{}},"nrMode":1,"nrPci":1,"servedPlmns":["whatever"]},"nrNeighbourInfos":[{"nrCgi":"one","choiceNrMode":{"fdd":{}},"nrMode":1,"nrPci":1}]}]}
+${update_gnb_body_notvalid}  {"servedNrCells":[{"servedNrCellInformation":{"choiceNrMode":{"fdd":{}},"nrMode":1,"nrPci":1,"servedPlmns":["whatever"]},"nrNeighbourInfos":[{"nrCgi":"whatever","choiceNrMode":{"fdd":{}},"nrMode":1,"nrPci":1}]}]}
+${E2tInstanceAddress}   10.0.2.15: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