diff options
| author |   Miroslav Miklus <mmiklus@cisco.com> | 2016-05-08 14:11:51 +0200 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2016-06-28 00:15:03 +0000 |
| commit | cbd47fbe97945e9dc6584d08cd2266e3a7536a68 (patch) | |
| tree | 9344a863606381b2ce8069d82f0731440c31b295 /tests/suites | |
| parent | 1689b0781206d874fd2b664cdd7d770f1e3932c8 (diff) | |
Use interface key instead of interface name.
JIRA: CSIT-141
Change-Id: I75cef6d570ab45ea9c4af838b6bf68cefc7c1a91
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'tests/suites')
| -rw-r--r-- | tests/suites/fds_related_tests/provider_network.robot | 7 | ||||
| -rw-r--r-- | tests/suites/vxlan/vxlan_bd_untagged.robot | 6 | ||||
| -rw-r--r-- | tests/suites/vxlan/vxlan_xconnect_untagged.robot | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/tests/suites/fds_related_tests/provider_network.robot b/tests/suites/fds_related_tests/provider_network.robot index eb7ed2cb39..db0f9a1e5d 100644 --- a/tests/suites/fds_related_tests/provider_network.robot +++ b/tests/suites/fds_related_tests/provider_network.robot @@ -159,10 +159,11 @@ | | [Arguments] | ${dut_node} | ${interface} | @{vhosts} | | Bridge domain on DUT node is created | ${dut_node} | ${bid_b} | learn=${TRUE} | | Bridge domain on DUT node is created | ${dut_node} | ${bid_r} | learn=${TRUE} +| | ${interface_name}= | Get interface name | ${dut_node} | ${interface} | | ${vlan1_name} | ${vlan1_index}= | Create Vlan Subinterface -| | ... | ${dut_node} | ${interface} | ${vlan_blue} +| | ... | ${dut_node} | ${interface_name} | ${vlan_blue} | | ${vlan2_name} | ${vlan2_index}= | Create Vlan Subinterface -| | ... | ${dut_node} | ${interface} | ${vlan_red} +| | ... | ${dut_node} | ${interface_name} | ${vlan_red} | | L2 Tag Rewrite | ${dut_node} | @{vhosts}[0] | push-1 | ${vlan_blue} | | L2 Tag Rewrite | ${dut_node} | @{vhosts}[1] | push-1 | ${vlan_blue} | | L2 Tag Rewrite | ${dut_node} | @{vhosts}[2] | push-1 | ${vlan_red} @@ -332,4 +333,4 @@ | | ... | ${namespace4} | | Run keyword and expect error | Ping Not Successful | | ... | Send Ping From Node To Dst | ${qemu_node2} | ${dut1_blue2} -| | ... | ${namespace4}
\ No newline at end of file +| | ... | ${namespace4} diff --git a/tests/suites/vxlan/vxlan_bd_untagged.robot b/tests/suites/vxlan/vxlan_bd_untagged.robot index ec857adb38..7fd6caeea8 100644 --- a/tests/suites/vxlan/vxlan_bd_untagged.robot +++ b/tests/suites/vxlan/vxlan_bd_untagged.robot @@ -69,8 +69,10 @@ | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2} | ${NONE} -| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} +| | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} +| | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} +| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} | | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} diff --git a/tests/suites/vxlan/vxlan_xconnect_untagged.robot b/tests/suites/vxlan/vxlan_xconnect_untagged.robot index a4aa0610cf..05a11db9c8 100644 --- a/tests/suites/vxlan/vxlan_xconnect_untagged.robot +++ b/tests/suites/vxlan/vxlan_xconnect_untagged.robot @@ -51,8 +51,10 @@ | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2} | ${NONE} -| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} +| | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} +| | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} +| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} | | And Interfaces are added to xconnect | ${dut1_node} |