Added UUID to policy ids and new policy types
Change-Id: I0b0f600b4c5f4f10e36a84c76d1b104fcf3d712d
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index 877a209..d9a88b1 100755
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -35,6 +35,8 @@
# Path to callback receiver
CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+generate_uuid
+
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
#Test agent and simulator protocol versions (others are http only)
diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index 771ee55..eaa6de2 100755
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -28,6 +28,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
# Path to callback receiver
diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh
index 8ee7e37..6f90437 100755
--- a/test/auto-test/FTC100.sh
+++ b/test/auto-test/FTC100.sh
@@ -29,6 +29,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index 1efce99..8427ad1 100755
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -27,6 +27,7 @@
. ../common/agent_api_functions.sh
. ../common/ricsimulator_api_functions.sh
+generate_uuid
#Local vars in test script
##########################
diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index 9320302..1cd2a33 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -29,6 +29,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Test agent and simulator protocol versions (others are http only)
TESTED_PROTOCOLS="HTTP HTTPS"
diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index 9320606..2ab4385 100755
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -28,6 +28,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
# Path to callback receiver
diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 18d6816..7eb3c19 100755
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -30,6 +30,7 @@
#### TEST BEGIN ####
+generate_uuid
# Clean container and start all needed containers #
clean_containers
diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 0fe253f..416a77d 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -28,6 +28,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
# Path to callback receiver
diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh
index 6bab06b..e97f3ff 100755
--- a/test/auto-test/FTC800.sh
+++ b/test/auto-test/FTC800.sh
@@ -28,6 +28,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
# Path to callback receiver
diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh
index 2dae7e7..e9f19f8 100755
--- a/test/auto-test/FTC810.sh
+++ b/test/auto-test/FTC810.sh
@@ -28,6 +28,8 @@
#### TEST BEGIN ####
+generate_uuid
+
#Local vars in test script
##########################
# Path to callback receiver
diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh
index f45246d..32e450f 100755
--- a/test/auto-test/FTC850.sh
+++ b/test/auto-test/FTC850.sh
@@ -42,6 +42,8 @@
NUM_RICS=20
NUM_POLICIES_PER_RIC=500
+generate_uuid
+
for __httpx in $TESTED_PROTOCOLS ; do
for interface in $TESTED_VARIANTS ; do
@@ -80,6 +82,8 @@
start_mr # Not used, but removes error messages from the agent log
+ start_control_panel
+
start_policy_agent
set_agent_debug
diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh
index 5a71916..05b6ff6 100755
--- a/test/auto-test/FTC900.sh
+++ b/test/auto-test/FTC900.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Testing of the Control Panel and the Health Check app - populating with types and instances"
+TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances"
#App names to exclude checking pulling images for, space separated list
EXCLUDED_IMAGES="SDNC SDNC_ONAP"
@@ -38,9 +38,9 @@
OSC_NUM_RICS=6
STD_NUM_RICS=5
-start_ric_simulators ricsim_g1 $OSC_NUM_RICS OSC_2.1.0
+start_ric_simulators $RIC_SIM_PREFIX"_g1" $OSC_NUM_RICS OSC_2.1.0
-start_ric_simulators ricsim_g2 $STD_NUM_RICS STD_1.1.3
+start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3
start_mr #Just to prevent errors in the agent log...
@@ -60,37 +60,39 @@
# Print the A1 version for OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- sim_print ricsim_g1_$i interface
+ sim_print $RIC_SIM_PREFIX"_g1_"$i interface
done
# Print the A1 version for STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- sim_print ricsim_g2_$i interface
+ sim_print $RIC_SIM_PREFIX"_g2_"$i interface
done
# Load the polictypes in osc
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- sim_put_policy_type 201 ricsim_g1_$i 2 testdata/OSC/sim_hw.json
- sim_put_policy_type 201 ricsim_g1_$i 20008 testdata/OSC/sim_tsa.json
+ sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 2 testdata/OSC/sim_hw.json
+ sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 testdata/OSC/sim_qos.json
+ sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 20008 testdata/OSC/sim_tsa.json
done
#Check the number of schemas and the individual schemas in OSC
-api_equal json:policy_types 3 120
+api_equal json:policy_types 4 120
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_equal json:policy_types?ric=ricsim_g1_$i 2 120
+ api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
api_get_policy_schema 200 2 testdata/OSC/hw-agent-modified.json
+ api_get_policy_schema 200 100 testdata/OSC/qos-agent-modified.json
api_get_policy_schema 200 20008 testdata/OSC/tsa-agent-modified.json
done
@@ -98,34 +100,39 @@
# Create policies
use_agent_rest_http
-api_put_service 201 "rapp1" 0 "$CR_PATH/1"
+api_put_service 201 "Emergency-response-app" 0 "$CR_PATH/1"
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_put_policy 201 "rapp1" ricsim_g1_$i 2 $((2000+$i)) NOTRANSIENT testdata/OSC/pihw_template.json 1
- api_put_policy 201 "rapp1" ricsim_g1_$i 20008 $((2050+$i*10)) NOTRANSIENT testdata/OSC/pitsa_template.json 1
+ generate_uuid
+ api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT testdata/OSC/pihw_template.json 1
+ generate_uuid
+ api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT testdata/OSC/piqos_template.json 1
+ generate_uuid
+ api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT testdata/OSC/pitsa_template.json 1
done
# Check the number of policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- sim_equal ricsim_g1_$i num_instances 2
+ sim_equal $RIC_SIM_PREFIX"_g1_"$i num_instances 3
done
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- api_put_policy 201 "rapp1" ricsim_g2_$i NOTYPE $((2100+$i)) NOTRANSIENT testdata/STD/pi1_template.json 1
+ generate_uuid
+ api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT testdata/STD/pi1_template.json 1
done
# Check the number of policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- sim_equal ricsim_g2_$i num_instances 1
+ sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1
done
check_policy_agent_logs
diff --git a/test/auto-test/testdata/OSC/1-agent-modified.json b/test/auto-test/testdata/OSC/1-agent-modified.json
index 3b37214..a40aa88 100644
--- a/test/auto-test/testdata/OSC/1-agent-modified.json
+++ b/test/auto-test/testdata/OSC/1-agent-modified.json
@@ -20,7 +20,7 @@
"qosId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,6 +35,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/1.json b/test/auto-test/testdata/OSC/1.json
index 5fe68ce..c865bac 100644
--- a/test/auto-test/testdata/OSC/1.json
+++ b/test/auto-test/testdata/OSC/1.json
@@ -20,7 +20,7 @@
"qosId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,6 +35,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/3-agent-modified.json b/test/auto-test/testdata/OSC/3-agent-modified.json
index 303b36b..3bf9a47 100644
--- a/test/auto-test/testdata/OSC/3-agent-modified.json
+++ b/test/auto-test/testdata/OSC/3-agent-modified.json
@@ -16,7 +16,7 @@
"groupId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -31,6 +31,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/3.json b/test/auto-test/testdata/OSC/3.json
index ab0204d..4966dea 100644
--- a/test/auto-test/testdata/OSC/3.json
+++ b/test/auto-test/testdata/OSC/3.json
@@ -16,7 +16,7 @@
"groupId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -31,6 +31,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/4-agent-modified.json b/test/auto-test/testdata/OSC/4-agent-modified.json
index 868ceea..7fb71a6 100644
--- a/test/auto-test/testdata/OSC/4-agent-modified.json
+++ b/test/auto-test/testdata/OSC/4-agent-modified.json
@@ -16,7 +16,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -31,6 +31,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/4.json b/test/auto-test/testdata/OSC/4.json
index c5e785c..3891b76 100644
--- a/test/auto-test/testdata/OSC/4.json
+++ b/test/auto-test/testdata/OSC/4.json
@@ -16,7 +16,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -31,6 +31,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/5-agent-modified.json b/test/auto-test/testdata/OSC/5-agent-modified.json
index b5fd5bc..1b1c508 100644
--- a/test/auto-test/testdata/OSC/5-agent-modified.json
+++ b/test/auto-test/testdata/OSC/5-agent-modified.json
@@ -20,7 +20,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,6 +35,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/5.json b/test/auto-test/testdata/OSC/5.json
index dee440a..1708a1e 100644
--- a/test/auto-test/testdata/OSC/5.json
+++ b/test/auto-test/testdata/OSC/5.json
@@ -20,7 +20,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,6 +35,6 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
diff --git a/test/auto-test/testdata/OSC/hw-agent-modified.json b/test/auto-test/testdata/OSC/hw-agent-modified.json
index c48736e..5ea5802 100644
--- a/test/auto-test/testdata/OSC/hw-agent-modified.json
+++ b/test/auto-test/testdata/OSC/hw-agent-modified.json
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "2",
- "description": "HW policy type",
+ "description": "Hello World policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/OSC/hw.json b/test/auto-test/testdata/OSC/hw.json
index 684f80d..b15b93e 100644
--- a/test/auto-test/testdata/OSC/hw.json
+++ b/test/auto-test/testdata/OSC/hw.json
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
- "title": "HW Policy",
- "description": "HW policy type",
+ "title": "Hello World Policy",
+ "description": "Hello World policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/OSC/pi1_template.json b/test/auto-test/testdata/OSC/pi1_template.json
index 7795808..da25554 100644
--- a/test/auto-test/testdata/OSC/pi1_template.json
+++ b/test/auto-test/testdata/OSC/pi1_template.json
@@ -3,7 +3,7 @@
"ueId": "ueXXX",
"qosId": "qosXXX"
},
- "qosObjective": {
+ "qosObjectives": {
"priorityLevel": XXX
}
}
\ No newline at end of file
diff --git a/test/auto-test/testdata/OSC/pi3_template.json b/test/auto-test/testdata/OSC/pi3_template.json
index a916fad..02d33bc 100644
--- a/test/auto-test/testdata/OSC/pi3_template.json
+++ b/test/auto-test/testdata/OSC/pi3_template.json
@@ -2,7 +2,7 @@
"scope": {
"groupId": "groupXXX"
},
- "qosObjective": {
+ "qosObjectives": {
"priorityLevel": XXX
}
}
\ No newline at end of file
diff --git a/test/auto-test/testdata/OSC/pi4_template.json b/test/auto-test/testdata/OSC/pi4_template.json
index 0673dec..dff4b6b 100644
--- a/test/auto-test/testdata/OSC/pi4_template.json
+++ b/test/auto-test/testdata/OSC/pi4_template.json
@@ -2,7 +2,7 @@
"scope": {
"cellId": "cellXXX"
},
- "qosObjective": {
+ "qosObjectives": {
"priorityLevel": XXX
}
}
\ No newline at end of file
diff --git a/test/auto-test/testdata/OSC/pi5_template.json b/test/auto-test/testdata/OSC/pi5_template.json
index e362c9e..af6be9d 100644
--- a/test/auto-test/testdata/OSC/pi5_template.json
+++ b/test/auto-test/testdata/OSC/pi5_template.json
@@ -3,7 +3,7 @@
"sliceId": "sliceXXX",
"cellId": "cellXXX"
},
- "qosObjective": {
+ "qosObjectives": {
"priorityLevel": XXX
}
}
\ No newline at end of file
diff --git a/test/auto-test/testdata/OSC/piqos_template.json b/test/auto-test/testdata/OSC/piqos_template.json
new file mode 100644
index 0000000..da25554
--- /dev/null
+++ b/test/auto-test/testdata/OSC/piqos_template.json
@@ -0,0 +1,9 @@
+{
+ "scope": {
+ "ueId": "ueXXX",
+ "qosId": "qosXXX"
+ },
+ "qosObjectives": {
+ "priorityLevel": XXX
+ }
+ }
\ No newline at end of file
diff --git a/test/auto-test/testdata/OSC/qos-agent-modified.json b/test/auto-test/testdata/OSC/qos-agent-modified.json
new file mode 100644
index 0000000..3a012cd
--- /dev/null
+++ b/test/auto-test/testdata/OSC/qos-agent-modified.json
@@ -0,0 +1,40 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "100",
+ "description": "Quality of Service policy type",
+ "type": "object",
+ "properties": {
+ "scope": {
+ "type": "object",
+ "properties": {
+ "ueId": {
+ "type": "string"
+ },
+ "qosId": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "ueId",
+ "qosId"
+ ]
+ },
+ "qosObjectives": {
+ "type": "object",
+ "properties": {
+ "priorityLevel": {
+ "type": "number"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "priorityLevel"
+ ]
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "scope", "qosObjectives"
+ ]
+ }
diff --git a/test/auto-test/testdata/OSC/qos.json b/test/auto-test/testdata/OSC/qos.json
new file mode 100644
index 0000000..070ebe4
--- /dev/null
+++ b/test/auto-test/testdata/OSC/qos.json
@@ -0,0 +1,40 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "OSC_Type1_1.0.0",
+ "description": "Quality of Service policy type",
+ "type": "object",
+ "properties": {
+ "scope": {
+ "type": "object",
+ "properties": {
+ "ueId": {
+ "type": "string"
+ },
+ "qosId": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "ueId",
+ "qosId"
+ ]
+ },
+ "qosObjectives": {
+ "type": "object",
+ "properties": {
+ "priorityLevel": {
+ "type": "number"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "priorityLevel"
+ ]
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "scope", "qosObjectives"
+ ]
+}
diff --git a/test/auto-test/testdata/OSC/sim_1.json b/test/auto-test/testdata/OSC/sim_1.json
index 537d86f..aeea773 100644
--- a/test/auto-test/testdata/OSC/sim_1.json
+++ b/test/auto-test/testdata/OSC/sim_1.json
@@ -24,7 +24,7 @@
"qosId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -39,7 +39,7 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
}
diff --git a/test/auto-test/testdata/OSC/sim_3.json b/test/auto-test/testdata/OSC/sim_3.json
index 1b97047..d21a9a9 100644
--- a/test/auto-test/testdata/OSC/sim_3.json
+++ b/test/auto-test/testdata/OSC/sim_3.json
@@ -20,7 +20,7 @@
"groupId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,7 +35,7 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
}
diff --git a/test/auto-test/testdata/OSC/sim_4.json b/test/auto-test/testdata/OSC/sim_4.json
index ac1fa2b..a55b34e 100644
--- a/test/auto-test/testdata/OSC/sim_4.json
+++ b/test/auto-test/testdata/OSC/sim_4.json
@@ -20,7 +20,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -35,7 +35,7 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
}
diff --git a/test/auto-test/testdata/OSC/sim_5.json b/test/auto-test/testdata/OSC/sim_5.json
index 4d8f3c9..fd5290f 100644
--- a/test/auto-test/testdata/OSC/sim_5.json
+++ b/test/auto-test/testdata/OSC/sim_5.json
@@ -24,7 +24,7 @@
"cellId"
]
},
- "qosObjective": {
+ "qosObjectives": {
"type": "object",
"properties": {
"priorityLevel": {
@@ -39,7 +39,7 @@
},
"additionalProperties": false,
"required": [
- "scope", "qosObjective"
+ "scope", "qosObjectives"
]
}
}
diff --git a/test/auto-test/testdata/OSC/sim_hw.json b/test/auto-test/testdata/OSC/sim_hw.json
index 65085c5..47e0ae0 100644
--- a/test/auto-test/testdata/OSC/sim_hw.json
+++ b/test/auto-test/testdata/OSC/sim_hw.json
@@ -5,7 +5,7 @@
"create_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "HW Policy",
- "description": "HW policy type",
+ "description": "Hello World policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/OSC/sim_qos.json b/test/auto-test/testdata/OSC/sim_qos.json
new file mode 100644
index 0000000..92eaa6f
--- /dev/null
+++ b/test/auto-test/testdata/OSC/sim_qos.json
@@ -0,0 +1,45 @@
+{
+ "name": "pt1",
+ "description": "pt1 policy type",
+ "policy_type_id": 100,
+ "create_schema": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "OSC_Type1_1.0.0",
+ "description": "Quality of Service policy type",
+ "type": "object",
+ "properties": {
+ "scope": {
+ "type": "object",
+ "properties": {
+ "ueId": {
+ "type": "string"
+ },
+ "qosId": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "ueId",
+ "qosId"
+ ]
+ },
+ "qosObjectives": {
+ "type": "object",
+ "properties": {
+ "priorityLevel": {
+ "type": "number"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "priorityLevel"
+ ]
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "scope", "qosObjectives"
+ ]
+ }
+}
diff --git a/test/auto-test/testdata/OSC/sim_tsa.json b/test/auto-test/testdata/OSC/sim_tsa.json
index 4520cfa..9227b5e 100644
--- a/test/auto-test/testdata/OSC/sim_tsa.json
+++ b/test/auto-test/testdata/OSC/sim_tsa.json
@@ -5,7 +5,7 @@
"create_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "TS Policy",
- "description": "TS policy type",
+ "description": "Traffic Steering - High prio traffic - policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/OSC/tsa-agent-modified.json b/test/auto-test/testdata/OSC/tsa-agent-modified.json
index 7d48ff9..d9426c7 100644
--- a/test/auto-test/testdata/OSC/tsa-agent-modified.json
+++ b/test/auto-test/testdata/OSC/tsa-agent-modified.json
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "20008",
- "description": "TS policy type",
+ "description": "Traffic Steering - High prio traffic - policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/OSC/tsa.json b/test/auto-test/testdata/OSC/tsa.json
index b1d443b..5f4d20d 100644
--- a/test/auto-test/testdata/OSC/tsa.json
+++ b/test/auto-test/testdata/OSC/tsa.json
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "TS Policy",
- "description": "TS policy type",
+ "description": "Traffic Steering - High prio traffic - policy type",
"type": "object",
"properties": {
"threshold": {
diff --git a/test/auto-test/testdata/STD/pi1_template.json b/test/auto-test/testdata/STD/pi1_template.json
index 2a87513..e06b031 100644
--- a/test/auto-test/testdata/STD/pi1_template.json
+++ b/test/auto-test/testdata/STD/pi1_template.json
@@ -3,7 +3,7 @@
"ueId": "ueXXX",
"qosId": "qosXXX"
},
- "qosObjective": {
+ "qosObjectives": {
"priorityLevel": XXX
}
}
\ No newline at end of file