Merge "[VOL-3415] Configuration to allow AGG switch to connect to all ONOS instaces"
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 38cb23d..24d333a 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -67,28 +67,7 @@
olt: EC1912001818
c_tag: 7
s_tag: 31
- -
- ip: 10.90.0.51
- user: ubuntu
- pass: null
- dp_iface_name: eth1.7
- container_type: LXC
- container_name: SCOM00001c8d
- onu: SCOM00001c8d
- olt: EC1912001818
- c_tag: 7
- s_tag: 32
- -
- ip: 10.90.0.51
- user: ubuntu
- pass: null
- dp_iface_name: eth1.7
- container_type: LXC
- container_name: SCOM00001c7f
- onu: SCOM00001c7f
- olt: EC1912001818
- c_tag: 7
- s_tag: 33
+ onu_type: 'scom'
dst:
-
@@ -98,36 +77,9 @@
noroot_ip: '10.128.100.70'
noroot_user: cord
noroot_pass: cord
- dp_iface_name: enp3s0f0
+ dp_iface_name: ens6f0
dp_iface_ip_qinq: '10.31.7.254'
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
container_name: null
- -
- ip: null
- user: null
- pass: null
- noroot_ip: '10.128.100.70'
- noroot_user: cord
- noroot_pass: cord
- dp_iface_name: enp3s0f0
- dp_iface_ip_qinq: '10.32.7.254'
- dp_iface_ip: null
- dp_iface_gateway: null
- container_type: null
- container_name: null
- -
- ip: null
- user: null
- pass: null
- noroot_ip: '10.128.100.70'
- noroot_user: cord
- noroot_pass: cord
- dp_iface_name: enp3s0f0
- dp_iface_ip_qinq: '10.33.7.254'
- dp_iface_ip: null
- dp_iface_gateway: null
- container_type: null
- container_name: null
-
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
new file mode 100644
index 0000000..2c7244c
--- /dev/null
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -0,0 +1,100 @@
+# 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.
+
+# Automated deployment configuration for menlo-soak-pod
+
+---
+
+kube_config: '/home/cord/.kube/config'
+
+nodes:
+ -
+ ip: '10.128.90.90'
+ user: 'cord'
+ pass: 'cord'
+
+fabric_switches:
+ -
+ ip: '192.168.100.44'
+ user: 'root'
+ pass: 'onl'
+ bngPort: '31'
+ device_id: 'of:000000000000da7a'
+
+olts:
+ -
+ name: 'edgecore'
+ ip: '192.168.100.112'
+ sship: '192.168.100.112'
+ user: 'root'
+ pass: 'onl'
+ fortygig: 'true'
+ aggPort: '1'
+ serial: 'EC1721000208'
+ oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
+ oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
+
+onus:
+ -
+ serial: 'ALPHe3d1cf8e'
+ -
+ serial: 'ALPHe3d1cfe3'
+
+hosts:
+ src:
+ -
+ ip: '10.128.90.90'
+ user: 'cord'
+ pass: 'cord'
+ # dp_iface_name: 'ens6f0.11'
+ dp_iface_name: 'eth1.11'
+ container_type: 'LXC'
+ container_name: 'ALPHe3d1cf8e'
+ onu: 'ALPHe3d1cf8e'
+ olt: 'EC1721000208'
+ c_tag: '11'
+ s_tag: '222'
+ -
+ ip: '10.128.90.90'
+ user: 'cord'
+ pass: 'cord'
+ # dp_iface_name: 'ens6f1.12'
+ dp_iface_name: 'eth1.12'
+ container_type: 'LXC'
+ container_name: 'ALPHe3d1cfe3'
+ onu: 'ALPHe3d1cfe3'
+ olt: 'EC1721000208'
+ c_tag: '12'
+ s_tag: '111'
+ dst:
+ -
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip_qinq: '10.11.1.254'
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+ -
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip_qinq: '10.11.2.254'
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 17a2bbd..0c946f9 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -64,7 +64,7 @@
onu: 'ALPHe3d1cf8e'
olt: 'EC1721000208'
c_tag: '11'
- s_tag: '111'
+ s_tag: '222'
-
ip: '10.128.90.90'
user: 'cord'