aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2016-05-11 15:44:13 +0200
committerMatej Klotton <mklotton@cisco.com>2016-05-16 08:33:13 +0000
commitef93cbce8d23d85ade2ba6c446a7cf7b8da5bf1b (patch)
tree3b165de3a8bc34228eb3be703aa859c4ca763a44 /resources
parent8b4fad4fe84e123f4ffad7d2c5f96b7780c1bfaf (diff)
Update Honeycomb bridge domain tests
- fix interface assignment verification through VAT - add verification of split horizon group setting through VAT - clean up documentation of high level bridge domain keywords Change-Id: I7552494d68c6bbc86d3e5ddea4e29c6a7444d50c Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/robot/honeycomb/bridge_domain.robot30
1 files changed, 20 insertions, 10 deletions
diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot
index a3f695cf70..f84bcc3b2f 100644
--- a/resources/libraries/robot/honeycomb/bridge_domain.robot
+++ b/resources/libraries/robot/honeycomb/bridge_domain.robot
@@ -97,11 +97,14 @@
| | ... | - interface1, interface2 - names of interfaces to assign to bridge\
| | ... | domain. Type: string
| | ... | - bd_name - name of the bridge domain. Type: string
+| | ... | - settings - bridge domain specific interface settings.\
+| | ... | Type: dictionary
| | ...
| | ... | *Example:*
| | ...
| | ... | \| Honeycomb adds interfaces to bridge domain \| ${nodes['DUT1']} \
-| | ... | \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \| bd-04 \|
+| | ... | \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \| bd-04 \
+| | ... | \| ${{split_horizon_group:2, bvi:False}} \|
| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name}
| | ... | ${settings}
| | interfaceAPI.Add bridge domain to interface
@@ -118,12 +121,14 @@
| | ... | - interface1, interface2 - names of interfaces to assign to bridge\
| | ... | domain. Type: string
| | ... | - bd_name - name of the bridge domain. Type: string
+| | ... | - settings - bridge domain specific interface settings.\
+| | ... | Type: dictionary
| | ...
| | ... | *Example:*
| | ...
| | ... | \| Honeycomb should show interfaces assigned to bridge domain \
| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \
-| | ... | \| bd-04 \|
+| | ... | \| bd-04 \| ${{split_horizon_group:2, bvi:False}} \|
| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name}
| | ... | ${settings}
| | ${if1_data}= | interfaceAPI.Get interface oper data
@@ -142,24 +147,29 @@
| | ...
| | ... | *Arguments:*
| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface1, interface2 - names of interfaces to assign to bridge\
-| | ... | domain. Type: string
| | ... | - index - index of bridge domains on VPP node. Starts from 0,\
| | ... | new BDs reuse numbers after a bridge domain is removed. Type: int
+| | ... | - interface1, interface2 - names of interfaces to assign to bridge\
+| | ... | domain. Type: string
+| | ... | - settings - bridge domain specific interface settings.\
+| | ... | Type: dictionary
| | ...
| | ... | *Example:*
| | ...
| | ... | \| VAT should show interfaces assigned to bridge domain \
-| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \
-| | ... | \| ${4} \|
-| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${index}
+| | ... | \| ${nodes['DUT1']} \| ${4} \| GigabitEthernet0/8/0 \
+| | ... | \| GigabitEthernet0/9/0 \| ${{split_horizon_group:2, bvi:False}} \|
+| | [Arguments] | ${node} | ${index} | ${interface1} | ${interface2}
+| | ... | ${settings}
| | ${if1_index}= | Get interface sw index | ${node} | ${interface1}
| | ${if2_index}= | Get interface sw index | ${node} | ${interface2}
| | ${if_indices}= | Create list | ${if1_index} | ${if2_index}
| | ${bd_data}= | VPP get bridge domain data | ${node}
-| | ${bd_data}= | Set Variable | ${bd_data[${index}]}
-| | :FOR | ${sw_if_index} | IN | ${bd_data['sw_if']}
-| | | Should contain | ${if_indices} | ${sw_if_index}
+| | ${bd_interfaces}= | Set Variable | ${bd_data[${index}]['sw_if']}
+| | @{bd_interfaces}= | Create List | ${bd_interfaces[0]} | ${bd_interfaces[1]}
+| | :FOR | ${interface} | IN | @{bd_interfaces}
+| | | Should contain | ${if_indices} | ${interface['sw_if_index']}
+| | | Should be equal | ${interface['shg']} | ${settings['split_horizon_group']}
| Honeycomb removes all bridge domains
| | [Documentation] | Uses Honeycomb API to remove all bridge domains from the \