X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcreate_policies_process.py;h=d1bfd6f44d0061bf490b2814b2ff17f5726fc389;hb=8489de0f43f28c5cd62206b4e242c0308f9864b9;hp=19a77ba4b7eb9068d092fcb410819fd00a0a762f;hpb=b0c87504d1cd5cd68f9efcb2fdb8decb83855ef0;p=nonrtric.git

diff --git a/test/common/create_policies_process.py b/test/common/create_policies_process.py
index 19a77ba4..d1bfd6f4 100644
--- a/test/common/create_policies_process.py
+++ b/test/common/create_policies_process.py
@@ -30,21 +30,48 @@ from requests.packages import urllib3
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-#arg responsecode baseurl ric_base num_rics startid templatepath count pids pid_id
+#arg responsecode baseurl ric_base num_rics uuid startid templatepath count pids pid_id
+data_out=""
+url_out=""
 try:
-    if len(sys.argv) != 10:
-        print("1Expected 9 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics startid templatepath count pids pid_id")
-        sys.exit()
 
+    if len(sys.argv) < 11:
+        print("1Expected 11/14 args, got "+str(len(sys.argv)-1))
+        print (sys.argv[1:])
+        sys.exit()
     responsecode=int(sys.argv[1])
-    baseurl=sys.argv[2]
-    ric_base=sys.argv[3]
+    baseurl=str(sys.argv[2])
+    ric_base=str(sys.argv[3])
     num_rics=int(sys.argv[4])
-    start=int(sys.argv[5])
-    templatepath=sys.argv[6]
-    count=int(sys.argv[7])
-    pids=int(sys.argv[8])
-    pid_id=int(sys.argv[9])
+    uuid=str(sys.argv[5])
+    start=int(sys.argv[6])
+    if ("/v2/" in baseurl):
+        if len(sys.argv) != 15:
+            print("1Expected 14 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")
+            print (sys.argv[1:])
+            sys.exit()
+
+        serv=str(sys.argv[7])
+        pt=str(sys.argv[8])
+        trans=str(sys.argv[9])
+        noti=str(sys.argv[10])
+        templatepath=str(sys.argv[11])
+        count=int(sys.argv[12])
+        pids=int(sys.argv[13])
+        pid_id=int(sys.argv[14])
+    else:
+        if len(sys.argv) != 11:
+            print("1Expected 10 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics uuid startid templatepath count pids pid_id")
+            print (sys.argv[1:])
+            sys.exit()
+
+        templatepath=str(sys.argv[7])
+        count=int(sys.argv[8])
+        pids=int(sys.argv[9])
+        pid_id=int(sys.argv[10])
+
+    if uuid == "NOUUID":
+        uuid=""
 
     with open(templatepath, 'r') as file:
         template = file.read()
@@ -57,18 +84,44 @@ try:
                 payload=template.replace("XXX",str(i))
                 ric_id=(i%num_rics)+1
                 ric=ric_base+str(ric_id)
-                url=baseurl+"&id="+str(i)+"&ric="+str(ric)
+
                 try:
                     headers = {'Content-type': 'application/json'}
-                    resp=requests.put(url, json.dumps(json.loads(payload)), headers=headers, verify=False, timeout=90)
+                    if ("/v2/" in baseurl):
+                        url=baseurl
+
+                        data={}
+                        data["ric_id"]=ric
+                        data["policy_id"]=uuid+str(i)
+                        data["service_id"]=serv
+                        if (trans != "NOTRANSIENT"):
+                            data["transient"]=trans
+                        if (pt != "NOTYPE"):
+                            data["policy_type_id"]=pt
+                        else:
+                            data["policy_type_id"]=""
+                        if (noti != "NOURL"):
+                            data["status_notification_uri"]=noti
+                        data["policy_data"]=json.loads(payload)
+
+                        url_out=url
+                        data_out=json.dumps(data)
+                        resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
+                    else:
+                        url=baseurl+"&id="+uuid+str(i)+"&ric="+str(ric)
+                        url_out=url
+                        data_out=json.dumps(json.loads(payload))
+                        resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
                 except Exception as e1:
-                    print("1Put failed for id:"+str(i)+ ", "+str(e1) + " "+traceback.format_exc())
+                    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:"+str(i)+ ", expected response code: "+responsecode+", got: None")
+                    print("1Put failed for id:"+uuid+str(i)+ ", expected response code: "+str(responsecode)+", got: None")
                     sys.exit()
                 if (resp.status_code != responsecode):
-                    print("1Put failed for id:"+str(i)+ ", expected response code: "+responsecode+", got: "+str(resp.status_code))
+                    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()
 
     print("0")
@@ -76,4 +129,6 @@ try:
 
 except Exception as e:
     print("1"+str(e))
+    traceback.print_exc()
+    print(str(data_out))
 sys.exit()
\ No newline at end of file