diff options
Diffstat (limited to 'resources')
5 files changed, 17 insertions, 15 deletions
diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index 4b6e2766d8..e364e60cee 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -56,9 +56,9 @@ def convert_ipv4_netmask_prefix(network): net = IPv4Network(u"{0}/{1}".format(temp_address, network), False) if isinstance(network, int) and (0 < network < 33): - return net.netmask + return str(net.netmask) elif isinstance(network, basestring): - return net.prefixlen + return int(net.prefixlen) else: raise Exception("Value {0} is not a valid ipv4 netmask or network" " prefix length".format(network)) diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index f84bcc3b2f..29510bdd7a 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -64,7 +64,7 @@ | | ... | \| Bridge domain configuration from Honeycomb should be \ | | ... | \| ${nodes['DUT1']} \| bd-04 \| ${{flood:True,learn:False}} \| | | [Arguments] | ${node} | ${bd_name} | ${settings} -| | ${api_data}= | Get bd cfg data | ${node} | ${bd_name} +| | ${api_data}= | Get bd oper data | ${node} | ${bd_name} | | :FOR | ${key} | IN | @{settings.keys()} | | | Should be equal | ${settings['${key}']} | ${api_data['${key}']} @@ -136,10 +136,13 @@ | | ${if2_data}= | interfaceAPI.Get interface oper data | | ... | ${node} | ${interface2} | | Should be equal | ${if1_data['v3po:l2']['bridge-domain']} -| | ... | ${if1_data['v3po:l2']['bridge-domain']} | ${bd_name} -| | :FOR | ${key} | IN | @{settings.keys()} -| | | Should be equal | ${if1_data['v3po:l2']['${key}']} -| | | ... | ${if2_data['v3po:l2']['${key}']} | ${settings['${key}']} +| | ... | ${if2_data['v3po:l2']['bridge-domain']} | ${bd_name} +| | Should be equal | ${if1_data['v3po:l2']['split-horizon-group']} +| | ... | ${if2_data['v3po:l2']['split-horizon-group']} +| | ... | ${settings['split_horizon_group']} +| | Should be equal | ${if1_data['v3po:l2']['bridged-virtual-interface']} +| | ... | ${if2_data['v3po:l2']['bridged-virtual-interface']} +| | ... | ${settings['bvi']} | VAT should show interfaces assigned to bridge domain | | [Documentation] | Uses VAT to verify interface assignment to\ @@ -195,7 +198,7 @@ | | ... | | ... | \| Honeycomb should show no bridge domains \| ${nodes['DUT1']} \| | | [Arguments] | ${node} -| | ${bd_data} | Get all BDs cfg data | ${node} +| | ${bd_data}= | Get all BDs oper data | ${node} | | Should be empty | ${bd_data} | VAT should show no bridge domains diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index c71d6a7257..ee8cfbc408 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -28,7 +28,7 @@ | | ... | - 4. Configure honeycomb nodes using HTTP PUT request | | ... | | ... | _Arguments:_ -| | ... | - ${duts} - list of nodes to setup Honeycomb on +| | ... | - duts - list of nodes to setup Honeycomb on | | ... | | ... | _Used global constants and variables:_ | | ... | - RESOURCES_TPL_HC - path to honeycomb templates directory @@ -50,7 +50,7 @@ | | ... | 200 -> 404 -> connection refused (pass) | | ... | | ... | _Arguments:_ -| | ... | - ${duts} - list of nodes to stop Honeycomb on +| | ... | - duts - list of nodes to stop Honeycomb on | | ... | | ... | _Used global constants and variables:_ | | ... | - RESOURCES_TPL_HC - path to honeycomb templates directory diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot index f1f7cea2d5..a187a107ff 100644 --- a/resources/libraries/robot/honeycomb/interfaces.robot +++ b/resources/libraries/robot/honeycomb/interfaces.robot @@ -334,4 +334,3 @@ | | [Arguments] | ${node} | ${interface} | ${mtu} | ${vrf-id} | | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface} | | Should be equal | ${vat_data['mtu']} | ${mtu} -| | Should be equal | ${vat_data['sub_inner_vlan_id']} | ${vrf-id} diff --git a/resources/libraries/robot/honeycomb/vxlan.robot b/resources/libraries/robot/honeycomb/vxlan.robot index a57c965fa3..07c5495ec7 100644 --- a/resources/libraries/robot/honeycomb/vxlan.robot +++ b/resources/libraries/robot/honeycomb/vxlan.robot @@ -29,7 +29,7 @@ | | ... | *Example:* | | ... | \| Honeycomb sets interface VxLAN configuration \ | | ... | \|${nodes['DUT1']} \| vxlan_01 \| ${{'src':'192.168.0.2',\ -| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| +| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} | | interfaceAPI.Create VxLAN interface | ${node} | ${interface} @@ -62,7 +62,7 @@ | | ... | | ... | \| VxLAN configuration from Honeycomb should be \ | | ... | \|${nodes['DUT1']} \| vxlan_01 \| ${{'src':'192.168.0.2',\ -| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| +| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} | | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} @@ -82,7 +82,7 @@ | | ... | | ... | \| VxLAN configuration from Honeycomb should be \ | | ... | \|${nodes['DUT1']} \| ${{'src':'192.168.0.2',\ -| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| +| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | ... | *Note:* | | ... | Due to the difficulty of identifying newly created interfaces by name\ @@ -145,7 +145,7 @@ | | ... | | ... | \| Honeycomb fails setting VxLan on different interface type\ | | ... | \|${nodes['DUT1']} \| GigabitEthernet0/9/0 \| ${{'src':'192.168.0.2',\ -| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| +| | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} | | Run Keyword And Expect Error | HoneycombError: * Status code: 500. |