Doc update with j-release links (master branch)

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

diff --git a/test/common/create_policies_process.py b/test/common/create_policies_process.py
index b97904b..d81ec74 100644 (file)
--- a/test/common/create_policies_process.py
+++ b/test/common/create_policies_process.py
@@ -47,7 +47,7 @@ try:
     uuid=str(sys.argv[5])
     start=int(sys.argv[6])
     httpproxy="NOPROXY"
-    if ("/v2/" in baseurl):
+    if ("/v2/" in baseurl) or ("a1policymanagement/v1/" in baseurl):
         if len(sys.argv) != 16:
             print("1Expected 15 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics uuid startid service type transient notification-url templatepath count pids pid_id proxy")
             print (sys.argv[1:])
@@ -89,7 +89,8 @@ try:
         start=start
         stop=count*num_rics+start
 
-        total_retry_count=0
+        http_retry_count=0
+        connect_retry_count=0
 
         for i in range(start,stop):
             if (i%pids == (pid_id-1)):
@@ -97,6 +98,7 @@ try:
                 ric_id=(i%num_rics)+1
                 ric=ric_base+str(ric_id)
 
+                connect_ok=False
                 retry_cnt=5
                 while(retry_cnt>0):
                     try:
@@ -114,45 +116,74 @@ try:
                                 data["policytype_id"]=pt
                             else:
                                 data["policytype_id"]=""
-                            if (noti != "NOURL"):
-                                data["status_notification_uri"]=noti
                             data["policy_data"]=json.loads(payload)
 
                             url_out=url
                             data_out=json.dumps(data)
+                            if proxydict is None:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
+
+                        elif ("a1policymanagement/v1/" in baseurl):
+                            url=baseurl
+
+                            data={}
+                            data["nearRtRicId"]=ric
+                            data["serviceId"]=serv
+                            if (trans != "NOTRANSIENT"):
+                                data["transient"]=trans
+                            if (pt != "NOTYPE"):
+                                data["policyTypeId"]=pt
+                            else:
+                                data["policyTypeId"]=""
+                            if (noti != "NOURL"):
+                                data["statusNotificationUri"]=noti
+                            data["policyObject"]=json.loads(payload)
+
+                            url_out=url
+                            data_out=json.dumps(data)
+                            if proxydict is None:
+                                resp=requests.post(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.post(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
                         else:
                             url=baseurl+"&id="+uuid+str(i)+"&ric="+str(ric)
                             url_out=url
                             data_out=json.dumps(json.loads(payload))
-                        if proxydict is None:
-                            resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
-                        else:
-                            resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
+                            if proxydict is None:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
+                        connect_ok=True
                     except Exception as e1:
-                        print("1Put failed for id:"+uuid+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
-                        sys.exit()
-
-                    if (resp.status_code == None):
-                        print("1Put 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("1Put failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
-                            print(url_out)
-                            print(str(data_out))
+                            print("1Put 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 (connect_ok == True):
+                        if (resp.status_code == None):
+                            print("1Put 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("1Put failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
+                                print(url_out)
+                                print(str(data_out))
+                                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: