X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=integration_tests%2Ftest_a1.tavern.yaml;h=4657fccb589b045815cd62308feb67a6827978c8;hb=327d9dba437b30a06161d4f21cc2a33034d75bac;hp=bdd8d45a3b19cb443d2f101f5ccca843381b20d1;hpb=102b89592db01d8361a754c11a85699e5d2e965c;p=ric-plt%2Fa1.git

diff --git a/integration_tests/test_a1.tavern.yaml b/integration_tests/test_a1.tavern.yaml
index bdd8d45..4657fcc 100644
--- a/integration_tests/test_a1.tavern.yaml
+++ b/integration_tests/test_a1.tavern.yaml
@@ -28,7 +28,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: instance list 404
     request:
@@ -92,7 +92,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: [6660666]
+      json: [6660666]
 
   - name: instance list 200 but empty
     request:
@@ -100,7 +100,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: test the admission control policy get not there yet
     request:
@@ -165,24 +165,24 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         class: 12
         enforce: true
         window_length: 20
         blocking_rate: 20
         trigger_threshold: 10
 
-
   - name: test the admission control policy status get
-    delay_before: 3 # give it a few seconds for rmr
+    delay_before: 10 # give it a few seconds for rmr
     request:
       url: http://localhost:10000/a1-p/policytypes/6660666/policies/admission_control_policy/status
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "IN EFFECT"
         has_been_deleted: False
+        created_at: !anyfloat
 
   - name: instance list 200 and contains the instance
     request:
@@ -190,7 +190,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         - admission_control_policy
 
   # DELETE the instance and make sure subsequent GETs return properly
@@ -204,15 +204,17 @@ stages:
 
   - name: status should now be not in effect but still there
     delay_before: 3 # give it a few seconds for rmr
-    delay_after: 8 # 3 + 11 > 10; that is, wait until t2 expires
+    delay_after: 10 # 3 + 10 > 10; that is, wait until t2 expires
     request:
       url: http://localhost:10000/a1-p/policytypes/6660666/policies/admission_control_policy/status
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "NOT IN EFFECT"
         has_been_deleted: True
+        deleted_at: !anyfloat
+        created_at: !anyfloat
 
   - name: instance list 200 but no instance
     request:
@@ -220,7 +222,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: cant get instance status
     request:
@@ -263,7 +265,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
 
 ---
@@ -285,7 +287,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: instance list 404
     request:
@@ -320,7 +322,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         name: test policy
         description: just for testing
         policy_type_id: 20001
@@ -340,7 +342,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
        - 20001
 
   - name: instance list 200 but empty
@@ -349,7 +351,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: test the delay policy instance get not there yet
     request:
@@ -391,9 +393,10 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "NOT IN EFFECT"
         has_been_deleted: False
+        created_at: !anyfloat
 
   - name: test the delay policy get
     request:
@@ -401,7 +404,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         test: foo
 
   - name: instance list 200 and there
@@ -410,7 +413,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
        - delaytest
 
   - name: test the delay status get
@@ -421,9 +424,10 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "IN EFFECT"
         has_been_deleted: False
+        created_at: !anyfloat
 
   # DELETE the instance and make sure subsequent GETs return properly
   - name: delete the instance
@@ -439,9 +443,11 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "IN EFFECT"
         has_been_deleted: True
+        deleted_at: !anyfloat
+        created_at: !anyfloat
 
   - name: test the delay status get after delay but before timers
     delay_before: 7
@@ -450,9 +456,11 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "NOT IN EFFECT"
         has_been_deleted: True
+        deleted_at: !anyfloat
+        created_at: !anyfloat
 
   - name: test the delay status get after delay and after the timers
     delay_before: 7
@@ -507,7 +515,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   - name: instance 1
     request:
@@ -537,7 +545,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: [qt1, qt2]
+      json: [qt1, qt2]
 
   # after the query, a1 should send, query receiver should send back, and the policy should be in effect
   # sometimes in kubernetes, this test takes a long time to work because of an k8s issue
@@ -550,9 +558,10 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "IN EFFECT"
         has_been_deleted: False
+        created_at: !anyfloat
 
   - name: test the query status get 2
     max_retries: 100
@@ -562,9 +571,10 @@ stages:
       method: GET
     response:
       status_code: 200
-      body:
+      json:
         instance_status: "IN EFFECT"
         has_been_deleted: False
+        created_at: !anyfloat
 
 ---
 
@@ -607,7 +617,7 @@ stages:
       method: GET
     response:
       status_code: 200
-      body: []
+      json: []
 
   # this one cant currently be deleted, see the comment in a1/data.py