Latest config for ONLAB POD1
Change-Id: I1b6b3efe711b21e45f57dd70949bdd6ef83b83e4
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index c0a33f9..d63e187 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -19,6 +19,7 @@
- custom_types/oltdevice.yaml
- custom_types/onudevice.yaml
- custom_types/voltservice.yaml
+ - custom_types/technologyprofile
description: Create a simulated OLT Device in VOLTHA
topology_template:
node_templates:
@@ -44,4 +45,147 @@
requirements:
- volt_service:
node: service#volt
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
+ relationship: tosca.relationships.BelongsToOne
+
+ technologyProfile:
+ type: tosca.nodes.TechnologyProfile
+ properties:
+ profile_id: 64
+ technology: xgspon
+ profile_value: >
+ {
+ "name": "4QueueHybridProfileMap1",
+ "profile Type": "XPON",
+ "version": 1.0,
+ "instance_control": {
+ "onu": "multi-instance",
+ "uni": "single-instance",
+ "num_gem_ports": 4,
+ "Max_GEM_Payload_Size": "auto"
+ },
+ "u_s_scheduler": {
+ "additional_bw": "auto",
+ "priority": 0,
+ "weight": 0,
+ "q_sched_policy": "hybrid"
+ },
+ "d_s_scheduler": {
+ "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": "Tail-Drop",
+ "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": "Tail-Drop",
+ "Max_Q_Size": "auto",
+ "Discard_Config": {
+ "Min_Threshold": 0,
+ "Max_Threshold": 0,
+ "Max_Probability": 0
+ }
+ },
+ {
+ "pbit_map": "0b00100000",
+ "AES_Encryption": "TRUE",
+ "Scheduling_Policy": "Strict-Priority",
+ "Priority_Q": 2,
+ "Weight": 0,
+ "Discard_Policy": "Tail-Drop",
+ "Max_Q_Size": "auto",
+ "Discard_Config": {
+ "Min_Threshold": 0,
+ "Max_Threshold": 0,
+ "Max_Probability": 0
+ }
+ },
+ {
+ "pbit_map": "0b11000000",
+ "AES_Encryption": "TRUE",
+ "Scheduling_Policy": "Strict-Priority",
+ "Priority_Q": 1,
+ "Weight": 0,
+ "Discard_Policy": "Tail-Drop",
+ "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": "Tail-Drop",
+ "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": "Tail-Drop",
+ "Max_Q_Size": "auto",
+ "Discard_Config": {
+ "Min_Threshold": 0,
+ "Max_Threshold": 0,
+ "Max_Probability": 0
+ }
+ },
+ {
+ "pbit_map": "0b00100000",
+ "AES_Encryption": "TRUE",
+ "Scheduling_Policy": "Strict-Priority",
+ "Priority_Q": 2,
+ "Weight": 0,
+ "Discard_Policy": "Tail-Drop",
+ "Max_Q_Size": "auto",
+ "Discard_Config": {
+ "Min_Threshold": 0,
+ "Max_Threshold": 0,
+ "Max_Probability": 0
+ }
+ },
+ {
+ "pbit_map": "0b11000000",
+ "AES_Encryption": "TRUE",
+ "Scheduling_Policy": "Strict-Priority",
+ "Priority_Q": 1,
+ "Weight": 0,
+ "Discard_Policy": "Tail-Drop",
+ "Max_Q_Size": "auto",
+ "Discard_Config": {
+ "Min_Threshold": 0,
+ "Max_Threshold": 0,
+ "Max_Probability": 0
+ }
+ }
+ ]
+ }
diff --git a/tosca-configs/att-workflow/onlab-pod1-shad.yaml b/tosca-configs/att-workflow/onlab-pod1-shad.yaml
deleted file mode 100755
index ebf19ae..0000000
--- a/tosca-configs/att-workflow/onlab-pod1-shad.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-shad.yaml http://10.90.0.101:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/oltdevice.yaml
- - custom_types/onudevice.yaml
- - custom_types/voltservice.yaml
- - custom_types/rcordsubscriber.yaml
- - custom_types/attworkflowdriverwhitelistentry.yaml
- - custom_types/attworkflowdriverservice.yaml
-description: Create a simulated OLT Device in VOLTHA
-topology_template:
- node_templates:
-
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- name: volt
- must-exist: true
-
- # OLT ------------------------------------------------
- olt_device:
- type: tosca.nodes.OLTDevice
- properties:
- name: SHAD OLT
- device_type: openolt
- host: 10.90.0.122
- port: 9191
- switch_datapath_id: of:0000000000000001
- switch_port: "2"
- outer_tpid: "0x8100"
- uplink: "65536"
- nas_id: "NAS_ID"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
- # Whitelist ------------------------------------------------
- service#att:
- type: tosca.nodes.AttWorkflowDriverService
- properties:
- name: att-workflow-driver
- must-exist: true
-
- ALPHe3d1cfe3:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ALPHe3d1cfe3
- pon_port_id: 536870912
- device_id: of:000000000a5a0097
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- ISKT71E80080:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ISKT71E80080
- pon_port_id: 536870912
- device_id: of:000000000a5a0097
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- # Subscriber ------------------------------------------------
- shad_1:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ALPHe3d1cfe3
- status: pre-provisioned
- c_tag: 115
- s_tag: 222
- onu_device: ALPHe3d1cfe3
- nas_port_id : "PON 1/1/03/1:1.1.1"
- circuit_id: foo1
- remote_id: bar1
-
- shad_2:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ISKT71E80080
- status: pre-provisioned
- c_tag: 222
- s_tag: 222
- onu_device: ISKT71e80080
- nas_port_id : "PON 1/1/04/1:1.1.1"
- circuit_id: foo2
- remote_id: bar2
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 6b03150..dc8e23c 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -24,11 +24,15 @@
topology_template:
node_templates:
- default_bp:
+ high_speed_bp:
type: tosca.nodes.BandwidthProfile
properties:
- name: Default
- must-exist: true
+ air: 2000
+ cbs: 2000
+ cir: 2000
+ ebs: 2000
+ eir: 2000
+ name: Bronze
# Pre-provision the subscriber the subscriber
onf_subscriber_1:
@@ -44,10 +48,10 @@
remote_id: bar1
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
onf_subscriber_2:
@@ -63,10 +67,10 @@
remote_id: bar2
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
onf_subscriber_3:
@@ -82,8 +86,8 @@
remote_id: bar3
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