Merge "test with single gem"
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
index 1d19cd0..52add89 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
@@ -144,8 +144,8 @@
{
"name": "4QueueHybridProfileMap1",
"profile_type": "XPON",
- "version": 1,
- "num_gem_ports": 4,
+ "version": 1.0,
+ "num_gem_ports": 1,
"instance_control": {
"onu": "multi-instance",
"uni": "single-instance",
@@ -165,55 +165,12 @@
"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
- }
- },
- {
+ "upstream_gem_port_attribute_list": [{
"pbit_map": "0b11000000",
"aes_encryption": "True",
"scheduling_policy": "StrictPriority",
"priority_q": 1,
- "weight": 25,
+ "weight": 0,
"discard_policy": "TailDrop",
"max_q_size": "auto",
"discard_config": {
@@ -223,55 +180,12 @@
}
}
],
- "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
- }
- },
- {
+ "downstream_gem_port_attribute_list": [{
"pbit_map": "0b11000000",
"aes_encryption": "True",
"scheduling_policy": "StrictPriority",
"priority_q": 1,
- "weight": 25,
+ "weight": 0,
"discard_policy": "TailDrop",
"max_q_size": "auto",
"discard_config": {