Add R5 content to master

Change-Id: Ibfbabbcd1ec599b69f1011a337d0979e7098ad15
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
diff --git a/Automation/Tests/Resource/Keywords.robot b/Automation/Tests/Resource/Keywords.robot
index 46296d8..1f453df 100644
--- a/Automation/Tests/Resource/Keywords.robot
+++ b/Automation/Tests/Resource/Keywords.robot
@@ -35,6 +35,9 @@
     Sleep  1s
     PUT    ${update_gnb_url}   ${update_gnb_body}
 
+Set General Configuration request
+    Sleep  1s
+    PUT    ${set_general_configuration}   ${set_general_configuration_body}
 
 Update Ran request not valid
     Sleep  1s
@@ -126,3 +129,7 @@
     ${result}=  Run And Return Rc And Output     ${docker_command}
     Should Be Equal As Integers    ${result[1]}    ${docker_number-1}
 
+Flush And Populate DB
+    ${flush}  cleanup_db.flush
+    Sleep  2s
+
diff --git a/Automation/Tests/Resource/resource.robot b/Automation/Tests/Resource/resource.robot
index 29e15f8..dc33988 100644
--- a/Automation/Tests/Resource/resource.robot
+++ b/Automation/Tests/Resource/resource.robot
@@ -28,8 +28,10 @@
 ${docker_number}    5
 ${docker_number-1}    4
 ${url}   http://localhost:3800
-${ranName}  gnb:208-092-303030
+${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}]}]}
diff --git a/Automation/Tests/Resource/scripts_variables.robot b/Automation/Tests/Resource/scripts_variables.robot
index 89dc05a..99c2944 100644
--- a/Automation/Tests/Resource/scripts_variables.robot
+++ b/Automation/Tests/Resource/scripts_variables.robot
@@ -32,5 +32,4 @@
 ${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
-
-
+${save_general_configuration}      RnibDataService.SaveGeneralConfiguration - configuration: {EnableRic:false}
\ No newline at end of file