Merge "test physical OLT reboot with new fixes"
diff --git a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
index 7617e83..7604995 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
@@ -165,7 +165,7 @@
"q_sched_policy": "hybrid"
},
"upstream_gem_port_attribute_list": [{
- "pbit_map": "0b11000000",
+ "pbit_map": "0b11111111",
"aes_encryption": "True",
"scheduling_policy": "StrictPriority",
"priority_q": 1,
@@ -180,7 +180,7 @@
}
],
"downstream_gem_port_attribute_list": [{
- "pbit_map": "0b11000000",
+ "pbit_map": "0b11111111",
"aes_encryption": "True",
"scheduling_policy": "StrictPriority",
"priority_q": 1,
diff --git a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
index ae6a792..dfcc81a 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -24,11 +24,26 @@
topology_template:
node_templates:
- default_bp:
- type: tosca.nodes.BandwidthProfile
- properties:
+ default:
+ type: tosca.nodes.BandwidthProfile
+ properties:
name: Default
must-exist: true
+ air: 100000
+ cbs: 30
+ cir: 600
+ ebs: 30
+ eir: 400
+
+ high_speed_bp:
+ type: tosca.nodes.BandwidthProfile
+ properties:
+ air: 100000
+ cbs: 2000
+ cir: 5000
+ ebs: 2000
+ eir: 3000
+ name: Bronze
# EdgeCore OLT subscribers
edgecore_iskratel_subscriber:
@@ -45,10 +60,10 @@
tech_profile_id: 64
requirements:
- upstream_bps:
- node: default_bp
+ node: high_speed_bp
relationship: tosca.relationships.BelongsToOne
- downstream_bps:
- node: default_bp
+ node: high_speed_bp
relationship: tosca.relationships.BelongsToOne
edgecore_brcm_subscriber:
@@ -65,8 +80,8 @@
tech_profile_id: 64
requirements:
- upstream_bps:
- node: default_bp
+ node: high_speed_bp
relationship: tosca.relationships.BelongsToOne
- downstream_bps:
- node: default_bp
+ node: high_speed_bp
relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 937263a..fd736d3 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -27,11 +27,11 @@
high_speed_bp:
type: tosca.nodes.BandwidthProfile
properties:
- air: 2000
+ air: 100000
cbs: 2000
- cir: 2000
+ cir: 5000
ebs: 2000
- eir: 2000
+ eir: 3000
name: Bronze
# Pre-provision the subscriber the subscriber