X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fl2%2Fl2_bridge_domain.robot;fp=resources%2Flibraries%2Frobot%2Fl2%2Fl2_bridge_domain.robot;h=543c01c3baa5986d6902512eebbeef3c1f9f0a8a;hp=bb533e3e0582d373ecc7f24aa7ce4d0cef28d91f;hb=1be82a8542da6764f4ec8562cbcece0c65c8173a;hpb=b9aabb97bb10297ce004f731b7b61b9dc9c83ee6

diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index bb533e3e05..543c01c3ba 100644
--- a/resources/libraries/robot/l2/l2_bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -100,6 +100,8 @@
 | | ... | - dut - DUT node. Type: string
 | | ... | - nf_chain - NF chain. Type: integer
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Note:*
 | | ... | Socket paths for VM are defined in following format:
@@ -112,6 +114,7 @@
 | | ... | \| 1 \| 1 \|
 | |
 | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain}
 | | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain}
@@ -127,6 +130,7 @@
 | | | ... | ${nodes['${dut}']}
 | | | ... | /var/run/vpp/sock-${qemu_id}-1 | /var/run/vpp/sock-${qemu_id}-2
 | | | ... | ${dut}-vhost-${qemu_id}-if1 | ${dut}-vhost-${qemu_id}-if2
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | | ${bd_id1}= | Evaluate | ${qemu_id} + (${nf_chain} - 1)
 | | | ${bd_id2}= | Evaluate | ${bd_id1} + 1
 | | | Add interface to bridge domain
@@ -145,16 +149,20 @@
 | | ... | *Arguments:*
 | | ... | - nf_chain - NF chain. Type: integer
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
 | | ... | \| Initialize L2 bridge domains with Vhost-User \| 1 \| 1 \|
 | |
 | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | FOR | ${dut} | IN | @{duts}
 | | | Initialize L2 bridge domains with Vhost-User on node
 | | | ... | ${dut} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | END
 
 | Initialize L2 bridge domains for multiple chains with Vhost-User
@@ -170,6 +178,8 @@
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
 | | ... | - start - Id of first chain, allows to add chains during test.
 | | ... |     Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -177,11 +187,13 @@
 | | ... | \| 3 \| 1 \| 2 \|
 | |
 | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${start}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | Set interfaces in path up
 | | FOR | ${nf_chain} | IN RANGE | ${start} | ${nf_chains} + 1
 | | | Initialize L2 bridge domains with Vhost-User
 | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | END
 
 | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
@@ -281,13 +293,15 @@
 | | ... | *Arguments:*
 | | ... | - bd_id1 - Bridge domain ID. Type: integer
 | | ... | - bd_id2 - Bridge domain ID. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
 | | ... | \| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a\
 | | ... | 3-node circular topology \| 1 \| 2 \|
 | |
-| | [Arguments] | ${bd_id1} | ${bd_id2}
+| | [Arguments] | ${bd_id1} | ${bd_id2} | ${virtio_feature_mask}=${None}
 | |
 | | VPP Interface Set IP Address
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | 172.16.0.1 | 24
@@ -300,6 +314,7 @@
 | | ... | ${dut2} | 24 | 172.16.0.2 | 172.16.0.1
 | | Configure vhost interfaces | ${dut1}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -310,6 +325,7 @@
 | | ... | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
 | | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
 | | Add interface to bridge domain
@@ -387,6 +403,8 @@
 | | ... | - bd_id2 - Bridge domain ID. Type: integer
 | | ... | - subid - ID of the sub-interface to be created. Type: string
 | | ... | - tag_rewrite - Method of tag rewrite. Type: string
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -394,6 +412,7 @@
 | | ... | topology \| 1 \| 2 \| 10 \| pop-1 \|
 | |
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Variable Should Exist | ${dut2}
@@ -414,6 +433,7 @@
 | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite}
 | | Configure vhost interfaces | ${dut1}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -425,6 +445,7 @@
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Add interface to bridge domain | ${dut2} | ${subif_index_2}
 | | ... | ${bd_id1}
@@ -454,6 +475,8 @@
 | | ... | - tag_rewrite - Method of tag rewrite. Type: string
 | | ... | - bond_mode - Link bonding mode. Type: string
 | | ... | - lb_mode - Load balance mode. Type: string
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -462,7 +485,7 @@
 | | ... | \| 10 \| pop-1 \| xor \| l34 \|
 | |
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | ... | ${bond_mode} | ${lb_mode}
+| | ... | ${bond_mode} | ${lb_mode} | ${virtio_feature_mask}=${None}
 | |
 | | Set interfaces in path up
 | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface
@@ -494,6 +517,7 @@
 | | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite}
 | | Configure vhost interfaces | ${dut1}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -504,6 +528,7 @@
 | | ... | ${dut1} | ${subif_index_1} | ${bd_id2}
 | | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut2} | ${subif_index_2} | ${bd_id1}
 | | Add interface to bridge domain