Merge "updating deployment configs to use new dictionaries for src/dst hosts"
diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
index b2ef07f..3fa7130 100644
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha-master.yaml
@@ -48,17 +48,24 @@
hosts:
src:
- ip: '10.192.20.61'
- user: 'cord'
- pass: 'cord'
- dp_iface_name: 'ens2f1'
- dp_iface_ip: '10.8.2.1'
- dp_iface_gateway: '10.8.2.254'
+ -
+ ip: '10.192.20.61'
+ user: 'cord'
+ pass: 'cord'
+ dp_iface_name: 'ens2f1'
+ container_type: ''
+ container_name: ''
+ onu: 'ALPHe3d1cfa7'
+
dst:
- ip: '10.192.20.198'
- user: 'cord'
- pass: 'cord'
- dp_iface_name: 'ens3d1'
- dp_iface_ip_qinq: '10.8.2.100'
- dp_iface_ip: '10.8.3.1'
- dp_iface_gateway: '10.8.3.254'
+ -
+ ip: '10.192.20.198'
+ user: 'cord'
+ pass: 'cord'
+ dp_iface_name: 'ens3d1'
+ dp_iface_ip_qinq: '10.8.2.100'
+ dp_iface_ip: '10.8.3.1'
+ dp_iface_gateway: '10.8.3.254'
+ dp_iface_ip_qinq: '8.8.8.8'
+ container_type: null
+ container_name: null
\ No newline at end of file
diff --git a/deployment-configs/onlab-pod1-qa.yaml b/deployment-configs/onlab-pod1-qa.yaml
index 4eece97..d26ba69 100644
--- a/deployment-configs/onlab-pod1-qa.yaml
+++ b/deployment-configs/onlab-pod1-qa.yaml
@@ -61,10 +61,63 @@
hosts:
src:
- ip: '10.90.0.51'
- user: 'ubuntu'
- dp_iface_name: 'eth1'
- container_type: 'LXC'
- container_name: 'ALPHe3d1cfde'
+ -
+ ip: '10.90.0.51'
+ user: 'ubuntu'
+ pass: null
+ dp_iface_name: 'eth1'
+ container_type: 'LXC'
+ container_name: 'ALPHe3d1cfde'
+ onu: 'ALPHe3d1cfde'
+
+ -
+ ip: '10.90.0.51'
+ user: 'ubuntu'
+ pass: null
+ dp_iface_name: 'eth1'
+ container_type: 'LXC'
+ container_name: 'ISKT71e801a0'
+ onu: 'ISKT71e801a0'
+ -
+ ip: '10.90.0.51'
+ user: 'ubuntu'
+ pass: null
+ dp_iface_name: 'eth1'
+ container_type: 'LXC'
+ container_name: 'BRCM22222222'
+ onu: 'BRCM22222222'
+
dst:
- dp_iface_ip_qinq: '8.8.8.8'
+ -
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip_qinq: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ dp_iface_ip_qinq: '8.8.8.8'
+ container_type: null
+ container_name: null
+ -
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip_qinq: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ dp_iface_ip_qinq: '8.8.8.8'
+ container_type: null
+ container_name: null
+ -
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip_qinq: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ dp_iface_ip_qinq: '8.8.8.8'
+ container_type: null
+ container_name: null
\ No newline at end of file
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 4eece97..37306d2 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -67,4 +67,4 @@
container_type: 'LXC'
container_name: 'ALPHe3d1cfde'
dst:
- dp_iface_ip_qinq: '8.8.8.8'
+ dp_iface_ip_qinq: '8.8.8.8'
\ No newline at end of file
diff --git a/deployment-configs/onlab-pod2.yaml b/deployment-configs/onlab-pod2.yaml
index ed923bd..c4dbc76 100644
--- a/deployment-configs/onlab-pod2.yaml
+++ b/deployment-configs/onlab-pod2.yaml
@@ -57,4 +57,4 @@
container_type: 'LXC'
container_name: 'ALPHe3d1cfe3'
dst:
- dp_iface_ip_qinq: '8.8.8.8'
+ dp_iface_ip_qinq: '8.8.8.8'
\ No newline at end of file