Move RG inteface to LXC on flex pod as for some reason the IGMP Req
wont leave the physical interface in case the RG interface is not network isolated.
Also fix the dst_ip for ALPHe3d1ceb7  RG client for VoD service.

Change-Id: I340207cc9f49ff80fa4e120a3a9a7055b3c7c809
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 460128c..2ea8e50 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -63,9 +63,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.35'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '801'
@@ -77,9 +77,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.35'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '101'
@@ -91,9 +91,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.65'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '444'
@@ -105,9 +105,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.65'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '444'
@@ -119,9 +119,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -133,9 +133,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -147,9 +147,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -224,7 +224,7 @@
       user: null
       pass: null
       dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.6.254'
+      dp_iface_ip_qinq: '10.11.5.254'
       dp_iface_ip: null
       dp_iface_gateway: null
       container_type: null
diff --git a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
index 99ecf9e..27c2d09 100644
--- a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
@@ -63,9 +63,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.35'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '801'
@@ -77,9 +77,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.35'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '101'
@@ -91,9 +91,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.65'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '444'
@@ -105,9 +105,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.65'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '444'
@@ -119,9 +119,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -133,9 +133,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -147,9 +147,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.55'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '55'
@@ -224,7 +224,7 @@
       user: null
       pass: null
       dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.6.254'
+      dp_iface_ip_qinq: '10.11.5.254'
       dp_iface_ip: null
       dp_iface_gateway: null
       container_type: null
diff --git a/deployment-configs/flex-ocp-cord-openonupy.yaml b/deployment-configs/flex-ocp-cord-openonupy.yaml
index 6e64445..b7d88b2 100644
--- a/deployment-configs/flex-ocp-cord-openonupy.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy.yaml
@@ -63,9 +63,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '801'
@@ -76,9 +76,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '101'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 6e64445..b7d88b2 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -63,9 +63,9 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
       olt: 'EC1838000853'
       c_tag: '801'
@@ -76,9 +76,9 @@
       ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
       olt: 'EC1838000853'
       c_tag: '101'