X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Automation%2FTests%2FScripts%2Fe2mdbscripts.py;h=b209ea3e454e17db7895fc1a05302d9dda54a246;hb=197657e0e814c871b903ef779ad654b13347e430;hp=936346b23856a3fb6cf1bf21b95678e5329bb57c;hpb=5c9533257e79cc65d506df54105933bf5844e7ab;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/Scripts/e2mdbscripts.py b/Automation/Tests/Scripts/e2mdbscripts.py
index 936346b..b209ea3 100644
--- a/Automation/Tests/Scripts/e2mdbscripts.py
+++ b/Automation/Tests/Scripts/e2mdbscripts.py
@@ -17,48 +17,53 @@
 ##############################################################################
 
 import config
-import redis
-import cleanup_db
 import json
+import redis
+
 
 def getRedisClientDecodeResponse():
     c = config.redis_ip_address
     p = config.redis_ip_port
     return redis.Redis(host=c, port=p, db=0, decode_responses=True)
 
+
 def verify_ran_is_associated_with_e2t_instance(ranName, e2tAddress):
     r = getRedisClientDecodeResponse()
-    e2tInstanceJson = r.get("{e2Manager},E2TInstance:"+e2tAddress)
+    e2tInstanceJson = r.get("{e2Manager},E2TInstance:" + e2tAddress)
     e2tInstanceDic = json.loads(e2tInstanceJson)
     assocRanList = e2tInstanceDic.get("associatedRanList")
     return ranName in assocRanList
 
+
 def verify_e2t_instance_has_no_associated_rans(e2tAddress):
     r = getRedisClientDecodeResponse()
-    e2tInstanceJson = r.get("{e2Manager},E2TInstance:"+e2tAddress)
+    e2tInstanceJson = r.get("{e2Manager},E2TInstance:" + e2tAddress)
     e2tInstanceDic = json.loads(e2tInstanceJson)
     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},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\"}")
+    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\"}")
     return True
 
-# def dissociate_ran_from_e2tInstance(ranName, e2tAddress):
-#     r = getRedisClientDecodeResponse()
-#     e2tInstanceJson = r.get("{e2Manager},E2TInstance:"+e2tAddress)
-#     e2tInstanceDic = json.loads(e2tInstanceJson)
-#     assocRanList = e2tInstanceDic.get("associatedRanList")
-#     print(assocRanList)
-#     assocRanList.remove(ranName)
-#     updatedE2tInstanceJson = json.dumps(e2tInstanceDic)
-#     print(updatedE2tInstanceJson)
-#     r.set("{e2Manager},E2TInstance:"+e2tAddress, updatedE2tInstanceJson)
-#     nodebBytes = r.get("{e2Manager},RAN:"+ranName)
-#     encoded = nodebBytes.decode().replace(e2tAddress,"").encode()
-#     r.set("{e2Manager},RAN:"+ranName, encoded)
 
+def set_enable_ric_false():
+    r = getRedisClientDecodeResponse()
+    r.set("{e2Manager},GENERAL", "{\"enableRic\":false}")
+    return True