X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fdelete_policies_process.py;h=cf293c83d155847abf340d65ea1302e1a3e07f45;hb=4207b8389320d90274b12be78732304034bbc116;hp=fe879191cb9b164adf7983c8f731e6561c420a3b;hpb=048aaa15f061228fd7f340fa6fb0b6ac3d564ba8;p=nonrtric.git

diff --git a/test/common/delete_policies_process.py b/test/common/delete_policies_process.py
index fe879191..cf293c83 100644
--- a/test/common/delete_policies_process.py
+++ b/test/common/delete_policies_process.py
@@ -30,35 +30,42 @@ from requests.packages import urllib3
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-#arg responsecode baseurl num_rics startid count pids pid_id
+#arg responsecode baseurl num_rics uuid startid count pids pid_id
 
 try:
-    if len(sys.argv) != 8:
-        print("1Expected 7 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl num_rics startid count pids pid_id")
+    if len(sys.argv) != 9:
+        print("1Expected 8 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl num_rics uuid startid count pids pid_id")
         sys.exit()
 
     responsecode=int(sys.argv[1])
-    baseurl=sys.argv[2]
+    baseurl=str(sys.argv[2])
     num_rics=int(sys.argv[3])
-    start=int(sys.argv[4])
-    count=int(sys.argv[5])
-    pids=int(sys.argv[6])
-    pid_id=int(sys.argv[7])
+    uuid=str(sys.argv[4])
+    start=int(sys.argv[5])
+    count=int(sys.argv[6])
+    pids=int(sys.argv[7])
+    pid_id=int(sys.argv[8])
+
+    if uuid == "NOUUID":
+        uuid=""
 
     stop=count*num_rics+start
     for i in range(start,stop):
         if (i%pids == (pid_id-1)):
-            url=str(baseurl+"?id="+str(i))
+            if ("/v2/policies/" in baseurl):
+                url=str(baseurl+uuid+str(i))
+            else:
+                url=str(baseurl+"?id="+uuid+str(i))
             try:
                 resp=requests.delete(url, verify=False, timeout=90)
             except Exception as e1:
-                print("1Delete failed for id:"+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
+                print("1Delete failed for id:"+uuid+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
                 sys.exit()
             if (resp.status_code == None):
-                print("1Delete failed for id:"+str(i)+ ", expected response code: "+responsecode+", got: None")
+                print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: None")
                 sys.exit()
             if (resp.status_code != responsecode):
-                print("1Delete failed for id:"+str(i)+ ", expected response code: "+responsecode+", got: "+str(resp.status_code))
+                print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
                 sys.exit()
 
     print("0")
@@ -66,4 +73,5 @@ try:
 
 except Exception as e:
     print("1"+str(e))
+    traceback.print_exc()
 sys.exit()
\ No newline at end of file