RIC-398 - Fix all critical issues from static code analysis scan

[ric-plt/e2mgr.git] / Automation / Tests / Scripts / e2mdbscripts.py

diff --git a/Automation/Tests/Scripts/e2mdbscripts.py b/Automation/Tests/Scripts/e2mdbscripts.py
index 936346b..b671cd5 100644 (file)
--- a/Automation/Tests/Scripts/e2mdbscripts.py
+++ b/Automation/Tests/Scripts/e2mdbscripts.py
@@ -40,12 +40,20 @@ def verify_e2t_instance_has_no_associated_rans(e2tAddress):
     assocRanList = e2tInstanceDic.get("associatedRanList")
     return not assocRanList
 
+def verify_e2t_instance_exists_in_addresses(e2tAddress):
+    r = getRedisClientDecodeResponse()
+    e2tAddressesJson = r.get("{e2Manager},E2TAddresses")
+    e2tAddresses = json.loads(e2tAddressesJson)
+    return e2tAddress in e2tAddresses
+
+def verify_e2t_instance_key_exists(e2tAddress):
+    r = getRedisClientDecodeResponse()
+    return r.exists("{e2Manager},E2TInstance:"+e2tAddress)
 
 def populate_e2t_instances_in_e2m_db_for_get_e2t_instances_tc():
     r = getRedisClientDecodeResponse()
-    r.set("{e2Manager},E2TAddresses", "[\"e2t.att.com:38000\",\"e2t.att.com:38001\"]")
+    r.set("{e2Manager},E2TAddresses", "[\"e2t.att.com:38000\"]")
     r.set("{e2Manager},E2TInstance:e2t.att.com:38000", "{\"address\":\"e2t.att.com:38000\",\"associatedRanList\":[\"test1\",\"test2\",\"test3\"],\"keepAliveTimestamp\":1577619310484022369,\"state\":\"ACTIVE\"}")
-    r.set("{e2Manager},E2TInstance:e2t.att.com:38001", "{\"address\":\"e2t.att.com:38001\",\"associatedRanList\":[],\"keepAliveTimestamp\":1577619310484022369,\"state\":\"ACTIVE\"}")
     return True
 
 # def dissociate_ran_from_e2tInstance(ranName, e2tAddress):