Add automation for E2T init - part 2

Change-Id: I25dda647b379e2c60de89da417476d2d7b5b1c7b
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>

diff --git a/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot b/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot
index 7c0e924..3ce8a50 100644 (file)
--- a/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot
+++ b/Automation/Tests/E2Term_Initialization/E2Term_Init_Message_Test.robot
@@ -6,7 +6,7 @@ Resource    ../Resource/scripts_variables.robot
 Library     OperatingSystem
 Library     ../Scripts/find_rmr_message.py
 Library     ../Scripts/cleanup_db.py
-Library     ../Scripts/e2t_init_script.py
+Library     ../Scripts/e2t_db_script.py
 
 *** Test Cases ***
 
@@ -18,12 +18,6 @@ Test New E2T Send Init
 
     Start E2
 
-    ${result}=    e2t_init_script.verify_db_e2t_addresses
-    Should Be Equal As Strings  ${result}    True
-
-    ${result}=    e2t_init_script.verify_db_e2t_instance
-    Should Be Equal As Strings  ${result}    True
-
 prepare logs for tests
     Remove log files
     Save logs
@@ -32,5 +26,12 @@ E2M Logs - Verify RMR Message
     ${result}    find_rmr_message.verify_logs   ${EXECDIR}   ${e2mgr_log_filename}  ${E2_INIT_message_type}    ${None}
     Should Be Equal As Strings    ${result}      True
 
+Verify E2T keys in DB
+    ${result}=    e2t_db_script.verify_e2t_addresses_key
+    Should Be Equal As Strings  ${result}    True
+
+    ${result}=    e2t_db_script.verify_e2t_instance_key
+    Should Be Equal As Strings  ${result}    True
+
 
 

diff --git a/Automation/Tests/Scripts/e2t_init_script.py b/Automation/Tests/Scripts/e2t_db_script.py
similarity index 95%
rename from Automation/Tests/Scripts/e2t_init_script.py
rename to Automation/Tests/Scripts/e2t_db_script.py
index ac48cbb..add1a9b 100644 (file)
--- a/Automation/Tests/Scripts/e2t_init_script.py
+++ b/Automation/Tests/Scripts/e2t_db_script.py
@@ -29,7 +29,7 @@ def getRedisClientDecodeResponse():
     return redis.Redis(host=c, port=p, db=0, decode_responses=True)
 
 
-def verify_db_e2t_addresses():
+def verify_e2t_addresses_key():
 
     r = getRedisClientDecodeResponse()
     
@@ -38,7 +38,7 @@ def verify_db_e2t_addresses():
     return r.get("{e2Manager},E2TAddresses") == value
 
 
-def verify_db_e2t_instance():
+def verify_e2t_instance_key():
 
     r = getRedisClientDecodeResponse()