Merge "testing with multiple gem ports"
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
index 46f5de4..f33efc5 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
@@ -57,7 +57,7 @@
"name": "4QueueHybridProfileMap1",
"profile_type": "XPON",
"version": 1.0,
- "num_gem_ports": 1,
+ "num_gem_ports": 4,
"instance_control": {
"onu": "multi-instance",
"uni": "single-instance",
@@ -90,6 +90,48 @@
"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": "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": [{
@@ -105,6 +147,48 @@
"max_threshold": 0,
"max_probability": 0
}
+ },
+ {
+ "pbit_map": "0b00011010",
+ "aes_encryption": "True",
+ "scheduling_policy": "StrictPriority",
+ "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/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
index c4cfb2b..e893f3b 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
@@ -34,11 +34,11 @@
bandwidth2_bp:
type: tosca.nodes.BandwidthProfile
properties:
- air: 99999
- cbs: 99999
- cir: 99999
- ebs: 99999
- eir: 99999
+ air: 100000
+ cbs: 10000
+ cir: 5000
+ ebs: 1000
+ eir: 5000
name: bandwidth2
# Pre-provision the subscriber the subscriber