aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/device/ip4
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2020-02-21 22:09:02 +0000
committerPeter Mikus <pmikus@cisco.com>2020-04-06 08:27:39 +0000
commit14a71b74b414df7616ccb5ada3d50ecb90d96bae (patch)
treebfee617c9a4b20ce4c6467ffbbe6c0a15199ba52 /tests/vpp/device/ip4
parent8e601d0f37f715ca4ce55dded8bc27cadfe175c2 (diff)
Improve pf layer
+ Merge single/double link + Introduce _pf{n}[0] variables so we can access physical function same way as virtual function + Cleanup code by moving complex logic to python + Prepare code for multiple vf functions Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: Ic2e74a38bfa146441357de8f0916aeb638941c49
Diffstat (limited to 'tests/vpp/device/ip4')
-rw-r--r--tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot12
-rw-r--r--tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot12
-rw-r--r--tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot10
-rw-r--r--tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot7
-rw-r--r--tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot8
5 files changed, 30 insertions, 19 deletions
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
index 8193bf308c..08247008a6 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
@@ -19,7 +19,7 @@
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4-ip4base-copblklistbase
|
-| Suite Setup | Setup suite single link | scapy
+| Suite Setup | Setup suite topology interfaces | scapy
| Test Setup | Setup test
| Test Teardown | Tear down test | packet_trace
|
@@ -45,6 +45,8 @@
| ${nic_driver}= | vfio-pci
| ${nic_rxq_size}= | 0
| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
| ${overhead}= | ${0}
*** Keywords ***
@@ -71,12 +73,12 @@
| | And Initialize IPv4 forwarding in circular topology
| | And Add Fib Table | ${dut1} | 1
| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable
| | Then Packet transmission from port to port should fail
| | ... | ${tg} | 100.0.0.2 | 200.0.0.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
+| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
*** Test Cases ***
| tc01-64B-ethip4-ip4base-copblklistbase-dev
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
index 845434c1e5..2482883d77 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
@@ -19,7 +19,7 @@
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4-ip4base-copwhtlistbase
|
-| Suite Setup | Setup suite single link | scapy
+| Suite Setup | Setup suite topology interfaces | scapy
| Test Setup | Setup test
| Test Teardown | Tear down test | packet_trace
|
@@ -45,6 +45,8 @@
| ${nic_driver}= | vfio-pci
| ${nic_rxq_size}= | 0
| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
| ${overhead}= | ${0}
*** Keywords ***
@@ -71,12 +73,12 @@
| | And Initialize IPv4 forwarding in circular topology
| | And Add Fib Table | ${dut1} | 1
| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable
| | Then Send packet and verify headers
| | ... | ${tg} | 10.10.10.2 | 20.20.20.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
+| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
*** Test Cases ***
| tc01-64B-ethip4-ip4base-copwhtlistbase-dev
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
index 8691128a69..ba9235f7ae 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
@@ -19,7 +19,7 @@
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4-ip4base-iacldstbase
|
-| Suite Setup | Setup suite single link | scapy
+| Suite Setup | Setup suite topology interfaces | scapy
| Test Setup | Setup test
| Test Teardown | Tear down test | packet_trace | classify
|
@@ -45,6 +45,8 @@
| ${nic_driver}= | vfio-pci
| ${nic_rxq_size}= | 0
| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
| ${overhead}= | ${0}
*** Keywords ***
@@ -76,11 +78,11 @@
| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst
| | ... | 20.20.20.2
| | And Vpp Enable Input Acl Interface
-| | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ip4 | ${table_idx}
| | Then Send packet and verify headers
| | ... | ${tg} | 10.10.10.2 | 20.20.20.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
+| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
*** Test Cases ***
| tc01-64B-ethip4-ip4base-iacldstbase-dev
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
index f7ad91be66..13665cd9a2 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
@@ -19,7 +19,7 @@
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4-ip4base-ipolicemarkbase
|
-| Suite Setup | Setup suite single link | scapy
+| Suite Setup | Setup suite topology interfaces | scapy
| Test Setup | Setup test
| Test Teardown | Tear down test | packet_trace | classify
|
@@ -44,6 +44,8 @@
| ${nic_driver}= | vfio-pci
| ${nic_rxq_size}= | 0
| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
| ${overhead}= | ${0}
| ${cir}= | ${100}
| ${eir}= | ${150}
@@ -78,7 +80,8 @@
| | And Initialize IPv4 forwarding in circular topology
| | And Initialize IPv4 policer 2r3c-'ca' in circular topology
| | Then Send packet and verify marking
-| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac}
+| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
+| | ... | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
| | ... | 10.10.10.2 | 20.20.20.2
*** Test Cases ***
diff --git a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
index dbfb1dfe6e..7105b28fa0 100644
--- a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
@@ -19,7 +19,7 @@
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethipv4-ip4base
|
-| Suite Setup | Setup suite single link | scapy
+| Suite Setup | Setup suite topology interfaces | scapy
| Test Setup | Setup test
| Test Teardown | Tear down test | packet_trace
|
@@ -45,6 +45,8 @@
| ${nic_driver}= | vfio-pci
| ${nic_rxq_size}= | 0
| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
| ${overhead}= | ${0}
*** Keywords ***
@@ -72,8 +74,8 @@
| | ... | remote_host1_ip=192.168.0.1 | remote_host2_ip=192.168.0.2
| | Then Send packet and verify headers
| | ... | ${tg} | 192.168.0.1 | 192.168.0.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
+| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
*** Test Cases ***
| tc01-64B-ethipv4-ip4base-dev