Update AC, break out xapp contract from a1 api spec
Change-Id: I931e421a2524e4ac923aef48858151c9f273ec3d
Signed-off-by: Tommy Carpenter <tc677g@att.com>
diff --git a/integration_tests/test_a1.tavern.yaml b/integration_tests/test_a1.tavern.yaml
index 78628cd..44eeb3d 100644
--- a/integration_tests/test_a1.tavern.yaml
+++ b/integration_tests/test_a1.tavern.yaml
@@ -48,32 +48,34 @@
create_schema:
"$schema": http://json-schema.org/draft-07/schema#
type: object
+ additionalProperties: false
properties:
+ class:
+ type: integer
+ minimum: 1
+ maximum: 256
+ description: integer id representing class to which we are applying policy
enforce:
type: boolean
- default: true
+ description: Whether to enable or disable enforcement of policy on this class
window_length:
type: integer
- default: 1
- minimum: 1
- maximum: 60
- description: Sliding window length (in minutes)
- blocking_rate:
- type: number
- default: 10
- minimum: 1
- maximum: 100
- description: "% Connections to block"
+ minimum: 15
+ maximum: 300
+ description: Sliding window length in seconds
trigger_threshold:
type: integer
- default: 10
minimum: 1
- description: Minimum number of events in window to trigger blocking
+ blocking_rate:
+ type: number
+ minimum: 0
+ maximum: 100
required:
+ - class
- enforce
- - blocking_rate
- - trigger_threshold
- window_length
+ - trigger_threshold
+ - blocking_rate
additionalProperties: false
response:
status_code: 201
@@ -140,8 +142,9 @@
url: http://localhost:10000/a1-p/policytypes/6660666/policies/admission_control_policy
method: PUT
json:
+ class: 12
enforce: true
- window_length: 10
+ window_length: 20
blocking_rate: 20
trigger_threshold: 10
headers:
@@ -164,11 +167,13 @@
response:
status_code: 200
body:
+ class: 12
enforce: true
- window_length: 10
+ 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
request: