Merge "Revert "Temporarily use gateway IP for ping test on ONF pod""
diff --git a/deployment-configs/flex-pod1-olt.yaml b/deployment-configs/flex-pod1-olt.yaml
index a4f9afb..8956ba1 100644
--- a/deployment-configs/flex-pod1-olt.yaml
+++ b/deployment-configs/flex-pod1-olt.yaml
@@ -38,7 +38,7 @@
olts:
-
- ip: '10.192.4.218'
+ ip: '10.192.4.206'
user: 'root'
pass: 'onl'
fortygig: 'true'
diff --git a/kubernetes-configs/adtran-munich.yml b/kubernetes-configs/adtran-munich.yml
index 3e8bd4f..ca59efd 100644
--- a/kubernetes-configs/adtran-munich.yml
+++ b/kubernetes-configs/adtran-munich.yml
@@ -1,12 +1,27 @@
+---
# SEBA Values
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.2'
-netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.2'
-ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.2'
-vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.2'
-vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.2'
+images:
-onosImage: 'onosproject/onos:1.13.5'
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'berlin-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'berlin-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'berlin-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'berlin-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'berlin-1.0.2'
# synchronizers
att-workflow-driver:
diff --git a/kubernetes-configs/bbwf-att-workflow.yml b/kubernetes-configs/bbwf-att-workflow.yml
new file mode 100644
index 0000000..04a2616
--- /dev/null
+++ b/kubernetes-configs/bbwf-att-workflow.yml
@@ -0,0 +1,45 @@
+# synchronizers
+images:
+ tosca_loader:
+ repository: '192.168.100.1:30500/xosproject/tosca-loader'
+ tag: '1.1.3'
+
+att-workflow-driver:
+ image:
+ repository: 192.168.100.1:30500/xosproject/att-workflow-driver-synchronizer
+ tag: 'master'
+
+volt:
+ image:
+ repository: 192.168.100.1:30500/xosproject/volt-synchronizer
+ tag: 'candidate'
+
+rcord:
+ image:
+ repository: 192.168.100.1:30500/xosproject/rcord-synchronizer
+ tag: 1.0.4
+
+onos-service:
+ image:
+ repository: 192.168.100.1:30500/xosproject/onos-synchronizer
+ tag: 2.0.5
+
+fabric:
+ image:
+ repository: 192.168.100.1:30500/xosproject/fabric-synchronizer
+ tag: 2.1.3
+
+fabric-crossconnect:
+ image:
+ repository: 192.168.100.1:30500/xosproject/fabric-crossconnect-synchronizer
+ tag: 1.1.1
+
+kubernetes:
+ image:
+ repository: 192.168.100.1:30500/xosproject/kubernetes-synchronizer
+ tag: 1.0.4
+
+sadis-server:
+ image:
+ repository: '192.168.100.1:30500/opencord/sadis-server'
+ tag: 'latest'
\ No newline at end of file
diff --git a/kubernetes-configs/bbwf-base-kb8s.yml b/kubernetes-configs/bbwf-base-kb8s.yml
new file mode 100644
index 0000000..52390c3
--- /dev/null
+++ b/kubernetes-configs/bbwf-base-kb8s.yml
@@ -0,0 +1,8 @@
+kubernetes:
+ image:
+ repository: 192.168.100.1:30500/xosproject/kubernetes-synchronizer
+ tag: 1.0.4
+
+image:
+ repository: '192.168.100.1:30500/xosproject/tosca-loader'
+ tag: '1.1.3'
\ No newline at end of file
diff --git a/kubernetes-configs/bbwf-bbsim.yml b/kubernetes-configs/bbwf-bbsim.yml
new file mode 100644
index 0000000..64ebad4
--- /dev/null
+++ b/kubernetes-configs/bbwf-bbsim.yml
@@ -0,0 +1,4 @@
+image:
+ repository: '192.168.100.1:30500/voltha/voltha-bbsim'
+ tag: 'sleep'
+ pullPolicy: 'Always'
\ No newline at end of file
diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 849c578..53e56fc 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -1,86 +1,77 @@
+---
# SEBA Values
-envoyForEtcdImage: '192.168.100.1:30500/voltha/voltha-envoy:berlin-1.0.2'
-netconfImage: '192.168.100.1:30500/voltha/voltha-netconf:berlin-1.0.2'
-ofagentImage: '192.168.100.1:30500/voltha/voltha-ofagent:berlin-1.0.2'
-vcliImage: '192.168.100.1:30500/voltha/voltha-cli:berlin-1.0.2'
-vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:berlin-1.0.2'
+global:
+ registry: '192.168.100.1:30500/'
-onosImage: '192.168.100.1:30500/onosproject/onos:1.13.5'
+images:
+
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'berlin-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'berlin-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'berlin-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'berlin-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'dev'
# xos core
-images:
xos_core:
- repository: 192.168.100.1:30500/xosproject/xos-core
+ repository: xosproject/xos-core
tag: 2.1.9
+
xos_chameleon:
- repository: 192.168.100.1:30500/xosproject/chameleon
+ repository: xosproject/chameleon
tag: 2.1.9
+
xos_tosca:
- repository: 192.168.100.1:30500/xosproject/xos-tosca
+ repository: xosproject/xos-tosca
tag: 1.1.3
+
xos-gui:
images:
xos_gui:
- repository: 192.168.100.1:30500/xosproject/xos-gui
+ repository: xosproject/xos-gui
tag: 1.0.3
xos_ws:
- repository: 192.168.100.1:30500/xosproject/xos-ws
+ repository: xosproject/xos-ws
tag: 2.0.0
+
xos-db:
image:
- repository: '192.168.100.1:30500/postgres'
- tag: '10.3-alpine'
+ repository: 'postgres'
+ tag: '10.3-alpine'
-# synchronizers
-att-workflow-driver:
- image:
- repository: 192.168.100.1:30500/xosproject/att-workflow-driver-synchronizer
- tag: 'master'
-
-volt:
- image:
- repository: 192.168.100.1:30500/xosproject/volt-synchronizer
- tag: 'candidate'
-
-rcord:
- image:
- repository: 192.168.100.1:30500/xosproject/rcord-synchronizer
- tag: 1.0.4
-
-onos-service:
- image:
- repository: 192.168.100.1:30500/xosproject/onos-synchronizer
- tag: 2.0.5
-
-fabric:
- image:
- repository: 192.168.100.1:30500/xosproject/fabric-synchronizer
- tag: 2.1.3
-
-fabric-crossconnect:
- image:
- repository: 192.168.100.1:30500/xosproject/fabric-crossconnect-synchronizer
- tag: 1.1.1
-
-kubernetes:
- image:
- repository: 192.168.100.1:30500/xosproject/kubernetes-synchronizer
- tag: 1.0.4
-
-tosca_loaderImage: '192.168.100.1:30500/xosproject/tosca-loader:1.0.1'
+etcd-operator:
+ etcdCluster:
+ size: 1
# others
sadis-server:
image:
- repository: '192.168.100.1:30500/opencord/sadis-server'
+ repository: 'opencord/sadis-server'
tag: 'latest'
# kafka
-image: '192.168.100.1:30500/confluentinc/cp-kafka:4.1.2-2'
+image: '192.168.100.1:30500/confluentinc/cp-kafka'
+configurationOverrides:
+ "confluent.support.metrics.enable": false
zookeper:
- image: '192.168.100.1:30500/google_samples/k8szk:v3'
+ image:
+ reposiroty: '192.168.100.1:30500/google_samples/k8szk'
+ tag: v3
etcd-operator:
etcdOperator:
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index 7109170..47c9e51 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,26 +1,35 @@
+---
# SEBA Values
-# envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.2'
-# netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.2'
-# ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.2'
-# vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.2'
-# vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.2'
-
-envoyForEtcdImage: '192.168.99.181:30500/voltha/voltha-envoy:ams-1.0.2'
-netconfImage: '192.168.99.181:30500/voltha/voltha-netconf:ams-1.0.2'
-ofagentImage: '192.168.99.181:30500/voltha/voltha-ofagent:ams-1.0.2'
-vcliImage: '192.168.99.181:30500/voltha/voltha-cli:ams-1.0.2'
-vcoreImage: '192.168.99.181:30500/voltha/voltha-voltha:ams-1.0.2'
-httpBackendImage: '192.168.99.181:30500/google_containers/defaultbackend:1.4'
-ingressControllerImage: '192.168.99.181:30500/quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
-
-onosImage: '192.168.99.181:30500/onos/onos:ams-1.0.0'
-
global:
registry: '192.168.99.181:30500/'
-# xos
images:
+
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'ams-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'ams-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'ams-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'ams-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'ams-1.0.2'
+
+ onos:
+ tag: 'ams-1.0.0'
+
+# xos
xos_core:
tag: 2.1.4
xos_chameleon:
diff --git a/kubernetes-configs/flex-pod1-olt.yml b/kubernetes-configs/flex-pod1-olt.yml
index 13611f1..84e0687 100644
--- a/kubernetes-configs/flex-pod1-olt.yml
+++ b/kubernetes-configs/flex-pod1-olt.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,21 +17,3 @@
# This file is used to optionally customize helm charts installations
----
-
-# SEBA Values
-
-envoyForEtcdImage: 'voltha/voltha-envoy:latest'
-freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'voltha/voltha-netconf:latest'
-ofagentImage: 'voltha/voltha-ofagent:latest'
-vcliImage: 'voltha/voltha-cli:latest'
-vcoreImage: 'voltha/voltha-voltha:latest'
-
-onosImage: 'onosproject/onos:1.13.5'
-
-# application_logs: |
-# log4j.logger.org.opencord.olt = DEBUG
-# log4j.logger.org.opencord.kafka = DEBUG
-# log4j.logger.org.opencord.sadis = DEBUG
-# log4j.logger.org.opencord.aaa = DEBUG
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 6ad0b1b..c2f6c56 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,27 +1,46 @@
+---
# SEBA Values
-#envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.1'
-#netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.1'
-#ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.1'
-#vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.1'
-#vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.1'
+images:
+ envoy_for_etcd:
+ tag: 'latest'
-envoyForEtcdImage: 'voltha/voltha-envoy:latest'
-freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'voltha/voltha-netconf:latest'
-ofagentImage: 'voltha/voltha-ofagent:latest'
-vcliImage: 'voltha/voltha-cli:latest'
-vcoreImage: 'smbaker/voltha-voltha:latest'
+ netconf:
+ repository: 'smbaker/voltha-netconf'
+ tag: 'grpc'
+
+ ofagent:
+ repository: 'smbaker/voltha-ofagent'
+ tag: 'grpc'
+
+ vcli:
+ repository: 'smbaker/voltha-vcli'
+ tag: 'grpc'
+
+ vcore:
+ repository: 'smbaker/voltha-voltha'
+ tag: 'grpc'
+
+ onos:
+ tag: '1.13.5'
att-workflow-driver:
image:
- tag: 'master'
+ repository: 10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer
+ tag: candidate
-volt:
+rcord:
image:
- tag: 'master'
-
-onosImage: 'onosproject/onos:1.13.5'
+ repository: 10.90.0.101:30500/xosproject/rcord-synchronizer
+ tag: candidate
+fabric:
+ image:
+ repository: 10.90.0.101:30500/xosproject/fabric-synchronizer
+ tag: candidate
+vsg-hw:
+ image:
+ repository: 10.90.0.101:30500/xosproject/vsg-hw-synchronizer
+ tag: candidate
application_logs: |
log4j.logger.org.opencord.olt = TRACE
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 4cab9a3..a7a0720 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,6 +1,10 @@
+---
# SEBA Values
-vcoreImage: '10.90.0.120:30500/voltha/voltha-voltha:latest'
+images:
+ vcore:
+ repository: '10.90.0.120:30500/voltha/voltha-voltha'
+ tag: 'dev'
volt:
image:
@@ -11,7 +15,7 @@
image:
repository: '10.90.0.120:30500/voltha/voltha-bbsim'
- tag: 'stable'
+ tag: 'sleep'
application_logs: |
log4j.logger.org.opencord.olt = TRACE
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index c044477..e77f4a1 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -173,7 +173,7 @@
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
serial_number: ALPHe3d1cee9
- pon_port_id: 536870912
+ pon_port_id: 536870913
device_id: of:00000000c0a8646f
requirements:
- owner:
@@ -184,7 +184,7 @@
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
serial_number: ISKT71e81130
- pon_port_id: 536870912
+ pon_port_id: 536870913
device_id: of:00000000c0a8646f
requirements:
- owner:
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml b/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
index 9be0e5d..3064223 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
@@ -105,7 +105,7 @@
properties:
serial_number: ALPHe3d1cfa7
pon_port_id: 536870912
- device_id: of:000000000ac004da
+ device_id: of:000000000ac004ce
requirements:
- owner:
node: service#att
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
index 0a27c2b..a00311b 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
@@ -34,7 +34,7 @@
properties:
name: olt-1
device_type: openolt
- host: 10.192.4.218
+ host: 10.192.4.206
port: 9191
switch_datapath_id: of:0000cc37ab5b6da8
switch_port: "7"
diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
new file mode 100644
index 0000000..44c1d5d
--- /dev/null
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -0,0 +1,452 @@
+# 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-pod2-bbsim-16.yaml http://10.90.0.120: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/bngportmapping.yaml
+ - custom_types/attworkflowdriverwhitelistentry.yaml
+ - custom_types/attworkflowdriverservice.yaml
+ - custom_types/rcordsubscriber.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.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_device:
+ type: tosca.nodes.OLTDevice
+ properties:
+ name: BBSIM_OLT
+ device_type: bbsimolt
+ host: bbsim.voltha.svc
+ port: 50060
+ switch_datapath_id: of:0000000000000002
+ switch_port: "3"
+ outer_tpid: "0x8100"
+ uplink: "65536"
+ nas_id: "NAS_ID"
+ serial_number: "bbsim.voltha.svc:50060"
+ requirements:
+ - volt_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+
+ # DHCP L2 Relay config
+ onos_app#dhcpl2relay:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: dhcpl2relay
+ must-exist: true
+
+ dhcpl2relay-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+ value: >
+ {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#dhcpl2relay
+ relationship: tosca.relationships.BelongsToOne
+
+ # Whitelist
+ service#att:
+ type: tosca.nodes.AttWorkflowDriverService
+ properties:
+ name: att-workflow-driver
+ must-exist: true
+
+ BBSM00000100:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000100
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000101:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000101
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000102:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000102
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000103:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000103
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000104:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000104
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000105:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000105
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000106:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000106
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000107:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000107
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000108:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000108
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000109:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000109
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010a:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010a
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010b:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010b
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010c:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010c
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010d:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010d
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010e:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010e
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM0000010f:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM0000010f
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ # Pre-provision the subscriber
+ bbsim_subscriber_0:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000100
+ status: pre-provisioned
+ c_tag: 900
+ s_tag: 999
+ onu_device: BBSM00000100
+ circuit_id: circuit0
+ remote_id: remote0
+ nas_port_id: PON 2/1/01/1:1.1.0
+
+ bbsim_subscriber_1:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000101
+ status: pre-provisioned
+ c_tag: 901
+ s_tag: 999
+ onu_device: BBSM00000101
+ circuit_id: circuit1
+ remote_id: remote1
+ nas_port_id: PON 2/1/01/1:1.1.1
+
+ bbsim_subscriber_2:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000102
+ status: pre-provisioned
+ c_tag: 902
+ s_tag: 999
+ onu_device: BBSM00000102
+ circuit_id: circuit2
+ remote_id: remote2
+ nas_port_id: PON 2/1/01/1:1.1.2
+
+ bbsim_subscriber_3:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000103
+ status: pre-provisioned
+ c_tag: 903
+ s_tag: 999
+ onu_device: BBSM00000103
+ circuit_id: circuit3
+ remote_id: remote3
+ nas_port_id: PON 2/1/01/1:1.1.3
+
+ bbsim_subscriber_4:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000104
+ status: pre-provisioned
+ c_tag: 904
+ s_tag: 999
+ onu_device: BBSM00000104
+ circuit_id: circuit4
+ remote_id: remote4
+ nas_port_id: PON 2/1/01/1:1.1.4
+
+ bbsim_subscriber_5:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000105
+ status: pre-provisioned
+ c_tag: 905
+ s_tag: 999
+ onu_device: BBSM00000105
+ circuit_id: circuit5
+ remote_id: remote5
+ nas_port_id: PON 2/1/01/1:1.1.5
+
+ bbsim_subscriber_6:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000106
+ status: pre-provisioned
+ c_tag: 906
+ s_tag: 999
+ onu_device: BBSM00000106
+ circuit_id: circuit6
+ remote_id: remote6
+ nas_port_id: PON 2/1/01/1:1.1.6
+
+ bbsim_subscriber_7:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000107
+ status: pre-provisioned
+ c_tag: 907
+ s_tag: 999
+ onu_device: BBSM00000107
+ circuit_id: circuit7
+ remote_id: remote7
+ nas_port_id: PON 2/1/01/1:1.1.7
+
+ bbsim_subscriber_8:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000108
+ status: pre-provisioned
+ c_tag: 908
+ s_tag: 999
+ onu_device: BBSM00000108
+ circuit_id: circuit8
+ remote_id: remote8
+ nas_port_id: PON 2/1/01/1:1.1.8
+
+ bbsim_subscriber_9:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000109
+ status: pre-provisioned
+ c_tag: 909
+ s_tag: 999
+ onu_device: BBSM00000109
+ circuit_id: circuit9
+ remote_id: remote9
+ nas_port_id: PON 2/1/01/1:1.1.9
+
+ bbsim_subscriber_a:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010a
+ status: pre-provisioned
+ c_tag: 910
+ s_tag: 999
+ onu_device: BBSM0000010a
+ circuit_id: circuit10a
+ remote_id: remote10a
+ nas_port_id: PON 2/1/01/1:1.1.10a
+
+ bbsim_subscriber_b:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010b
+ status: pre-provisioned
+ c_tag: 911
+ s_tag: 999
+ onu_device: BBSM0000010b
+ circuit_id: circuit10b
+ remote_id: remote10b
+ nas_port_id: PON 2/1/01/1:1.1.10b
+
+ bbsim_subscriber_c:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010c
+ status: pre-provisioned
+ c_tag: 912
+ s_tag: 999
+ onu_device: BBSM0000010c
+ circuit_id: circuit10c
+ remote_id: remote10c
+ nas_port_id: PON 2/1/01/1:1.1.10c
+
+ bbsim_subscriber_d:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010d
+ status: pre-provisioned
+ c_tag: 913
+ s_tag: 999
+ onu_device: BBSM0000010d
+ circuit_id: circuit10d
+ remote_id: remote10d
+ nas_port_id: PON 2/1/01/1:1.1.10d
+
+ bbsim_subscriber_e:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010e
+ status: pre-provisioned
+ c_tag: 914
+ s_tag: 999
+ onu_device: BBSM0000010e
+ circuit_id: circuit10e
+ remote_id: remote10e
+ nas_port_id: PON 2/1/01/1:1.1.10e
+
+ bbsim_subscriber_f:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM0000010f
+ status: pre-provisioned
+ c_tag: 915
+ s_tag: 999
+ onu_device: BBSM0000010f
+ circuit_id: circuit10f
+ remote_id: remote10f
+ nas_port_id: PON 2/1/01/1:1.1.10f
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
new file mode 100644
index 0000000..b5dd3cf
--- /dev/null
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -0,0 +1,124 @@
+# 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-pod2-bbsim-2.yaml http://10.90.0.120: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/bngportmapping.yaml
+ - custom_types/attworkflowdriverwhitelistentry.yaml
+ - custom_types/attworkflowdriverservice.yaml
+ - custom_types/rcordsubscriber.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.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_device:
+ type: tosca.nodes.OLTDevice
+ properties:
+ name: BBSIM_OLT
+ device_type: bbsimolt
+ host: bbsim.voltha.svc
+ port: 50060
+ switch_datapath_id: of:0000000000000002
+ switch_port: "3"
+ outer_tpid: "0x8100"
+ uplink: "65536"
+ nas_id: "NAS_ID"
+ serial_number: "bbsim.voltha.svc:50060"
+ requirements:
+ - volt_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+
+ # link
+ onos_app#olt:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: olt
+ must-exist: true
+
+ olt-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/links
+ value: >
+ {
+ "of:0000000000000002/24-of:0000000000000012/65536": {
+ "basic": {}
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#olt
+ relationship: tosca.relationships.BelongsToOne
+
+ # Whitelist
+ service#att:
+ type: tosca.nodes.AttWorkflowDriverService
+ properties:
+ name: att-workflow-driver
+ must-exist: true
+
+ BBSM00000100:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000100
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ BBSM00000101:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: BBSM00000101
+ pon_port_id: 536870913
+ device_id: of:0000000000000012
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ # Pre-provision the subscriber
+ bbsim_subscriber_0:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000100
+ status: pre-provisioned
+ c_tag: 900
+ s_tag: 999
+ onu_device: BBSM00000100
+
+ bbsim_subscriber_1:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_BBSM00000101
+ status: pre-provisioned
+ c_tag: 901
+ s_tag: 999
+ onu_device: BBSM00000101
diff --git a/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
index 0a3057e..19e8d27 100755
--- a/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
@@ -35,7 +35,7 @@
properties:
name: olt-1
device_type: openolt
- host: 10.192.4.218
+ host: 10.192.4.206
port: 9191
switch_datapath_id: of:0000cc37ab5b6da8
switch_port: "7"
diff --git a/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
index 0a3057e..19e8d27 100755
--- a/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
@@ -35,7 +35,7 @@
properties:
name: olt-1
device_type: openolt
- host: 10.192.4.218
+ host: 10.192.4.206
port: 9191
switch_datapath_id: of:0000cc37ab5b6da8
switch_port: "7"