X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fsuites%2Fhoneycomb%2F1%20-%20interface_management.robot;h=ce5fa0492f70a97495e7fb6229a8b39d3cfcb841;hb=refs%2Fchanges%2F37%2F1137%2F7;hp=50eaa4edeb6db32a818486e13982baef0c5929eb;hpb=b19bcf36d9d9be1a771495547335fcfc7b3e446b;p=csit.git

diff --git a/tests/suites/honeycomb/1 - interface_management.robot b/tests/suites/honeycomb/1 - interface_management.robot
index 50eaa4edeb..ce5fa0492f 100644
--- a/tests/suites/honeycomb/1 - interface_management.robot	
+++ b/tests/suites/honeycomb/1 - interface_management.robot	
@@ -14,26 +14,24 @@
 *** Variables ***
 # Node and interface to run tests on.
 | ${node}= | ${nodes['DUT1']}
-| ${interface}= | ${node['interfaces'].values()[0]['name']}
+| ${interface}= | ${node['interfaces']['port1']['name']}
 # Configuration which will be set and verified during tests.
-| @{ipv4_address}= | 192.168.0.2 | 255.255.255.0
-| @{ipv4_neighbor}= | 192.168.0.3 | 08:00:27:c0:5d:37
-| &{ipv4_settings}= | enabled=${True} | forwarding=${True} | mtu=9000
-| @{ipv6_address}= | 10::10 | 64
+| @{ipv4_address_mask}= | 192.168.0.2 | 255.255.255.0
+| @{ipv4_address_prefix}= | 192.168.0.3 | ${16}
+| @{ipv4_neighbor}= | 192.168.0.4 | 08:00:27:c0:5d:37
+| &{ipv4_settings}= | enabled=${True} | forwarding=${True} | mtu=${9000}
+| @{ipv6_address}= | 10::10 | ${64}
 | @{ipv6_neighbor}= | 10::11 | 08:00:27:c0:5d:37
-| &{ipv6_settings}= | enabled=${True} | forwarding=${True} | mtu=9000
-| ... | dup-addr-detect-transmits=5
-| &{ethernet}= | mtu=9000
-| &{routing}= | vrf-id=27
-| &{vxlan_settings}= | src=10.0.1.20 | dst=10.0.3.20 | vni=1000
-| ... | encap-vrf-id=1000
+| &{ipv6_settings}= | enabled=${True} | forwarding=${True} | mtu=${9000}
+| ... | dup-addr-detect-transmits=${5}
+| &{ethernet}= | mtu=${9000}
+| &{routing}= | vrf-id=${27}
+| &{vxlan_settings}= | src=10.0.1.20 | dst=10.0.3.20 | vni=${1000}
+| ... | encap-vrf-id=${1000}
 
 *** Settings ***
 | Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
-| Suite Setup | Run keywords | Setup all DUTs before test | AND
-| ... | Setup Honeycomb service on DUTs | ${node}
 | Documentation | *Honeycomb interface management test suite.*
 | ...
 | ... | Test suite uses the first interface of the first DUT node.
@@ -57,13 +55,20 @@
 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4.
 | | [Tags] | honeycomb_sanity
 | | When Honeycomb sets interface ipv4 configuration
-| | ... | ${node} | ${interface} | @{ipv4_address} | @{ipv4_neighbor}
+| | ... | ${node} | ${interface} | @{ipv4_address_mask} | @{ipv4_neighbor}
 | | ... | ${ipv4_settings}
 | | Then IPv4 config from Honeycomb should be
-| | ... | ${node} | ${interface} | @{ipv4_address} | @{ipv4_neighbor}
+| | ... | ${node} | ${interface} | @{ipv4_address_mask} | @{ipv4_neighbor}
 | | ... | ${ipv4_settings}
 | | And IPv4 config from VAT should be
-| | ... | ${node} | ${interface} | @{ipv4_address}
+| | ... | ${node} | ${interface} | @{ipv4_address_mask}
+| | When Honeycomb sets interface ipv4 address with prefix
+| | ... | ${node} | ${interface} | @{ipv4_address_prefix}
+| | Then IPv4 config from Honeycomb should be
+| | ... | ${node} | ${interface} | @{ipv4_address_prefix} | @{ipv4_neighbor}
+| | ... | ${ipv4_settings}
+| | And IPv4 config from VAT should be
+| | ... | ${node} | ${interface} | @{ipv4_address_prefix}
 
 | Honeycomb modifies interface configuration - ipv6
 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv6.
@@ -87,14 +92,3 @@
 | | ... | ${node} | ${interface} | ${ethernet} | ${routing}
 | | And Interface ethernet and routing configuration from VAT should be
 | | ... | ${node} | ${interface} | ${ethernet['mtu']} | ${routing['vrf-id']}
-
-| Honeycomb modifies interface configuration - VxLAN
-| | [Documentation] | Check if Honeycomb API can configure interface VxLAN \
-| | ... | settings.
-| | [Tags] | honeycomb_sanity
-| | When Honeycomb sets interface VxLAN configuration
-| | ... | ${node} | ${interface} | &{vxlan_settings}
-| | Then VxLAN configuration from Honeycomb should be
-| | ... | ${node} | ${interface} | &{vxlan_settings}
-| | And VxLAN configuration from VAT should be
-| | ... | ${node} | ${interface} | &{vxlan_settings}