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

5 files changed, 30 insertions, 19 deletions

diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
index 3867260c65..b06cfab70b 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
@@ -19,7 +19,7 @@
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6-ip6base-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 IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${True}
 | | And Vpp Route Add | ${dut1} | 2002:1::0 | 64 | vrf=1 | local=${True}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable
 | | Then Packet transmission from port to port should fail
 | | ... | ${tg} | 2002:1::2 | 2002:2::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-78B-ethip6-ip6base-copblklistbase-dev
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
index e76070931b..3cc3dfa47e 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
@@ -19,7 +19,7 @@
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6-ip6base-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 IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
 | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable
 | | Then Send packet and verify headers
 | | ... | ${tg} | 2001:1::2 | 2001:2::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-78B-ethip6-ip6base-copwhtlistbase-dev
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
index a913591296..7ef550aa99 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
@@ -19,7 +19,7 @@
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6-ip6base-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} | ip6 | dst
 | | ... | 2001:2::2
 | | And Vpp Enable Input Acl Interface
-| | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ip6 | ${table_idx}
 | | Then Send packet and verify headers
 | | ... | ${tg} | 2001:1::2 | 2001:2::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-78B-ethip6-ip6base-iacldstbase-dev
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
index a55b8862e9..af8eb75489 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
@@ -19,7 +19,7 @@
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6-ip6base-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}
@@ -75,7 +77,8 @@
 | | And Initialize IPv6 forwarding in circular topology
 | | And Initialize IPv6 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_${int}1_mac}[0]
 | | ... | 2001:1::2 | 2001:2::2
 
 *** Test Cases ***
diff --git a/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
index 8871701e11..14790ff3e0 100644
--- a/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
@@ -19,7 +19,7 @@
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethipv6-ip6base
 |
-| 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=3ffe:5f::1 | remote_host2_ip=3ffe:5f::2
 | | Then Send packet and verify headers
 | | ... | ${tg} | 3ffe:5f::1 | 3ffe:5f::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-78B-ethipv6-ip6base-dev