CSIT-1403 Implement multichain configuration for l2bd with memif/ip4.

Change-Id: Ia87156b2ba826eb0a9a93d756b9765c7373ca6ce
Signed-off-by: Peter Mikus <pmikus@cisco.com>

2 files changed, 84 insertions, 36 deletions

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 2edc11b4e5..5ade4fa037 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -991,8 +991,8 @@
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
-| | ${sock1}= | Set Variable | memif-DUT1_CNF1
-| | ${sock2}= | Set Variable | memif-DUT2_CNF1
+| | ${sock1}= | Set Variable | memif-DUT1_CNF
+| | ${sock2}= | Set Variable | memif-DUT2_CNF
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1}
 | | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq_count_int}
 | | ... | ${rxq_count_int}
@@ -2987,8 +2987,8 @@
 | | [Arguments] | ${dut} | ${count}
 | | ...
 | | :FOR | ${number} | IN RANGE | 1 | ${count}+1
-| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
-| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF
 | | | ${prev_index}= | Evaluate | ${number}-1
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
 | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
@@ -3024,39 +3024,41 @@
 | Initialize L2 Bridge Domain with memif pairs on DUT node
 | | [Documentation]
 | | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface
-| | ... | to separate L2 bridge domain with one physical or virtual interface
+| | ... | to separate L2 bridge domain with one physical or memif interface
 | | ... | to create a chain accross DUT node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: dictionary
-| | ... | - count - Number of memif pairs (containers). Type: integer
+| | ... | - nf_chain - NF chain. Type: integer
+| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid}
+| | ... | - /tmp/memif-\${dut}_CNF\${nf_id}-\${sid}
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Initialize L2 Bridge Domain with memif pairs on DUT node \
-| | ... | \| ${dut} \| ${1} \|
+| | ... | \| ${dut} \| 1 \| 1 \|
 | | ...
-| | [Arguments] | ${dut} | ${count}
+| | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1}
 | | ...
-| | ${bd_id2}= | Evaluate | ${count}+1
+| | ${bd_id2}= | Evaluate | ${nf_nodes}+1
 | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1}
 | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if2}
 | | ... | ${bd_id2}
-| | :FOR | ${number} | IN RANGE | 1 | ${count}+1
-| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
-| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
+| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1
+| | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node}
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
-| | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
-| | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int}
-| | | ${bd_id2}= | Evaluate | ${number}+1
+| | | ... | ${sock1} | ${sock2} | ${nf_id} | ${dut}-memif-${nf_id}-if1
+| | | ... | ${dut}-memif-${nf_id}-if2 | ${rxq_count_int} | ${rxq_count_int}
+| | | ${bd_id2}= | Evaluate | ${nf_node}+1
 | | | Add interface to bridge domain | ${nodes['${dut}']}
-| | | ... | ${${dut}-memif-${number}-if1} | ${number}
+| | | ... | ${${dut}-memif-${nf_id}-if1} | ${nf_node}
 | | | Add interface to bridge domain | ${nodes['${dut}']}
-| | | ... | ${${dut}-memif-${number}-if2} | ${bd_id2}
+| | | ... | ${${dut}-memif-${nf_id}-if2} | ${bd_id2}
 
 | Initialize L2 Bridge Domain with memif pairs
 | | [Documentation]
@@ -3065,18 +3067,41 @@
 | | ... | virtual interface to create a chain accross DUT node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - count - Number of memif pairs (containers). Type: integer
+| | ... | - nf_chain - NF chain. Type: integer
+| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Initialize L2 Bridge Domain with memif pairs \| ${1} \|
+| | ... | \| Initialize L2 Bridge Domain with memif pairs \| 1 \| 1 \|
 | | ...
-| | [Arguments] | ${count}=${1}
+| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1}
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut}
-| | | ... | ${count}
+| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+
+| Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | [Documentation]
+| | ... | Create pairs of Memif interfaces for defined number of NF chains
+| | ... | with defined number of NF nodes on all defined VPP nodes. Add each
+| | ... | Memif interface into L2 bridge domains with learning enabled
+| | ... | with physical inteface or Memif interface of another NF.
+| | ...
+| | ... | *Arguments:*
+| | ... | - nf_chains - Number of chains of NFs. Type: integer
+| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize L2 Bridge Domain for multiple chains with memif pairs \
+| | ... | \| 1 \| 1 \|
+| | ...
+| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1}
+| | ...
+| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1
+| | | Initialize L2 Bridge Domain with memif pairs | nf_chain=${nf_chain}
+| | | ... | nf_nodes=${nf_nodes}
 | | Set interfaces in path up
 | | Show Memif on all DUTs | ${nodes}
 
@@ -3119,8 +3144,8 @@
 | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite}
 | | ...
 | | ${number}= | Set Variable | ${1}
-| | ${sock1}= | Set Variable | memif-DUT1_CNF1
-| | ${sock2}= | Set Variable | memif-DUT1_CNF1
+| | ${sock1}= | Set Variable | memif-DUT1_CNF
+| | ${sock2}= | Set Variable | memif-DUT1_CNF
 | | ${memif_if1_name}= | Set Variable | DUT1-memif-${number}-if1
 | | ${memif_if2_name}= | Set Variable | DUT1-memif-${number}-if2
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock2}
@@ -3131,9 +3156,9 @@
 | | Add interface to bridge domain | ${dut1} | ${${memif_if2_name}} | ${bd_id2}
 | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
 | | ${sock1}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | memif-DUT2_CNF1
+| | ... | Set Variable | memif-DUT2_CNF
 | | ${sock2}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | memif-DUT2_CNF1
+| | ... | Set Variable | memif-DUT2_CNF
 | | ${memif_if1_name}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | DUT2-memif-${number}-if1
 | | ${memif_if2_name}= | Run Keyword If | '${dut2_status}' == 'PASS'
@@ -3235,8 +3260,8 @@
 | | ${fib_table_1}= | Evaluate | ${fib_table_1} - ${1}
 | | ${ip_base_start}= | Set Variable | ${31}
 | | :FOR | ${number} | IN RANGE | 1 | ${count+${1}}
-| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
-| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
 | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
 | | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int}
@@ -3323,7 +3348,7 @@
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | ${sock}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock}= | Set Variable | memif-${dut}_CNF
 | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock}
 | | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int}
 | | | ... | ${rxq_count_int}
@@ -3355,7 +3380,7 @@
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | ${sock}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock}= | Set Variable | memif-${dut}_CNF
 | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock}
 | | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int}
 | | | ... | ${rxq_count_int}
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 4078196372..a70742f448 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -36,7 +36,9 @@
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
 | | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
 | | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - 1st DUT interface towards TG.
 | | ... | - dut1_if2 - 2nd DUT interface towards TG.
@@ -57,9 +59,13 @@
 | | ${dut1_if1} | ${dut1}= | First Ingress Interface
 | | ${dut1_if2} | ${dut1}= | Last Egress Interface
 | | ${tg_if2} | ${tg}= | Last Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
@@ -75,8 +81,10 @@
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
-| | ... | - tg_if1 - TG interface towards DUT1.
-| | ... | - tg_if2 - TG interface towards DUT2.
+| | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
+| | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - DUT1 interface towards TG.
 | | ... | - dut1_if2 - DUT1 interface towards DUT2.
@@ -103,9 +111,13 @@
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
 | | ${tg_if2} | ${tg}= | Next Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
@@ -124,8 +136,10 @@
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
-| | ... | - tg_if1 - TG interface towards DUT1.
-| | ... | - tg_if2 - TG interface towards DUT2.
+| | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
+| | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - DUT1 interface towards TG.
 | | ... | - dut1_if2_1 - DUT1 interface 1 towards DUT2.
@@ -168,10 +182,14 @@
 | | ${dut1_if2_2} | ${dut1}= | Last Interface
 | | ${dut2_if1_1} | ${dut2}= | First Ingress Interface
 | | ${dut2_if1_2} | ${dut2}= | Last Egress Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | # Set suite variables
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2_1}
@@ -621,18 +639,23 @@
 | | ... | *Arguments:*
 | | ... | - chains: Total number of chains. Type: integer
 | | ... | - nodeness: Total number of nodes per chain. Type: integer
+| | ... | - auto_scale - If True, use same amount of Dataplane threads for
+| | ... |   network function as DUT, otherwise use single physical core for
+| | ... |   every network function. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Set up performance test with containers \| 1 \| 1 \|
 | | ...
-| | [Arguments] | ${chains}=${1} | ${nodeness}=${1}
+| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True}
 | | ...
 | | Set Test Variable | @{container_groups} | @{EMPTY}
 | | Set Test Variable | ${container_group} | CNF
+| | Set Test Variable | ${nf_nodes}
 | | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
 | | ... | engine=${container_engine} | WITH NAME | ${container_group}
-| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
+| | Construct chains of containers on all DUTs | ${nf_chains} | ${nf_nodes}
+| | ... | auto_scale=${auto_scale}
 | | Acquire all '${container_group}' containers
 | | Create all '${container_group}' containers
 | | Configure VPP in all '${container_group}' containers