Verify that 2 RG which are connected to the different ONU on the different PON Port could join the same channel

Change-Id: I3e6aa82bc70a47cc11bb1a3d977c139273046d69
diff --git a/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml b/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
index a394ee4..770e174 100644
--- a/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
+++ b/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
@@ -21,9 +21,7 @@
     -
       onu_1: 'ALPHe3d1cea3'
       onu_2: 'ALPHe3d1ceb7'
-  pon_1:
-    -
-      onu_1: 'ALPHe3d1cfa7'
+      onu_3: 'ALPHe3d1cfa7'
 
 multicast_ip_addresses:
   -
diff --git a/tests/tt-workflow/Voltha_TT_MulticastTests.robot b/tests/tt-workflow/Voltha_TT_MulticastTests.robot
index 81b5eee..e84db00 100644
--- a/tests/tt-workflow/Voltha_TT_MulticastTests.robot
+++ b/tests/tt-workflow/Voltha_TT_MulticastTests.robot
@@ -76,7 +76,6 @@
     ${test_onu2_uni}=    Set Variable    2
     ${channel_ip_list}=    Set Variable    ${multicast_ip_addresses[0]}
     ${channel_ip_1}=    Set Variable    ${channel_ip_list['channel_1']}
-    ${channel_ip_2}=    Set Variable    ${channel_ip_list['channel_2']}
     ${matched}    ${src_onu1}    ${dst_onu1}=    Get ONU details with Given Sn and Service and UNI    ${test_onu1_sn}    mcast
     ...    ${test_onu1_uni}
     ${matched}    ${src_onu2}    ${dst_onu2}=    Get ONU details with Given Sn and Service and UNI    ${test_onu2_sn}    mcast
@@ -105,6 +104,28 @@
     Wait Until Keyword Succeeds    ${timeout}    15    TT 2 RG MCAST Test    ${src_onu1}    ${dst_onu1}
     ...    ${channel_ip_1}    ${src_onu2}    ${dst_onu2}    ${channel_ip_2}
 
+2 RG Different PON Different ONU Same Channel Multicast Test
+    [Documentation]    Verify that 2 RG which are connected to the different ONUs
+    ...    on the different PON Ports could join the same channel.
+    [Tags]    functionalTT    2RGDifferentOnuandPonSameChannel    multicastTT   notready
+    [Setup]    Start Logging    2RGDifferentOnuandPonSameChannel
+    [Teardown]    Run Keywords    Collect Logs
+    ...           AND             Stop Logging    2RGDifferentOnuandPonSameChannel
+    ${test_onus_pon0}=    Set Variable    ${multicast_test_onu_pon_locations.pon_0[0]}
+    ${test_onus_pon1}=    Set Variable    ${multicast_test_onu_pon_locations.pon_1[0]}
+    ${test_onu1_sn}=    Set Variable    ${test_onus_pon0['onu_1']}
+    ${test_onu1_uni}=    Set Variable    1
+    ${test_onu2_sn}=    Set Variable    ${test_onus_pon1['onu_1']}
+    ${test_onu2_uni}=    Set Variable    1
+    ${channel_ip_list}=    Set Variable    ${multicast_ip_addresses[0]}
+    ${channel_ip_1}=    Set Variable    ${channel_ip_list['channel_1']}
+    ${matched}    ${src_onu1}    ${dst_onu1}=    Get ONU details with Given Sn and Service and UNI    ${test_onu1_sn}    mcast
+    ...    ${test_onu1_uni}
+    ${matched}    ${src_onu2}    ${dst_onu2}=    Get ONU details with Given Sn and Service and UNI    ${test_onu2_sn}    mcast
+    ...    $${test_onu2_uni}
+    Wait Until Keyword Succeeds    ${timeout}    15    TT 2 RG MCAST Test    ${src_onu1}    ${dst_onu1}
+    ...    ${channel_ip_1}    ${src_onu2}    ${dst_onu2}    ${channel_ip_1}
+
 *** Keywords ***
 Get ONU details with Given Sn and Service and UNI
     [Documentation]    This keyword finds the ONU details (as required for multicast test)