Merge "HTTPS support for rApp Catalogue"

[nonrtric.git] / test / common / delete_policies_process.py

diff --git a/test/common/delete_policies_process.py b/test/common/delete_policies_process.py
index e647118..febb3cc 100644 (file)
--- a/test/common/delete_policies_process.py
+++ b/test/common/delete_policies_process.py
@@ -38,9 +38,9 @@ try:
         sys.exit()
 
     responsecode=int(sys.argv[1])
-    baseurl=sys.argv[2]
+    baseurl=str(sys.argv[2])
     num_rics=int(sys.argv[3])
-    uuid=sys.argv[4]
+    uuid=str(sys.argv[4])
     start=int(sys.argv[5])
     count=int(sys.argv[6])
     pids=int(sys.argv[7])
@@ -49,25 +49,43 @@ try:
     if uuid == "NOUUID":
         uuid=""
 
+    total_retry_count=0
+
     stop=count*num_rics+start
     for i in range(start,stop):
         if (i%pids == (pid_id-1)):
-            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:"+uuid+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
-                sys.exit()
-            if (resp.status_code == None):
-                print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+responsecode+", got: None")
-                sys.exit()
-            if (resp.status_code != responsecode):
-                print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+responsecode+", got: "+str(resp.status_code))
-                sys.exit()
+            retry_cnt=5
+            while(retry_cnt>0):
+                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:"+uuid+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
+                    sys.exit()
+                if (resp.status_code == None):
+                    print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: None")
+                    sys.exit()
+                if (resp.status_code != responsecode):
+                    if (resp.status_code == 503 ) and (retry_cnt > 1):
+                        sleep(0.1)
+                        retry_cnt -= 1
+                        total_retry_count += 1
+                    else:
+                        print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
+                        sys.exit()
+                else:
+                    retry_cnt=-1
 
-    print("0")
+    if (total_retry_count > 0):
+        print("0 retries:"+str(total_retry_count))
+    else:
+        print("0")
     sys.exit()
 
 except Exception as e:
     print("1"+str(e))
+    traceback.print_exc()
 sys.exit()
\ No newline at end of file