[VOL-2842] Changes to pipeline to accommodate release branch
Change-Id: Ia4de5c93b6fb2a8407b24a08a89c91638aac66dc
diff --git a/tests/data/TechProfile-1T4GEM-bal31.json b/tests/data/TechProfile-1T4GEM-bal31.json
deleted file mode 100644
index 480618c..0000000
--- a/tests/data/TechProfile-1T4GEM-bal31.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "name":"4QueueHybridProfileMap1",
- "profile_type":"XPON",
- "version":1,
- "num_gem_ports":4,
- "instance_control":{
- "onu":"multi-instance",
- "uni":"single-instance",
- "max_gem_payload_size":"auto"
- },
- "us_scheduler":{
- "additional_bw":"AdditionalBW_BestEffort",
- "direction":"UPSTREAM",
- "priority":0,
- "weight":0,
- "q_sched_policy":"Hybrid"
- },
- "ds_scheduler":{
- "additional_bw":"AdditionalBW_BestEffort",
- "direction":"DOWNSTREAM",
- "priority":0,
- "weight":0,
- "q_sched_policy":"Hybrid"
- },
- "upstream_gem_port_attribute_list":[
- {
- "pbit_map":"0b00000101",
- "aes_encryption":"True",
- "scheduling_policy":"WRR",
- "priority_q":4,
- "weight":25,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "max_threshold":0,
- "min_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b00011010",
- "aes_encryption":"True",
- "scheduling_policy":"WRR",
- "priority_q":3,
- "weight":75,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b00100000",
- "aes_encryption":"True",
- "scheduling_policy":"StrictPriority",
- "priority_q":2,
- "weight":0,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b11000000",
- "aes_encryption":"True",
- "scheduling_policy":"StrictPriority",
- "priority_q":1,
- "weight":25,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- }
- ],
- "downstream_gem_port_attribute_list":[
- {
- "pbit_map":"0b00000101",
- "aes_encryption":"True",
- "scheduling_policy":"WRR",
- "priority_q":4,
- "weight":10,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b00011010",
- "aes_encryption":"True",
- "scheduling_policy":"WRR",
- "priority_q":3,
- "weight":90,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b00100000",
- "aes_encryption":"True",
- "scheduling_policy":"StrictPriority",
- "priority_q":2,
- "weight":0,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- },
- {
- "pbit_map":"0b11000000",
- "aes_encryption":"True",
- "scheduling_policy":"StrictPriority",
- "priority_q":1,
- "weight":25,
- "discard_policy":"TailDrop",
- "max_q_size":"auto",
- "discard_config":{
- "min_threshold":0,
- "max_threshold":0,
- "max_probability":0
- }
- }
- ]
-}
diff --git a/tests/data/TechProfile-1T4GEM.json b/tests/data/TechProfile-1T4GEM.json
index 4778b35..480618c 100644
--- a/tests/data/TechProfile-1T4GEM.json
+++ b/tests/data/TechProfile-1T4GEM.json
@@ -1,140 +1,140 @@
-{
- "name": "4QueueHybridProfileMap1",
- "profile_type": "XPON",
- "version": 1,
- "num_gem_ports": 4,
- "instance_control": {
- "onu": "multi-instance",
- "uni": "single-instance",
- "max_gem_payload_size": "auto"
+{
+ "name":"4QueueHybridProfileMap1",
+ "profile_type":"XPON",
+ "version":1,
+ "num_gem_ports":4,
+ "instance_control":{
+ "onu":"multi-instance",
+ "uni":"single-instance",
+ "max_gem_payload_size":"auto"
},
- "us_scheduler": {
- "additional_bw": "AdditionalBW_Auto",
- "direction": "UPSTREAM",
- "priority": 0,
- "weight": 0,
- "q_sched_policy": "Hybrid"
+ "us_scheduler":{
+ "additional_bw":"AdditionalBW_BestEffort",
+ "direction":"UPSTREAM",
+ "priority":0,
+ "weight":0,
+ "q_sched_policy":"Hybrid"
},
- "ds_scheduler": {
- "additional_bw": "AdditionalBW_Auto",
- "direction": "DOWNSTREAM",
- "priority": 0,
- "weight": 0,
- "q_sched_policy": "Hybrid"
+ "ds_scheduler":{
+ "additional_bw":"AdditionalBW_BestEffort",
+ "direction":"DOWNSTREAM",
+ "priority":0,
+ "weight":0,
+ "q_sched_policy":"Hybrid"
},
- "upstream_gem_port_attribute_list": [
- {
- "pbit_map": "0b00000101",
- "aes_encryption": "True",
- "scheduling_policy": "WRR",
- "priority_q": 4,
- "weight": 25,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "max_threshold": 0,
- "min_threshold": 0,
- "max_probability": 0
+ "upstream_gem_port_attribute_list":[
+ {
+ "pbit_map":"0b00000101",
+ "aes_encryption":"True",
+ "scheduling_policy":"WRR",
+ "priority_q":4,
+ "weight":25,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "max_threshold":0,
+ "min_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b00011010",
- "aes_encryption": "True",
- "scheduling_policy": "WRR",
- "priority_q": 3,
- "weight": 75,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b00011010",
+ "aes_encryption":"True",
+ "scheduling_policy":"WRR",
+ "priority_q":3,
+ "weight":75,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b00100000",
- "aes_encryption": "True",
- "scheduling_policy": "StrictPriority",
- "priority_q": 2,
- "weight": 0,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b00100000",
+ "aes_encryption":"True",
+ "scheduling_policy":"StrictPriority",
+ "priority_q":2,
+ "weight":0,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b11000000",
- "aes_encryption": "True",
- "scheduling_policy": "StrictPriority",
- "priority_q": 1,
- "weight": 25,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b11000000",
+ "aes_encryption":"True",
+ "scheduling_policy":"StrictPriority",
+ "priority_q":1,
+ "weight":25,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
}
],
- "downstream_gem_port_attribute_list": [
- {
- "pbit_map": "0b00000101",
- "aes_encryption": "True",
- "scheduling_policy": "WRR",
- "priority_q": 4,
- "weight": 10,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ "downstream_gem_port_attribute_list":[
+ {
+ "pbit_map":"0b00000101",
+ "aes_encryption":"True",
+ "scheduling_policy":"WRR",
+ "priority_q":4,
+ "weight":10,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b00011010",
- "aes_encryption": "True",
- "scheduling_policy": "WRR",
- "priority_q": 3,
- "weight": 90,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b00011010",
+ "aes_encryption":"True",
+ "scheduling_policy":"WRR",
+ "priority_q":3,
+ "weight":90,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b00100000",
- "aes_encryption": "True",
- "scheduling_policy": "StrictPriority",
- "priority_q": 2,
- "weight": 0,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b00100000",
+ "aes_encryption":"True",
+ "scheduling_policy":"StrictPriority",
+ "priority_q":2,
+ "weight":0,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
},
- {
- "pbit_map": "0b11000000",
- "aes_encryption": "True",
- "scheduling_policy": "StrictPriority",
- "priority_q": 1,
- "weight": 25,
- "discard_policy": "TailDrop",
- "max_q_size": "auto",
- "discard_config": {
- "min_threshold": 0,
- "max_threshold": 0,
- "max_probability": 0
+ {
+ "pbit_map":"0b11000000",
+ "aes_encryption":"True",
+ "scheduling_policy":"StrictPriority",
+ "priority_q":1,
+ "weight":25,
+ "discard_policy":"TailDrop",
+ "max_q_size":"auto",
+ "discard_config":{
+ "min_threshold":0,
+ "max_threshold":0,
+ "max_probability":0
}
}
]