X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fdelete_policies_process.py;h=530e877679b7156a9bfe48ced1866afe7a100c18;hb=84ffd4a403baee1b7aa86f9986f0c1659a5a0881;hp=febb3cc0d51decaf683f1f58ce8a042e1084cf01;hpb=803d48989d7824309602393763142320cdbbc0d2;p=nonrtric.git

diff --git a/test/common/delete_policies_process.py b/test/common/delete_policies_process.py
index febb3cc0..530e8776 100644
--- a/test/common/delete_policies_process.py
+++ b/test/common/delete_policies_process.py
@@ -30,11 +30,11 @@ from requests.packages import urllib3
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-#arg responsecode baseurl num_rics uuid startid count pids pid_id
+#arg responsecode baseurl num_rics uuid startid count pids pid_id proxy
 
 try:
-    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")
+    if len(sys.argv) != 10:
+        print("1Expected 9 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl num_rics uuid startid count pids pid_id proxy")
         sys.exit()
 
     responsecode=int(sys.argv[1])
@@ -45,15 +45,24 @@ try:
     count=int(sys.argv[6])
     pids=int(sys.argv[7])
     pid_id=int(sys.argv[8])
+    httpproxy=str(sys.argv[9])
 
+    proxydict=None
+    if httpproxy != "NOPROXY":
+        proxydict = {
+            "http" : httpproxy,
+            "https" : httpproxy
+        }
     if uuid == "NOUUID":
         uuid=""
 
-    total_retry_count=0
+    http_retry_count=0
+    connect_retry_count=0
 
     stop=count*num_rics+start
     for i in range(start,stop):
         if (i%pids == (pid_id-1)):
+            connect_ok=False
             retry_cnt=5
             while(retry_cnt>0):
                 if ("/v2/policies/" in baseurl):
@@ -61,28 +70,36 @@ try:
                 else:
                     url=str(baseurl+"?id="+uuid+str(i))
                 try:
-                    resp=requests.delete(url, verify=False, timeout=90)
+                    if proxydict is None:
+                        resp=requests.delete(url, verify=False, timeout=90)
+                    else:
+                        resp=requests.delete(url, verify=False, timeout=90, proxies=proxydict)
+                    cconnect_ok=True
                 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):
+                    if (retry_cnt > 1):
                         sleep(0.1)
                         retry_cnt -= 1
-                        total_retry_count += 1
+                        connect_retry_count += 1
                     else:
-                        print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
+                        print("1Delete failed for id:"+uuid+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
                         sys.exit()
-                else:
-                    retry_cnt=-1
 
-    if (total_retry_count > 0):
-        print("0 retries:"+str(total_retry_count))
-    else:
-        print("0")
+                if (cconnect_ok == True):
+                    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 >= 500) and (http_retry_count < 600 ) and (retry_cnt > 1):
+                            sleep(0.1)
+                            retry_cnt -= 1
+                            http_retry_count += 1
+                        else:
+                            print("1Delete failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code)+str(resp.raw))
+                            sys.exit()
+                    else:
+                        retry_cnt=-1
+
+    print("0 http retries:"+str(http_retry_count) + ", connect retries: "+str(connect_retry_count))
     sys.exit()
 
 except Exception as e: