X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Automation%2FTests%2FScripts%2Fcleanup_db.py;h=8e59c428a2c5d16a74870621be57a9f51e574bdc;hb=HEAD;hp=5c8db8409227305cbfe7c9880c79282ac539bcd5;hpb=f846c5987cd35da745534e26ac3a22bdcf8b030a;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/Scripts/cleanup_db.py b/Automation/Tests/Scripts/cleanup_db.py
index 5c8db84..8e59c42 100644
--- a/Automation/Tests/Scripts/cleanup_db.py
+++ b/Automation/Tests/Scripts/cleanup_db.py
@@ -22,37 +22,27 @@
 import config
 import redis
 import time
+import k8s_helper
 
 
-def flush():
-
+def flush(set_new_timestamp):
     c = config.redis_ip_address
 
     p = config.redis_ip_port
 
-    r = redis.Redis(host=c, port=p, db=0)
-
-    r.flushall()
-
-    r.set("{rsm},CFG:GENERAL:v1.0.0" , "{\"enableResourceStatus\":true,\"partialSuccessAllowed\":true,\"prbPeriodic\":true,\"tnlLoadIndPeriodic\":true,\"wwLoadIndPeriodic\":true,\"absStatusPeriodic\":true,\"rsrpMeasurementPeriodic\":true,\"csiPeriodic\":true,\"periodicityMs\":1,\"periodicityRsrpMeasurementMs\":3,\"periodicityCsiMs\":3}")
-
-    r.set("{e2Manager},E2TAddresses", "[\"e2t.att.com:38000\"]")
-
-    r.set("{e2Manager},E2TInstance:e2t.att.com:38000", "{\"address\":\"e2t.att.com:38000\",\"associatedRanList\":[],\"keepAliveTimestamp\":" + str(int((time.time()+2) * 1000000000)) + ",\"state\":\"ACTIVE\"}")
-
-    return True
-
-def flush_and_restore_without_e2t_keys():
+    r = redis.Redis(host=c, port=p, db=0, )
 
-    c = config.redis_ip_address
-
-    p = config.redis_ip_port
-
-    r = redis.Redis(host=c, port=p, db=0)
+    e2t_ip = k8s_helper.extract_service_ip("e2term-rmr-alpha")
+    et2_address = e2t_ip + ":38000"
 
     r.flushall()
+    r.set("{e2Manager},GENERAL", "{\"enableRic\":true}")
+    r.set("{e2Manager},E2TAddresses", "[\"{}\"]".format(et2_address))
 
-    r.set("{rsm},CFG:GENERAL:v1.0.0" , "{\"enableResourceStatus\":true,\"partialSuccessAllowed\":true,\"prbPeriodic\":true,\"tnlLoadIndPeriodic\":true,\"wwLoadIndPeriodic\":true,\"absStatusPeriodic\":true,\"rsrpMeasurementPeriodic\":true,\"csiPeriodic\":true,\"periodicityMs\":1,\"periodicityRsrpMeasurementMs\":3,\"periodicityCsiMs\":3}")
+    timestamp = str(int((time.time() + 2) * 1000000000)) if set_new_timestamp else str(
+        int((time.time() - 300) * 1000000000))
+    r.set("{{e2Manager}},E2TInstance:{}".format(et2_address),
+          "{{\"address\":\"{}\",\"associatedRanList\":[],\"keepAliveTimestamp\":".format(et2_address) + timestamp +
+          ",\"state\":\"ACTIVE\",\"deletionTimeStamp\":0}")
 
     return True
-