aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2016-06-14 11:48:54 +0200
committerMatej Klotton <mklotton@cisco.com>2016-06-20 07:06:31 +0000
commitdbef20c93ad802b07607c9ca1c0e05c232c963f4 (patch)
treecdf1aae29d6375c69524e669f5a718e557bdcf4d
parent025d95939e2c14658204b307420fc75656a90ca7 (diff)
Modify tests for Honeycomb sub-interfaces
JIRA: CSIT-139 - modify tests for Honeycomb sub-interfaces to reflect the last changes in the model - modify existing keywords to work with latest changes in Honyecomb and VPP Change-Id: Idc88fbac7e743e6125d5c865d9d144448657dd20 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--resources/libraries/python/honeycomb/HcAPIKwInterfaces.py294
-rw-r--r--resources/libraries/robot/honeycomb/interfaces.robot22
-rw-r--r--resources/libraries/robot/honeycomb/sub_interface.robot473
-rw-r--r--resources/libraries/robot/honeycomb/vxlan_gpe.robot17
-rw-r--r--tests/suites/honeycomb/3 - bridge_domain.robot1
-rw-r--r--tests/suites/honeycomb/6 - sub_interface.robot581
-rw-r--r--tests/suites/honeycomb/8 - vxlan_gpe.robot6
-rw-r--r--tests/suites/honeycomb/resources/sub_interfaces.py285
-rw-r--r--tests/suites/honeycomb/resources/vxlan_gpe.py6
9 files changed, 1007 insertions, 678 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index 92b5830847..e2be81e877 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@ -35,7 +35,8 @@ class InterfaceKeywords(object):
"""
INTF_PARAMS = ("name", "description", "type", "enabled",
- "link-up-down-trap-enable", "v3po:l2", "v3po:vxlan-gpe")
+ "link-up-down-trap-enable", "v3po:l2", "v3po:vxlan-gpe",
+ "vpp-vlan:sub-interfaces")
IPV4_PARAMS = ("enabled", "forwarding", "mtu")
IPV6_PARAMS = ("enabled", "forwarding", "mtu", "dup-addr-detect-transmits")
IPV6_AUTOCONF_PARAMS = ("create-global-addresses",
@@ -47,22 +48,18 @@ class InterfaceKeywords(object):
VXLAN_PARAMS = ("src", "dst", "vni", "encap-vrf-id")
L2_PARAMS = ("bridge-domain", "split-horizon-group",
"bridged-virtual-interface")
- L2_REWRITE_TAG_PARAMS = ("rewrite-operation",
- "first-pushed",
- "tag1",
- "tag2")
TAP_PARAMS = ("tap-name", "mac", "device-instance")
VHOST_USER_PARAMS = ("socket", "role")
- SUB_INTF_PARAMS = ("super-interface",
- "identifier",
- "vlan-type",
- "number-of-tags",
- "outer-id",
- "inner-id",
- "match-any-outer-id",
- "match-any-inner-id",
- "exact-match",
- "default-subif")
+ SUB_IF_PARAMS = ("identifier",
+ "vlan-type",
+ "enabled")
+ SUB_IF_MATCH = ("default",
+ "untagged",
+ "vlan-tagged",
+ "vlan-tagged-exact-match")
+ BD_PARAMS = ("bridge-domain",
+ "split-horizon-group",
+ "bridged-virtual-interface")
VXLAN_GPE_PARAMS = ("local",
"remote",
"vni",
@@ -954,105 +951,258 @@ class InterfaceKeywords(object):
node, interface, path, new_vhost_structure)
@staticmethod
- def create_sub_interface(node, super_interface, identifier, **kwargs):
+ def create_sub_interface(node, super_interface, match, tags=None, **kwargs):
"""Create a new sub-interface.
:param node: Honeycomb node.
- :param super_interface: The name of super interface.
- :param identifier: sub-interface identifier.
+ :param super_interface: Super interface.
+ :param match: Match type. The valid values are defined in
+ InterfaceKeywords.SUB_IF_MATCH.
+ :param tags: List of tags.
:param kwargs: Parameters and their values. The accepted parameters are
- defined in InterfaceKeywords.SUB_INTF_PARAMS.
+ defined in InterfaceKeywords.SUB_IF_PARAMS.
:type node: dict
:type super_interface: str
- :type identifier: int
+ :type match: str
+ :type tags: list
:type kwargs: dict
:return: Content of response.
:rtype: bytearray
:raises HoneycombError: If the parameter is not valid.
+ :raises KeyError: If the parameter 'match' is invalid.
"""
- # These parameters are empty types (in JSON represented as empty
- # dictionary) but ODL internally represents them as Booleans. If the
- # value is an empty dictionary, it is True, if the parameter is
- # missing, it is False.
- empty_types = ("match-any-outer-id",
- "match-any-inner-id",
- "exact-match",
- "default-subif")
+ match_type = {
+ "default":
+ {"default": {}},
+ "untagged":
+ {"untagged": {}},
+ "vlan-tagged":
+ {"vlan-tagged": {"match-exact-tags": "false"}},
+ "vlan-tagged-exact-match":
+ {"vlan-tagged": {"match-exact-tags": "true"}}
+ }
- sub_interface_name = "{0}.{1}".format(super_interface, str(identifier))
new_sub_interface = {
- "name": sub_interface_name,
- "type": "v3po:sub-interface",
- "enabled": "false",
- "sub-interface": {
- "super-interface": super_interface,
- "identifier": identifier
- }
+ "tags": {
+ "tag": []
+ },
}
+
for param, value in kwargs.items():
- if param in InterfaceKeywords.INTF_PARAMS:
+ if param in InterfaceKeywords.SUB_IF_PARAMS:
new_sub_interface[param] = value
- elif param in InterfaceKeywords.SUB_INTF_PARAMS:
- if param in empty_types:
- if value:
- new_sub_interface["sub-interface"][param] = dict()
- else:
- new_sub_interface["sub-interface"][param] = value
else:
raise HoneycombError("The parameter {0} is invalid.".
format(param))
-
- path = ("interfaces", "interface")
+ try:
+ new_sub_interface["match"] = match_type[match]
+ except KeyError:
+ raise HoneycombError("The value '{0}' of parameter 'match' is "
+ "invalid.".format(match))
+
+ if tags:
+ new_sub_interface["tags"]["tag"].extend(tags)
+
+ path = ("interfaces",
+ ("interface", "name", super_interface),
+ "vpp-vlan:sub-interfaces",
+ "sub-interface")
new_sub_interface_structure = [new_sub_interface, ]
return InterfaceKeywords._set_interface_properties(
- node, sub_interface_name, path, new_sub_interface_structure)
+ node, super_interface, path, new_sub_interface_structure)
@staticmethod
- def add_vlan_tag_rewrite_to_sub_interface(node, sub_interface, **kwargs):
- """Add vlan tag rewrite to a sub-interface.
+ def get_sub_interface_oper_data(node, super_interface, identifier):
+ """Retrieves sub-interface operational data using Honeycomb API.
:param node: Honeycomb node.
- :param sub_interface: The name of sub-interface.
- :param kwargs: Parameters and their values. The accepted parameters are
- defined in InterfaceKeywords.L2_REWRITE_TAG_PARAMS.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
:type node: dict
- :type sub_interface: str
- :type kwargs: dict
+ :type super_interface: str
+ :type identifier: int
+ :return: Sub-interface operational data.
+ :rtype: dict
+ :raises HoneycombError: If there is no sub-interface with the given ID.
+ """
+
+ if_data = InterfaceKeywords.get_interface_oper_data(node,
+ super_interface)
+ for sub_if in if_data["vpp-vlan:sub-interfaces"]["sub-interface"]:
+ if str(sub_if["identifier"]) == str(identifier):
+ return sub_if
+
+ raise HoneycombError("The interface {0} does not have sub-interface "
+ "with ID {1}".format(super_interface, identifier))
+
+ @staticmethod
+ def remove_all_sub_interfaces(node, super_interface):
+ """Remove all sub-interfaces from the given interface.
+
+ :param node: Honeycomb node.
+ :param super_interface: Super interface.
+ :type node: dict
+ :type super_interface: str
:return: Content of response.
:rtype: bytearray
- :raises HoneycombError: If the parameter is not valid.
"""
- new_rewrite = dict()
- for param, value in kwargs.items():
- if param in InterfaceKeywords.L2_REWRITE_TAG_PARAMS:
- new_rewrite[param] = value
- else:
- raise HoneycombError("The parameter {0} is invalid.".
- format(param))
+ path = ("interfaces",
+ ("interface", "name", super_interface),
+ "vpp-vlan:sub-interfaces")
- path = ("interfaces", ("interface", "name", sub_interface), "v3po:l2",
- "vlan-tag-rewrite")
return InterfaceKeywords._set_interface_properties(
- node, sub_interface, path, new_rewrite)
+ node, super_interface, path, {})
@staticmethod
- def remove_vlan_tag_rewrite_from_sub_interface(node, sub_interface):
- """Remove vlan tag rewrite from a sub-interface.
+ def set_sub_interface_state(node, super_interface, identifier, state):
+ """Set the administrative state of sub-interface.
:param node: Honeycomb node.
- :param sub_interface: The name of sub-interface.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
+ :param state: Required sub-interface state - up or down.
:type node: dict
- :type sub_interface: str
+ :type super_interface: str
+ :type identifier: int
+ :type state: str
+ :return: Content of response.
+ :rtype: bytearray
+ """
+
+ intf_state = {"up": "true",
+ "down": "false"}
+
+ path = ("interfaces",
+ ("interface", "name", super_interface),
+ "vpp-vlan:sub-interfaces",
+ ("sub-interface", "identifier", identifier),
+ "enabled")
+
+ return InterfaceKeywords._set_interface_properties(
+ node, super_interface, path, intf_state[state])
+
+ @staticmethod
+ def add_bridge_domain_to_sub_interface(node, super_interface, identifier,
+ config):
+ """Add a sub-interface to a bridge domain and set its parameters.
+
+ :param node: Honeycomb node.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
+ :param config: Bridge domain configuration.
+ :type node: dict
+ :type super_interface: str
+ :type identifier: int
+ :type config: dict
+ :return: Content of response.
:rtype: bytearray
- :raises HoneycombError: If the parameter is not valid.
"""
- path = ("interfaces", ("interface", "name", sub_interface), "v3po:l2",
- "vlan-tag-rewrite")
+ path = ("interfaces",
+ ("interface", "name", super_interface),
+ "vpp-vlan:sub-interfaces",
+ ("sub-interface", "identifier", int(identifier)),
+ "l2")
+
return InterfaceKeywords._set_interface_properties(
- node, sub_interface, path, None)
+ node, super_interface, path, config)
+
+ @staticmethod
+ def get_bd_data_from_sub_interface(node, super_interface, identifier):
+ """Get the operational data about the bridge domain from sub-interface.
+
+ :param node: Honeycomb node.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
+ :type node: dict
+ :type super_interface: str
+ :type identifier: int
+ :return: Operational data about the bridge domain.
+ :rtype: dict
+ :raises HoneycombError: If there is no sub-interface with the given ID.
+ """
+
+ try:
+ bd_data = InterfaceKeywords.get_sub_interface_oper_data(
+ node, super_interface, identifier)["l2"]
+ return bd_data
+ except KeyError:
+ raise HoneycombError("The operational data does not contain "
+ "information about a bridge domain.")
+
+ @staticmethod
+ def configure_tag_rewrite(node, super_interface, identifier, config):
+ """Add / change / disable vlan tag rewrite on a sub-interface.
+
+ :param node: Honeycomb node.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
+ :param config: Rewrite tag configuration.
+ :type node: dict
+ :type super_interface: str
+ :type identifier: int
+ :type config: dict
+ :return: Content of response.
+ :rtype: bytearray
+ """
+
+ path = ("interfaces",
+ ("interface", "name", super_interface),
+ "vpp-vlan:sub-interfaces",
+ ("sub-interface", "identifier", int(identifier)),
+ "l2",
+ "rewrite")
+
+ return InterfaceKeywords._set_interface_properties(
+ node, super_interface, path, config)
+
+ @staticmethod
+ def get_tag_rewrite_oper_data(node, super_interface, identifier):
+ """Get the operational data about tag rewrite.
+
+ :param node: Honeycomb node.
+ :param super_interface: Super interface.
+ :param identifier: The ID of sub-interface.
+ :type node: dict
+ :type super_interface: str
+ :type identifier: int
+ :return: Operational data about tag rewrite.
+ :rtype: dict
+ :raises HoneycombError: If there is no sub-interface with the given ID.
+ """
+
+ try:
+ tag_rewrite = InterfaceKeywords.get_sub_interface_oper_data(
+ node, super_interface, identifier)["l2"]["rewrite"]
+ return tag_rewrite
+ except KeyError:
+ raise HoneycombError("The operational data does not contain "
+ "information about the tag-rewrite.")
+
+ @staticmethod
+ def compare_data_structures(data, ref):
+ """Checks if data obtained from UUT is as expected.
+
+ :param data: Data to be checked.
+ :param ref: Referential data used for comparison.
+ :type data: dict
+ :type ref: dict
+ :raises HoneycombError: If a parameter from referential data is not
+ present in operational data or if it has different value.
+ """
+
+ for key, item in ref.items():
+ try:
+ if data[key] != item:
+ raise HoneycombError("The value of parameter '{0}' is "
+ "incorrect. It should be "
+ "'{1}' but it is '{2}'".
+ format(key, item, data[key]))
+ except KeyError:
+ raise HoneycombError("The parameter '{0}' is not present in "
+ "operational data".format(key))
@staticmethod
def compare_interface_lists(list1, list2):
diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index 19f4ddac71..02d0a49cb8 100644
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -368,3 +368,25 @@
| | [Arguments] | ${node} | ${interface} |
| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
| | Should be empty | ${vat_data}
+
+| Interface indices from Honeycomb and VAT should correspond
+| | [Documentation] | Uses VAT and Honeycomb to get operational data about the\
+| | ... | given interface and compares the interface indexes. The interface
+| | ... | index from Honeycomb should be greater than index from VAT by one.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ... | - interface - name of the interface to be checked. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Interface indices from Honeycomb and VAT should correspond \
+| | ... | \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \|
+| | ...
+| | [Arguments] | ${node} | ${interface}
+| | ...
+| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | ${sw_if_index}= | EVALUATE | ${vat_data['sw_if_index']} + 1
+| | Should be equal as strings
+| | ... | ${api_data['if-index']} | ${sw_if_index}
diff --git a/resources/libraries/robot/honeycomb/sub_interface.robot b/resources/libraries/robot/honeycomb/sub_interface.robot
index e7f9c8a66b..c21b860f64 100644
--- a/resources/libraries/robot/honeycomb/sub_interface.robot
+++ b/resources/libraries/robot/honeycomb/sub_interface.robot
@@ -14,195 +14,225 @@
*** Settings ***
| Library | resources.libraries.python.InterfaceUtil
| ... | WITH NAME | interfaceCLI
+| Library | resources.libraries.python.L2Util
| Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
| ... | WITH NAME | InterfaceAPI
| Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
| Documentation | Keywords used to manipulate sub-interfaces.
-*** Variables ***
-# Translation table used to convert values received from Honeycomb to values
-# received from VAT.
-| &{rewrite_operations}=
-| ... | disabled=0
-| ... | push-1=1
-| ... | push-2=2
-| ... | pop-1=3
-| ... | pop-2=4
-| ... | translate-1-to-1=5
-| ... | translate-1-to-2=6
-| ... | translate-2-to-1=7
-| ... | translate-2-to-2=8
-
*** Keywords ***
| Honeycomb creates sub-interface
| | [Documentation] | Create a sub-interface using Honeycomb API.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - identifier - ID of sub-interface to be created. Type: integer
-| | ... | - sub_interface_base_settings - Configuration data for sub-interface.\
-| | ... | Type: dictionary
-| | ... | - sub_interface_settings - Configuration data specific for a\
-| | ... | sub-interface. Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface where a sub-interface will be\
+| | ... | created. Type: string
+| | ... | - match - Match type. Type: string
+| | ... | - tags - List of tags to be set while creating the sub-interface.\
+| | ... | Type: list
+| | ... | - sub_interface_settings - Sub-inteface parameters to be set while\
+| | ... | creating the sub-interface. Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Honeycomb creates sub-interface\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| 10 \| ${sub_interface_settings} \|
-| | ...
-| | [Arguments] | ${node} | ${interface} | ${identifier}
-| | ... | ${sub_interface_base_settings} | ${sub_interface_settings}
-| | interfaceAPI.Create sub interface | ${node} | ${interface}
-| | ... | &{sub_interface_base_settings} | &{sub_interface_settings}
-
-| Honeycomb fails to remove sub-interface
-| | [Documentation] | Honeycomb tries to remove sub-interface using Honeycomb\
-| | ... | API. This operation must fail.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of a sub-interface on the specified node.
-| | ... | Type: string
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0\
+| | ... | \| vlan-tagged-exact-match \| ${sub_if_1_tags}\
+| | ... | \| ${sub_if_1_settings} \|
| | ...
-| | ... | *Example:*
-| | ... | \| Honeycomb fails to remove sub-interface\
-| | ... | \| ${nodes['DUT1']} \| sub_test \|
+| | [Arguments] | ${node} | ${super_interface}
+| | ... | ${match} | ${tags} | ${sub_interface_settings}
| | ...
-| | [Arguments] | ${node} | ${interface}
-| | Run keyword and expect error | *HoneycombError: Not possible to remove* 500.
-| | ... | interfaceAPI.Delete interface | ${node} | ${interface}
+| | interfaceAPI.Create sub interface | ${node} | ${super_interface}
+| | ... | ${match} | ${tags} | &{sub_interface_settings}
| Sub-interface configuration from Honeycomb should be
| | [Documentation] | Retrieves sub-interface configuration through Honeycomb\
| | ... | and compares it with settings supplied in argument.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - base_settings - Configuration data for sub-interface.\
-| | ... | Type: dictionary
-| | ... | - sub_settings - Configuration data specific for a sub-interface.\
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - sub_if_settings - Operational data for sub-interface to be checked.\
| | ... | Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Sub-interface configuration from Honeycomb should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${sub_interface_base_settings}\
-| | ... | \| ${sub_interface_settings} \|
-| | ...
-| | [Arguments] | ${node} | ${interface} | ${base_settings} | ${sub_settings}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${api_sub}= | Set Variable | ${api_data['v3po:sub-interface']}
-| | :FOR | ${key} | IN | @{base_settings.keys()}
-| | | Should be equal | ${api_data['${key}']} | ${base_settings['${key}']}
-| | Should be equal as strings
-| | ... | ${api_sub['super-interface']} | ${sub_settings['super-interface']}
-| | Should be equal as strings
-| | ... | ${api_sub['identifier']} | ${sub_settings['identifier']}
-| | Should be equal as strings
-| | ... | ${api_sub['vlan-type']} | ${sub_settings['vlan-type']}
-| | Should be equal as strings
-| | ... | ${api_sub['number-of-tags']} | ${sub_settings['number-of-tags']}
-| | Run keyword if | ${sub_settings['match-any-outer-id']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['match-any-outer-id'][0]} | ${None}
-| | Run keyword if | ${sub_settings['match-any-inner-id']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['match-any-inner-id'][0]} | ${None}
-| | Run keyword if | ${sub_settings['exact-match']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['exact-match'][0]} | ${None}
-| | Run keyword if | ${sub_settings['default-subif']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['default-subif'][0]} | ${None}
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1\
+| | ... | \| ${sub_if_1_params} \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ... | ${sub_if_settings}
+| | ...
+| | ${api_data}= | interfaceAPI.Get sub interface oper data
+| | ... | ${node} | ${super_interface} | ${identifier}
+| | interfaceAPI.Compare Data Structures | ${api_data} | ${sub_if_settings}
| Sub-interface configuration from VAT should be
| | [Documentation] | Retrieves sub-interface configuration through VAT and\
| | ... | compares it with settings supplied in argument.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - sub_settings - Configuration data specific for a sub-interface.\
-| | ... | Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - sub_interface - Name of an sub-interface on the specified node.\
+| | ... | Type: string
+| | ... | - sub_interface_settings - Operational data specific for a\
+| | ... | sub-interface to be checked. Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Sub-interface configuration from VAT should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${sub_interface_base_settings}\
-| | ... | \| ${sub_interface_settings} \|
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \| ${sub_if_1_params} \|
| | ...
-| | [Arguments] | ${node} | ${interface} | ${sub_settings}
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | [Arguments] | ${node} | ${sub_interface} | ${sub_interface_settings}
+| | ...
+| | ${vat_data}= | InterfaceCLI.VPP get interface data
+| | ... | ${node} | ${sub_interface}
| | Should be equal as strings | ${vat_data['sub_id']}
-| | ... | ${sub_settings['identifier']}
-| | Should be equal as strings | ${vat_data['sub_number_of_tags']}
-| | ... | ${sub_settings['number-of-tags']}
-| | Run keyword if | ${sub_settings['match-any-outer-id']} == ${TRUE}
-| | ... | Should be equal as integers | ${vat_data['sub_outer_vlan_id_any']}
-| | ... | ${sub_settings['match-any-outer-id']}
-| | Run keyword if | ${sub_settings['match-any-inner-id']} == ${TRUE}
-| | ... | Should be equal as integers | ${vat_data['sub_inner_vlan_id_any']}
-| | ... | ${sub_settings['match-any-inner-id']}
-| | Run keyword if | ${sub_settings['exact-match']} == ${TRUE}
-| | ... | Should be equal as integers | ${vat_data['sub_exact_match']}
-| | ... | ${sub_settings['exact-match']}
-| | Run keyword if | ${sub_settings['default-subif']} == ${TRUE}
-| | ... | Should be equal as integers | ${vat_data['sub_default']}
-| | ... | ${sub_settings['default-subif']}
+| | ... | ${sub_interface_settings['identifier']}
+| | Should be equal as strings
+| | ... | ${vat_data['interface_name']} | ${sub_interface}
+| | Run keyword if | ${vat_data['link_up_down']} == 0
+| | ... | Should be equal as strings
+| | ... | ${sub_interface_settings['oper-status']} | down
+| | Run keyword if | ${vat_data['link_up_down']} == 1
+| | ... | Should be equal as strings
+| | ... | ${sub_interface_settings['oper-status']} | up
+
+| Sub-interface indices from Honeycomb and VAT should correspond
+| | [Documentation] | Uses VAT and Honeycomb to get operational data about the\
+| | ... | given sub-interface and compares the interface indexes. The
+| | ... | sub-interface index from Honeycomb should be greater than index from
+| | ... | VAT by one.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Sub-interface indices from Honeycomb and VAT should correspond \
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | ${api_data}= | interfaceAPI.Get sub interface oper data
+| | ... | ${node} | ${super_interface} | ${identifier}
+| | ${vat_data}= | InterfaceCLI.VPP get interface data
+| | ... | ${node} | ${super_interface}.${identifier}
+| | ${sw_if_index}= | EVALUATE | ${vat_data['sw_if_index']} + 1
+| | Should be equal as strings
+| | ... | ${api_data['if-index']} | ${sw_if_index}
+
+| Honeycomb sets the sub-interface up
+| | [Documentation] | Honeycomb sets the sub-interface up.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ... | Honeycomb sets the sub-interface up\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | interfaceAPI.Set sub interface state
+| | ... | ${node} | ${super_interface} | ${identifier} | up
+
+| Honeycomb sets the sub-interface down
+| | [Documentation] | Honeycomb sets the sub-interface down.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ... | Honeycomb sets the sub-interface down\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | interfaceAPI.Set sub interface state
+| | ... | ${node} | ${super_interface} | ${identifier} | down
+
+| Honeycomb fails to set sub-interface up
+| | [Documentation] | Honeycomb tries to set sub-interface up and expects error.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ... | \| Honeycomb fails to set sub-interface up\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | Run keyword and expect error | *HoneycombError: * was not successful. * 500.
+| | ... | interfaceAPI.Set sub interface state
+| | ... | ${node} | ${super_interface} | ${identifier} | up
| Honeycomb adds sub-interface to bridge domain
| | [Documentation] | Honeycomb adds the given sub-interface to bridge domain.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an sub-interface on the specified node. Type:\
-| | ... | string
-| | ... | - bd_name - The name of bridge domain where the sub-interface will be\
-| | ... | added. Type: string
-| | ... | - sub_bd_setings - Parameters to be set while adding the\
-| | ... | sub-interface to the bridge domain. Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - sub_bd_setings - Bridge domain parameters to be set while adding\
+| | ... | the sub-interface to the bridge domain. Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Honeycomb adds sub-interface to bridge domain\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| test_bd \| ${sub_bd_setings} \|
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \| ${bd_settings} \|
| | ...
-| | [Arguments] | ${node} | ${interface} | ${bd_name} | ${sub_bd_setings}
-| | interfaceAPI.Add bridge domain to interface
-| | ... | ${node} | ${interface} | ${bd_name}
-| | ... | split_horizon_group=${sub_bd_setings['split-horizon-group']}
-| | ... | bvi=${sub_bd_setings['bridged-virtual-interface']}
+| | [Arguments] | ${node} | ${super_if} | ${identifier} | ${sub_bd_setings}
+| | ...
+| | interfaceAPI.Add bridge domain to sub interface
+| | ... | ${node} | ${super_if} | ${identifier} | ${sub_bd_setings}
| Sub-interface bridge domain configuration from Honeycomb should be
| | [Documentation] | Uses Honeycomb API to verify sub-interface assignment to\
| | ... | a bridge domain.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of a sub-interface on the specified node. Type:\
-| | ... | string
-| | ... | - setings - Parameters to be checked. Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - settings - Bridge domain parameters to be checked. Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Sub-interface bridge domain configuration from Honeycomb should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${sub_bd_setings} \|
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \| ${bd_settings} \|
| | ...
-| | [Arguments] | ${node} | ${interface} | ${settings}
-| | ${if_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | Should be equal | ${if_data['v3po:l2']['bridge-domain']}
+| | [Arguments] | ${node} | ${super_if} | ${identifier} | ${settings}
+| | ...
+| | ${if_data}= | interfaceAPI.Get BD data from sub interface
+| | ... | ${node} | ${super_if} | ${identifier}
+| | Should be equal | ${if_data['bridge-domain']}
| | ... | ${settings['bridge-domain']}
-| | Should be equal | disabled
-| | ... | ${if_data['v3po:l2']['vlan-tag-rewrite']['rewrite-operation']}
| Sub-interface bridge domain configuration from VAT should be
| | [Documentation] | Uses VAT to verify sub-interface assignment to a bridge\
| | ... | domain.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of a sub-interface on the specified node. Type:\
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - interface - Name of a sub-interface on the specified node. Type:\
| | ... | string
| | ... | - setings - Parameters to be checked. Type: dictionary
| | ...
| | ... | *Example:*
| | ... | \| Sub-interface bridge domain configuration from VAT should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${sub_bd_setings} \|
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \| ${sub_bd_setings} \|
| | ...
| | [Arguments] | ${node} | ${interface} | ${settings}
+| | ...
| | ${bd_data}= | VPP get bridge domain data | ${node}
| | ${bd_intf}= | Set Variable | ${bd_data[0]}
| | ${sw_if_data}= | Set Variable | ${bd_intf['sw_if'][0]}
@@ -213,166 +243,135 @@
| | Should be equal as strings | ${sw_if_data['shg']}
| | ... | ${settings['split-horizon-group']}
-| Sub-interface configuration with bd and rw from Honeycomb should be
-| | [Documentation] | Retrieves sub-interface configuration through Honeycomb\
-| | ... | and compares it with settings supplied in argument.
+| Honeycomb fails to remove all sub-interfaces
+| | [Documentation] | Honeycomb tries to remove all sub-interfaces using\
+| | ... | Honeycomb API. This operation must fail.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - base_settings - Configuration data for sub-interface.\
-| | ... | Type: dictionary
-| | ... | - sub_settings - Configuration data specific for a sub-interface.\
-| | ... | Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
| | ...
| | ... | *Example:*
-| | ... | \| Sub-interface configuration with bd and rw from Honeycomb should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${sub_interface_base_settings}\
-| | ... | \| ${sub_interface_settings} \|
-| | ...
-| | [Arguments] | ${node} | ${interface} | ${base_settings} | ${sub_settings}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${api_sub}= | Set Variable | ${api_data['v3po:sub-interface']}
-| | Should be equal as strings | ${api_data['name']} | ${base_settings['name']}
-| | Should be equal as strings | ${api_data['type']} | ${base_settings['type']}
-| | Should be equal as strings
-| | ... | ${api_sub['super-interface']} | ${sub_settings['super-interface']}
-| | Should be equal as strings
-| | ... | ${api_sub['identifier']} | ${sub_settings['identifier']}
-| | Should be equal as strings
-| | ... | ${api_sub['vlan-type']} | ${sub_settings['vlan-type']}
-| | Should be equal as strings
-| | ... | ${api_sub['number-of-tags']} | ${sub_settings['number-of-tags']}
-| | Run keyword if | ${sub_settings['match-any-outer-id']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['match-any-outer-id'][0]} | ${None}
-| | Run keyword if | ${sub_settings['match-any-inner-id']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['match-any-inner-id'][0]} | ${None}
-| | Run keyword if | ${sub_settings['exact-match']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['exact-match'][0]} | ${None}
-| | Run keyword if | ${sub_settings['default-subif']} == ${TRUE}
-| | ... | Should be equal | ${api_sub['default-subif'][0]} | ${None}
-| | Should be equal | ${api_data['v3po:l2']['bridge-domain']}
-| | ... | ${base_settings['v3po:l2']['bridge-domain']}
-| | ${rw_data}= | Set Variable | ${api_data['v3po:l2']['vlan-tag-rewrite']}
-| | ${rw_params}= | Set Variable
-| | ... | ${base_settings['v3po:l2']['vlan-tag-rewrite']}
-| | Should be equal as strings | ${rw_data['rewrite-operation']}
-| | ... | ${rw_params['rewrite-operation']}
-| | Should be equal as strings | ${rw_data['first-pushed']}
-| | ... | ${rw_params['first-pushed']}
+| | ... | \| Honeycomb fails to remove all sub-interfaces\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \|
+| | ...
+| | [Arguments] | ${node} | ${super_if}
+| | ...
+| | Run keyword and expect error | *HoneycombError:*not successful. * code: 500.
+| | ... | interfaceAPI.Remove all sub interfaces
+| | ... | ${node} | ${super_if}
-| Rewrite tag configuration from VAT should be
-| | [Documentation] | Retrieves sub-interface configuration through VAT and\
-| | ... | compares values of rewrite tag parameters with settings supplied in\
-| | ... | argument.
+| Honeycomb configures tag rewrite
+| | [Documentation] | Honeycomb configures tag-rewrite
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - rw_settings - Parameters to be set while setting the rewrite tag.\
-| | ... | Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - settings - tag-rewrite parameters. Type: dictionary.
| | ...
| | ... | *Example:*
-| | ... | \| Rewrite tag configuration from VAT should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${rw_params} \|
+| | ... | \| Honeycomb configures tag rewrite\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1\
+| | ... | \| ${tag_rewrite_push} \|
| | ...
-| | [Arguments] | ${node} | ${interface} | ${rw_settings}
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
-| | Should be equal as strings | ${vat_data['vtr_op']}
-| | ... | ${rewrite_operations['${rw_settings['rewrite-operation']}']}
-| | Run keyword if | '${rw_settings['rewrite-operation']}' == 'push-1'
-| | ... | Should be equal as strings
-| | ... | ${vat_data['vtr_tag1']} | ${rw_settings['tag1']}
+| | [Arguments] | ${node} | ${super_if} | ${identifier} | ${settings}
+| | ...
+| | interfaceAPI.Configure tag rewrite
+| | ... | ${node} | ${super_if} | ${identifier} | ${settings}
-| Honeycomb sets rewrite tag
-| | [Documentation] | Set the rewrite tag for sub-interface using Honeycomb API.
+| Rewrite tag from Honeycomb should be empty
+| | [Documentation] | Checks if the tag-rewrite is empty or does not exist.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - sub_interface - name of an sub-interface on the specified node.\
-| | ... | Type: string
-| | ... | - rw_params - Parameters to be set while setting the rewrite tag.\
-| | ... | Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
| | ...
| | ... | *Example:*
-| | ... | \| Honeycomb sets rewrite tag\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${rw_params} \|
+| | ... | \| Rewrite tag from Honeycomb should be empty\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
| | ...
-| | [Arguments] | ${node} | ${sub_interface} | ${rw_params}
-| | interfaceAPI.Add vlan tag rewrite to sub interface
-| | ... | ${node} | ${sub_interface} | &{rw_params}
+| | [Arguments] | ${node} | ${super_if} | ${identifier}
+| | ...
+| | Run keyword and expect error | *Hon*Error*oper*does not contain*tag-rewrite*
+| | ... | interfaceAPI.Get tag rewrite oper data
+| | ... | ${node} | ${super_if} | ${identifier}
-| Honeycomb removes rewrite tag
-| | [Documentation] | Remove the rewrite tag from sub-interface using Honeycomb\
-| | ... | API.
+| Rewrite tag from Honeycomb should be
+| | [Documentation] | Checks if the operational data retrieved from Honeycomb\
+| | ... | are as expected.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - sub_interface - name of an sub-interface on the specified node.\
-| | ... | Type: string
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - settings - tag-rewrite operational parameters to be checked.\
+| | ... | Type: dictionary.
| | ...
| | ... | *Example:*
-| | ... | \| Honeycomb removes rewrite tag \| ${nodes['DUT1']} \| sub_test \|
+| | ... | \| Rewrite tag from Honeycomb should be\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1\
+| | ... | \| ${tag_rewrite_push_oper} \|
| | ...
-| | [Arguments] | ${node} | ${sub_interface}
-| | interfaceAPI.Remove vlan tag rewrite from sub interface
-| | ... | ${node} | ${sub_interface}
+| | [Arguments] | ${node} | ${super_if} | ${identifier} | ${settings}
+| | ${api_data}= | interfaceAPI.Get tag rewrite oper data
+| | ... | ${node} | ${super_if} | ${identifier}
+| | interfaceAPI.Compare Data Structures | ${api_data} | ${settings}
-| Rewrite tag from Honeycomb should be
-| | [Documentation] | Uses Honeycomb API to verify if the rewrite tag is set\
-| | ... | with correct parameters.
+| Rewrite tag from VAT should be
+| | [Documentation] | Retrieves sub-interface configuration through VAT and\
+| | ... | compares values of rewrite tag parameters with settings supplied in\
+| | ... | argument.
| | ...
| | ... | *Arguments:*
| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - sub_interface - name of an sub-interface on the specified node.\
+| | ... | - interface - name of a sub-interface on the specified node.\
| | ... | Type: string
-| | ... | - rw_params - Parameters to be checked. Type: dictionary
+| | ... | - rw_settings - Parameters to be set while setting the rewrite tag.\
+| | ... | Type: dictionary
| | ...
| | ... | *Example:*
-| | ... | \| Rewrite tag from Honeycomb should be\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${rw_params} \|
-| | ...
-| | [Arguments] | ${node} | ${sub_interface} | ${rw_params}
-| | ${if_data}= | interfaceAPI.Get interface oper data | ${node}
-| | ... | ${sub_interface}
-| | ${rw_data}= | Set Variable | ${if_data['v3po:l2']["vlan-tag-rewrite"]}
-| | Should be equal as strings | ${rw_data['rewrite-operation']}
-| | ... | ${rw_params['rewrite-operation']}
-| | Should be equal as strings | ${rw_data['first-pushed']}
-| | ... | ${rw_params['first-pushed']}
+| | ... | \| Rewrite tag from VAT should be\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \| ${rw_params} \|
+| | ...
+| | [Arguments] | ${node} | ${interface} | ${rw_settings}
+| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | interfaceAPI.Compare Data Structures | ${vat_data} | ${rw_settings}
| Honeycomb fails to set wrong rewrite tag
| | [Documentation] | Honeycomb tries to set wrong rewrite tag and expects\
-| | ... | error.
+| | ... | an error.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - sub_interface - name of an sub-interface on the specified node.\
-| | ... | Type: string
-| | ... | - rw_params - Parameters to be set while setting the rewrite tag.\
-| | ... | Type: dictionary
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - super_if - Super-interface. Type: string
+| | ... | - identifier - Sub-interface ID. Type: integer or string
+| | ... | - settings - tag-rewrite parameters. Type: dictionary.
| | ...
| | ... | *Example:*
| | ... | \| Honeycomb fails to set wrong rewrite tag\
-| | ... | \| ${nodes['DUT1']} \| sub_test \| ${rw_params} \|
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1\
+| | ... | \| ${tag_rewrite_push_WRONG} \|
| | ...
-| | [Arguments] | ${node} | ${sub_interface} | ${rw_params}
-| | Run keyword and expect error | *HoneycombError: * was not successful. * 400.
-| | ... | interfaceAPI.Add vlan tag rewrite to sub interface | ${node}
-| | ... | ${sub_interface} | &{rw_params}
+| | [Arguments] | ${node} | ${super_if} | ${identifier} | ${settings}
+| | Run keyword and expect error | *HoneycombError: * was not successful. *00.
+| | ... | interfaceAPI.Configure tag rewrite
+| | ... | ${node} | ${super_if} | ${identifier} | ${settings}
-| Honeycomb fails to set sub-interface up
-| | [Documentation] | Honeycomb tries to set sub-interface up and expects error.
+| VAT disables tag-rewrite
+| | [Documentation] | The keyword disables the tag-rewrite using VAT.
| | ...
| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - sub_interface - name of an sub-interface on the specified node.\
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - sub_interface - Name of an sub-interface on the specified node.\
| | ... | Type: string
| | ...
| | ... | *Example:*
-| | ... | \| Honeycomb fails to set sub-interface up\
-| | ... | \| ${node} \| sub_test \|
+| | ... | \| VAT disables tag-rewrite\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \|
| | ...
| | [Arguments] | ${node} | ${sub_interface}
-| | Run keyword and expect error | *HoneycombError: * was not successful. * 500.
-| | ... | interfaceAPI.Set interface up | ${node} | ${sub_interface}
+| | ...
+| | ${sw_if_index}= | interfaceCLI.Get sw if index | ${node} | ${sub_interface}
+| | L2 tag rewrite | ${node} | ${sw_if_index} | disable
diff --git a/resources/libraries/robot/honeycomb/vxlan_gpe.robot b/resources/libraries/robot/honeycomb/vxlan_gpe.robot
index 3850eb83fa..364a23228c 100644
--- a/resources/libraries/robot/honeycomb/vxlan_gpe.robot
+++ b/resources/libraries/robot/honeycomb/vxlan_gpe.robot
@@ -90,7 +90,7 @@
| | ... | ${api_data['name']} | ${base_settings['name']}
| | Should be equal as strings
| | ... | ${api_data['type']} | v3po:vxlan-gpe-tunnel
-| | Run keyword if | '${base_settings['enabled']}' == 'true'
+| | Run keyword if | $base_settings['enabled'] == True
| | ... | Run keywords
| | ... | Should be equal as strings | ${api_data['admin-status']} | up
| | ... | AND
@@ -130,9 +130,11 @@
| | Should be equal as strings | ${vat_data['protocol']}
| | ... | ${protocols['${vxlan_gpe_params['next-protocol']}']}
-| Interface indices should be the same from Honeycomb and VAT
-| | [Documentation] | Uses VAT and Honeycomb to get operational data about the\
-| | ... | given interface and compares the interface indexes.
+| VxLAN GPE Interface indices from Honeycomb and VAT should correspond
+| | [Documentation] | Uses VAT and Honeycomb to get operational data about the \
+| | ... | given VxLAN GPE interface and compares the interface indexes. The \
+| | ... | VxLAN GPE interface index from Honeycomb should be greater than \
+| | ... | index from VAT by one.
| | ...
| | ... | *Arguments:*
| | ... | - node - information about a DUT node. Type: dictionary
@@ -140,15 +142,16 @@
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Interface indices should be the same from Honeycomb and VAT \
-| | ... | \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \|
+| | ... | \| VxLAN GPE Interface indices from Honeycomb and VAT should \
+| | ... | correspond \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \|
| | ...
| | [Arguments] | ${node} | ${interface}
| | ...
| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
| | ${vat_data}= | VxLAN GPE Dump | ${node} | ${interface}
+| | ${sw_if_index}= | EVALUATE | ${vat_data['sw_if_index']} + 1
| | Should be equal as strings
-| | ... | ${api_data['if-index']} | ${vat_data['sw_if_index']}
+| | ... | ${api_data['if-index']} | ${sw_if_index}
| VxLAN GPE configuration from VAT should be empty
| | [Documentation] | Uses VAT to get operational data about the given\
diff --git a/tests/suites/honeycomb/3 - bridge_domain.robot b/tests/suites/honeycomb/3 - bridge_domain.robot
index d1f1c7b329..61a67cc901 100644
--- a/tests/suites/honeycomb/3 - bridge_domain.robot
+++ b/tests/suites/honeycomb/3 - bridge_domain.robot
@@ -27,6 +27,7 @@
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
+| Suite Teardown | Honeycomb removes all bridge domains | ${node}
| Documentation | *Honeycomb bridge domain management test suite.*
| ...
| ... | Test suite uses the first two interfaces on the first DUT node.
diff --git a/tests/suites/honeycomb/6 - sub_interface.robot b/tests/suites/honeycomb/6 - sub_interface.robot
index 50becace60..6938082c16 100644
--- a/tests/suites/honeycomb/6 - sub_interface.robot
+++ b/tests/suites/honeycomb/6 - sub_interface.robot
@@ -17,370 +17,347 @@
| Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Variables | tests/suites/honeycomb/resources/sub_interfaces.py
+| Suite Teardown | Honeycomb removes all bridge domains | ${node}
| Documentation | *Honeycomb sub-interface management test suite.*
| ...
| ... | This test suite tests if it is posible to create, modify and\
| ... | delete a sub-interface.
+| Force Tags | honeycomb_sanity
*** Variables ***
| ${node}= | ${nodes['DUT1']}
# Test interface 1 and its sub-interface parameters:
-| ${interface}= | ${node['interfaces']['port1']['name']}
-| ${sub_interface_id}= | 10
-| ${sub_interface_name}= | ${interface}.${sub_interface_id}
-| &{sub_interface_base_settings}=
-| ... | name=${sub_interface_name}
-| ... | type=v3po:sub-interface
-| &{sub_interface_settings}=
-| ... | super-interface=${interface}
-| ... | identifier=${sub_interface_id}
-| ... | vlan-type=802dot1ad
-| ... | number-of-tags=2
-| ... | outer-id=22
-| ... | inner-id=33
-| ... | match-any-outer-id=${FALSE}
-| ... | match-any-inner-id=${FALSE}
-| ... | exact-match=${TRUE}
-| ... | default-subif=${TRUE}
-| &{sub_interface_settings_wrong}=
-| ... | super-interface=${interface}
-| ... | identifier=${sub_interface_id}
-| ... | vlan-type=WRONG_TYPE
-| ... | number-of-tags=2
-| ... | outer-id=22
-| ... | inner-id=33
-| ... | match-any-outer-id=${TRUE}
-| ... | match-any-inner-id=${TRUE}
-| ... | exact-match=${TRUE}
-| ... | default-subif=${TRUE}
-
-# Test interface 2 and its sub-interface parameters:
-| ${interface2}= | ${node['interfaces']['port3']['name']}
-| ${sub_interface2_name}= | ${interface2}.${sub_interface_id}
-| &{sub_interface2_base_settings}=
-| ... | name=${sub_interface2_name}
-| ... | type=v3po:sub-interface
-| ... | v3po:l2=&{bd_rw_settings}
-| &{sub_interface2_settings}=
-| ... | super-interface=${interface2}
-| ... | identifier=${sub_interface_id}
-| ... | vlan-type=802dot1ad
-| ... | number-of-tags=2
-| ... | outer-id=44
-| ... | inner-id=55
-| ... | match-any-outer-id=${FALSE}
-| ... | match-any-inner-id=${FALSE}
-| ... | exact-match=${TRUE}
-| ... | default-subif=${FALSE}
+| ${super_if}= | ${node['interfaces']['port1']['name']}
+| ${sub_if_id}= | ${sub_if_1_settings['identifier']}
+| ${sub_if_name}= | ${super_if}.${sub_if_id}
*** Test Cases ***
| Honycomb creates sub-interface
| | [Documentation] | Check if Honeycomb creates a sub-interface.
| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be empty
-| | ... | ${node} | ${sub_interface_name}
-| | And sub-interface configuration from VAT should be empty
-| | ... | ${node} | ${sub_interface_name}
-| | When Honeycomb creates sub-interface
-| | ... | ${node} | ${interface} | ${sub_interface_id}
-| | ... | ${sub_interface_base_settings} | ${sub_interface_settings}
-| | Then sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honeycomb adds sub-interface to bridge domain
-| | [Documentation] | Check if Honeycomb adds a sub-interface to bridge domain.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | When Honeycomb creates L2 bridge domain
-| | ... | ${node} | ${bd_name} | ${bd_settings}
-| | Then Bridge domain configuration from Honeycomb should be
-| | ... | ${node} | ${bd_name} | ${bd_settings}
-| | When Honeycomb adds sub-interface to bridge domain
-| | ... | ${node} | ${sub_interface_name} | ${bd_name} | ${sub_bd_settings}
-| | Then sub-interface bridge domain configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_bd_settings}
-| | And sub-interface bridge domain configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_bd_settings}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honeycomb sets vlan tag rewrite on sub-interface in bridge domain
-| | [Documentation] | Check if Honeycomb adds vlan tag rewrite on sub-interface\
-| | ... | in bridge domain.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And sub-interface bridge domain configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_bd_settings}
-| | &{init_rw_params}= | Create dictionary | first-pushed=802dot1ad
-| | ... | rewrite-operation=disabled
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${init_rw_params}
-| | When Honeycomb sets rewrite tag
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | Then rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honeycomb edits vlan tag rewrite on sub-interface in bridge domain
-| | [Documentation] | Check if Honeycomb updates vlan tag rewrite on\
-| | ... | sub-interface in bridge domain.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | When Honeycomb sets rewrite tag
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_edited}
-| | Then rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_edited}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_edited}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honeycomb removes vlan tag rewrite from sub-interface
-| | [Documentation] | Check if Honeycomb removes vlan tag rewrite from\
-| | ... | sub-interface.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_edited}
-| | When Honeycomb removes rewrite tag
-| | ... | ${node} | ${sub_interface_name}
-| | Then rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honeycomb sets again vlan tag rewrite on sub-interface in bridge domain
-| | [Documentation] | Check if Honeycomb adds vlan tag rewrite on sub-interface\
-| | ... | in bridge domain if it was disabled before.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | When Honeycomb sets rewrite tag
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | Then rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honycomb deletes sub-interface
-| | [Documentation] | Check if Honeycomb can delete an existing sub-interface.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | When Honeycomb fails to remove sub-interface
-| | ... | ${node} | ${sub_interface_name}
-| | Then sub-interface configuration from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_base_settings}
-| | ... | ${sub_interface_settings}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${sub_interface_settings}
-
-| Honycomb creates sub-interface with bridge domain
-| | [Documentation] | Check if Honeycomb creates a sub-interface with bridge\
-| | ... | domain and rewrite tag configured.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration from Honeycomb should be empty
-| | ... | ${node} | ${sub_interface2_name}
-| | And sub-interface configuration from VAT should be empty
-| | ... | ${node} | ${sub_interface2_name}
-| | When Honeycomb creates L2 bridge domain
-| | ... | ${node} | ${bd2_name} | ${bd2_settings}
-| | And Honeycomb creates sub-interface
-| | ... | ${node} | ${interface2} | ${sub_interface_id}
-| | ... | ${sub_interface2_base_settings} | ${sub_interface2_settings}
-| | Then sub-interface configuration with bd and rw from Honeycomb should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_base_settings}
-| | ... | ${sub_interface2_settings}
-| | And sub-interface configuration from VAT should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_settings}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface2_name} | ${rw_params}
-
-| Honeycomb sets wrong operation in vlan tag rewrite
-| | [Documentation] | Negative test: Honeycomb tries to set a wrong value of\
-| | ... | "rewrite-operation" parameter in "vlan-tag-rewrite". The operation\
-| | ... | must fail.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration with bd and rw from Honeycomb should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_base_settings}
-| | ... | ${sub_interface2_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | When Honeycomb fails to set wrong rewrite tag
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_wrong_op}
-| | Then sub-interface configuration with bd and rw from Honeycomb should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_base_settings}
-| | ... | ${sub_interface2_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-
-| Honeycomb sets wrong first-pushed in vlan tag rewrite
-| | [Documentation] | Negative test: Honeycomb tries to set a wrong value of\
-| | ... | "first-pushed" parameter in "vlan-tag-rewrite". The operation must\
-| | ... | fail.
-| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
-| | Given sub-interface configuration with bd and rw from Honeycomb should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_base_settings}
-| | ... | ${sub_interface2_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | When Honeycomb fails to set wrong rewrite tag
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_wrong_pushed}
-| | Then sub-interface configuration with bd and rw from Honeycomb should be
-| | ... | ${node} | ${sub_interface2_name} | ${sub_interface2_base_settings}
-| | ... | ${sub_interface2_settings}
-| | And rewrite tag from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
-| | And rewrite tag configuration from VAT should be
-| | ... | ${node} | ${sub_interface_name} | ${rw_params_disabled}
+| | Given interface configuration from Honeycomb should be empty
+| | ... | ${node} | ${sub_if_name}
+| | And interface configuration from VAT should be empty
+| | ... | ${node} | ${sub_if_name}
+| | When Honeycomb creates sub-interface | ${node} | ${super_if}
+| | ... | ${sub_if_1_match} | ${sub_if_1_tags} | ${sub_if_1_settings}
+| | Then run keyword and continue on failure
+| | ... | Sub-interface configuration from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_if_1_oper}
+| | And run keyword and continue on failure
+| | ... | Sub-interface configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
+| | And sub-interface indices from Honeycomb and VAT should correspond
+| | ... | ${node} | ${super_if} | ${sub_if_id}
| Honeycomb sets interface and sub-interface up
| | [Documentation] | Honeycomb changes the state of interface up and then\
| | ... | changes the state of its sub-interface up, in this order.
| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | When Honeycomb sets interface state
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | Then interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | down
-| | When Honeycomb sets interface state
-| | ... | ${node} | ${sub_interface_name} | up
+| | ... | ${node} | ${sub_if_name} | down
+| | When Honeycomb sets the sub-interface up
+| | ... | ${node} | ${super_if} | ${sub_if_id}
| | Then interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | up
+| | ... | ${node} | ${sub_if_name} | up
| | And Interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | up
+| | ... | ${node} | ${sub_if_name} | up
| Honeycomb sets sub-interface down while its super-interface is up
| | [Documentation] | Honeycomb sets the sub-interface down while its\
| | ... | super-interface is up. It must be possible.
| | ...
-| | [Tags] | honeycomb_sanity
+| | [Teardown] | Set super and sub interfaces up
+| | ... | ${node} | ${super_if} | ${sub_if_id}
| | ...
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | up
-| | And Interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | up
+| | ... | ${node} | ${sub_if_name} | up
+| | And interface state from VAT should be
+| | ... | ${node} | ${sub_if_name} | up
| | And interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | up
-| | When Honeycomb sets interface state
-| | ... | ${node} | ${sub_interface_name} | down
-| | Then Interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | down
-| | And Interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${super_if} | up
+| | When Honeycomb sets the sub-interface down
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | Then interface state from Honeycomb should be
+| | ... | ${node} | ${sub_if_name} | down
+| | And interface state from VAT should be
+| | ... | ${node} | ${sub_if_name} | down
| | And interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| Honeycomb sets interface and sub-interface down
| | [Documentation] | Honeycomb changes the state of interface down and then\
| | ... | changes the state of its sub-interface down, in this order.
| | ...
-| | [Tags] | honeycomb_sanity
+| | [Teardown] | Set super and sub interfaces down
+| | ... | ${node} | ${super_if} | ${sub_if_id}
| | ...
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | up
+| | ... | ${node} | ${super_if} | up
| | When Honeycomb sets interface state
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | Then interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | down
-| | And Interface state from VAT should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
+| | And interface state from VAT should be
+| | ... | ${node} | ${super_if} | down
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | up
+| | ... | ${node} | ${sub_if_name} | up
| | And interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | up
-| | When Honeycomb sets interface state
-| | ... | ${node} | ${sub_interface_name} | down
-| | Then Interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | down
-| | And Interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | up
+| | When Honeycomb sets the sub-interface down
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | Then interface state from Honeycomb should be
+| | ... | ${node} | ${sub_if_name} | down
+| | And interface state from VAT should be
+| | ... | ${node} | ${sub_if_name} | down
| Honeycomb fails to set sub-interface up while its super-interface is down
| | [Documentation] | Honeycomb tries to set the sub-interface up while its\
| | ... | super-interface is down. It must not be possible.
| | ...
-| | [Tags] | honeycomb_sanity
-| | ...
| | Given interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | And interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | down
| | When Honeycomb fails to set sub-interface up
-| | ... | ${node} | ${sub_interface_name}
+| | ... | ${node} | ${super_if} | ${sub_if_id}
| | Then interface state from Honeycomb should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${interface} | down
+| | ... | ${node} | ${super_if} | down
| | And interface state from Honeycomb should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | down
| | And interface state from VAT should be
-| | ... | ${node} | ${sub_interface_name} | down
+| | ... | ${node} | ${sub_if_name} | down
+
+| Honeycomb fails to delete sub-interface
+| | [Documentation] | Check if Honeycomb can delete an existing sub-interface.
+| | ...
+| | [Setup] | Set super and sub interfaces down
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | ...
+| | Given sub-interface configuration from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_if_1_oper}
+| | And sub-interface configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
+| | When Honeycomb fails to remove all sub-interfaces
+| | ... | ${node} | ${super_if}
+| | Then sub-interface configuration from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_if_1_oper}
+| | And sub-interface configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
+
+| Honeycomb adds sub-interface to new bridge domain
+| | [Documentation] | Check if Honeycomb adds a sub-interface to bridge domain.
+| | ...
+| | [Setup] | Set super and sub interfaces down
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | ...
+| | Given sub-interface configuration from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_if_1_oper}
+| | And sub-interface configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
+| | When Honeycomb creates L2 bridge domain
+| | ... | ${node} | ${bd_name} | ${bd_settings}
+| | Then bridge domain configuration from Honeycomb should be
+| | ... | ${node} | ${bd_name} | ${bd_settings}
+| | When Honeycomb adds sub-interface to bridge domain
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_bd_settings}
+| | Then sub-interface bridge domain configuration from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_bd_settings}
+| | And sub-interface bridge domain configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_bd_settings}
+| | And sub-interface configuration from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
+
+| Honeycomb enables tag-rewrite pop 1
+| | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its\
+| | ... | parameters correctly. Case: pop 1.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
+
+| Honeycomb enables tag-rewrite push
+| | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its\
+| | ... | parameters correctly. Case: push.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_push}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_push_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_push_VAT}
+
+| Honeycomb enables tag-rewrite translate 1-2
+| | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its\
+| | ... | parameters correctly. Case: translate 1-2.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_translate_1_2}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | ... | ${tag_rewrite_translate_1_2_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_translate_1_2_VAT}
+
+| Honeycomb disables tag-rewrite
+| | [Documentation] | Check if Honeycomb disables the tag-rewrite.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1_oper}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_disabled}
+| | Then rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
+
+| Honeycomb enables tag-rewrite pop 1 again
+| | [Documentation] | Check if Honeycomb can enable tag-rewrite again, once it\
+| | ... | was disabled by Honeycomb.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
+
+| Honeycomb modifies the tag-rewrite
+| | [Documentation] | Honeycomb sets the tag-rewrite:
+| | ... | 1. pop 1, then
+| | ... | 2. push, then
+| | ... | 3. translate 1 - 2
+| | ... | Then Honeycomb disables the tag-rewrite.
+| | ...
+| | [Teardown] | VAT disables tag-rewrite | ${node} | ${super_if}.${sub_if_id}
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_pop_1_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_push}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_push_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_push_VAT}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_translate_1_2}
+| | Then rewrite tag from Honeycomb should be
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | ... | ${tag_rewrite_translate_1_2_oper}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_translate_1_2_VAT}
+| | When Honeycomb configures tag rewrite
+| | ... | ${node} | ${super_if} | ${sub_if_id} | ${tag_rewrite_disabled}
+| | Then rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
+
+| Honeycomb fails to set wrong vlan-type in tag-rewrite
+| | [Documentation] | Check that Honeycomb does not accept wrong values of\
+| | ... | vlan-type in tag-rewrite.
+| | ...
+| | Given rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | When Honeycomb fails to set wrong rewrite tag
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | ... | ${tag_rewrite_translate_1_2_wrong}
+| | Then rewrite tag from Honeycomb should be empty
+| | ... | ${node} | ${super_if} | ${sub_if_id}
+| | And rewrite tag from VAT should be
+| | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
+
+*** Keywords ***
+| Set super and sub interfaces up
+| | [Documentation] | Honeycomb sets super-interface and sub-interface up, in\
+| | ... | this order.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super interface. Type: string
+| | ... | - identifier - Sub-interface identifier. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ... | \| Set super and sub interfaces up\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | Honeycomb sets interface state
+| | ... | ${node} | ${super_interface} | up
+| | Honeycomb sets the sub-interface up
+| | ... | ${node} | ${super_interface} | ${identifier}
+
+| Set super and sub interfaces down
+| | [Documentation] | Honeycomb sets super-interface and sub-interface down, in\
+| | ... | this order.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ... | - super_interface - Super interface. Type: string
+| | ... | - identifier - Sub-interface identifier. Type: integer or string
+| | ...
+| | ... | *Example:*
+| | ... | \| Set super and sub interfaces down\
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 1 \|
+| | ...
+| | [Arguments] | ${node} | ${super_interface} | ${identifier}
+| | ...
+| | Honeycomb sets interface state
+| | ... | ${node} | ${super_interface} | down
+| | Honeycomb sets the sub-interface down
+| | ... | ${node} | ${super_interface} | ${identifier}
diff --git a/tests/suites/honeycomb/8 - vxlan_gpe.robot b/tests/suites/honeycomb/8 - vxlan_gpe.robot
index 43d6b4bc04..0031a0a92d 100644
--- a/tests/suites/honeycomb/8 - vxlan_gpe.robot
+++ b/tests/suites/honeycomb/8 - vxlan_gpe.robot
@@ -60,7 +60,7 @@
| | ... | VxLAN GPE configuration from VAT should be
| | ... | ${node} | ${vxlan_gpe_if1} | ${vxlan_gpe_settings}
| | And run keyword and continue on failure
-| | ... | Interface indices should be the same from Honeycomb and VAT
+| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond
| | ... | ${node} | ${vxlan_gpe_if1}
| Honeycomb removes VxLAN GPE tunnel
@@ -149,7 +149,7 @@
| | ... | VxLAN GPE configuration from VAT should be
| | ... | ${node} | ${vxlan_gpe_if5} | ${vxlan_gpe_ipv6_settings}
| | And run keyword and continue on failure
-| | ... | Interface indices should be the same from Honeycomb and VAT
+| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond
| | ... | ${node} | ${vxlan_gpe_if5}
| Honeycomb creates the second VxLAN GPE tunnel with ipv6
@@ -171,5 +171,5 @@
| | ... | VxLAN GPE configuration from VAT should be
| | ... | ${node} | ${vxlan_gpe_if6} | ${vxlan_gpe_ipv6_settings2}
| | And run keyword and continue on failure
-| | ... | Interface indices should be the same from Honeycomb and VAT
+| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond
| | ... | ${node} | ${vxlan_gpe_if6}
diff --git a/tests/suites/honeycomb/resources/sub_interfaces.py b/tests/suites/honeycomb/resources/sub_interfaces.py
index 9c18984930..e4acd004ac 100644
--- a/tests/suites/honeycomb/resources/sub_interfaces.py
+++ b/tests/suites/honeycomb/resources/sub_interfaces.py
@@ -13,6 +13,62 @@
"""Test variables for Honeycomb sub-interface test suite."""
+# Sub-interface 1 and its settings:
+sub_if_1_settings = {
+ "identifier": "1",
+ "vlan-type": "802dot1q",
+ "enabled": "false"
+}
+
+sub_if_1_tags = [
+ {
+ "index": "0",
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": "100"
+ }
+ },
+ {
+ "index": "1",
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": "any"
+ }
+ }
+]
+
+sub_if_1_match = "vlan-tagged-exact-match"
+
+# Expected operational data: sub-interface.
+sub_if_1_oper = {
+ "identifier": 1,
+ "oper-status": "down",
+ "admin-status": "down",
+ "tags": {
+ "tag": [
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": "any"
+ }
+ },
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": "100"
+ }
+ }
+ ]
+ },
+ "match": {
+ "vlan-tagged": {
+ "match-exact-tags": False
+ }
+ }
+}
+
# Bridge domain name.
bd_name = 'test-sub-bd'
@@ -25,76 +81,197 @@ bd_settings = {
'arp-termination': True
}
-# Bridge domain configuration used while adding the bridge domain to a
-# sub-interface.
+# Bridge domain configuration used while adding the sub-interface to the bridge
+# domain.
sub_bd_settings = {
'bridge-domain': bd_name,
- 'split-horizon-group': '0',
- 'bridged-virtual-interface': 'False'
+ 'split-horizon-group': 1,
+ 'bridged-virtual-interface': False
}
-# Rewrite tag parameters used while setting the rewrite tag.
-rw_params = {
- 'rewrite-operation': 'pop-1',
- 'first-pushed': '802dot1ad',
- 'tag1': '1',
- 'tag2': '2'
+# Configuration data: Enable tag-rewrite push.
+tag_rewrite_push = {
+ "vlan-type": "vpp-vlan:802dot1q",
+ "push-tags": [
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id":123
+ }
+ },
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": 456
+ }
+ }
+ ]
}
-# Rewrite tag parameters used while editing the rewrite tag.
-rw_params_edited = {
- 'rewrite-operation': 'push-1',
- 'first-pushed': '802dot1q',
- 'tag1': '12',
- 'tag2': '22'
+# Expected operational data: tag-rewrite push.
+tag_rewrite_push_oper = {
+ "vlan-type": "vpp-vlan:802dot1q",
+ "push-tags": [
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": 456
+ }
+ },
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": 123
+ }
+ }
+ ]
}
-# Rewrite tag parameters when it is disabled.
-rw_params_disabled = {
- 'rewrite-operation': 'disabled',
- 'first-pushed': '802dot1ad'
+# Expected VAT data: tag-rewrite push.
+tag_rewrite_push_VAT = {
+ 'sub_default': 0,
+ 'sub_dot1ad': 0,
+ 'sub_exact_match': 0,
+ 'sub_inner_vlan_id': 0,
+ 'sub_inner_vlan_id_any': 1,
+ 'sub_number_of_tags': 2,
+ 'sub_outer_vlan_id': 100,
+ 'sub_outer_vlan_id_any': 0,
+ 'vtr_op': 2,
+ 'vtr_push_dot1q': 1,
+ 'vtr_tag1': 123,
+ 'vtr_tag2': 456
}
-# Rewrite tag parameters - wrong value of 'rewrite-operation' parameter.
-# Used in negative test.
-rw_params_wrong_op = {
- 'rewrite-operation': 'WRONG_OP',
- 'first-pushed': '802dot1q',
- 'tag1': '1',
- 'tag2': '2'
+# Configuration data: Enable tag-rewrite pop 1.
+tag_rewrite_pop_1 = {
+ "pop-tags": "1"
}
-# Rewrite tag parameters - wrong value of 'first-pushed' parameter.
-# Used in negative test.
-rw_params_wrong_pushed = {
- 'rewrite-operation': 'pop-1',
- 'first-pushed': 'WRONG_PUSHED',
- 'tag1': '1',
- 'tag2': '2'
+# Expected operational data: tag-rewrite pop 1.
+tag_rewrite_pop_1_oper = {
+ "vlan-type": "vpp-vlan:802dot1ad",
+ "pop-tags": 1
}
-# Second bridge domain name.
-bd2_name = 'test-sub-bd2'
-sub2_bd_settings = {
- 'bridge-domain': bd2_name,
- 'split-horizon-group': '0',
- 'bridged-virtual-interface': 'False'
+# Expected VAT data: tag-rewrite pop 1.
+tag_rewrite_pop_1_VAT = {
+ 'sub_default': 0,
+ 'sub_dot1ad': 0,
+ 'sub_exact_match': 0,
+ 'sub_inner_vlan_id': 0,
+ 'sub_inner_vlan_id_any': 1,
+ 'sub_number_of_tags': 2,
+ 'sub_outer_vlan_id': 100,
+ 'sub_outer_vlan_id_any': 0,
+ 'vtr_op': 3,
+ 'vtr_push_dot1q': 0,
+ 'vtr_tag1': 0,
+ 'vtr_tag2': 0
}
-# Second bridge domain configuration used while adding the bridge domain to a
-# sub-interface.
-bd2_settings = {
- 'flood': True,
- 'forward': True,
- 'learn': True,
- 'unknown-unicast-flood': True,
- 'arp-termination': True
+# Configuration data: Enable tag-rewrite translate 1-2.
+tag_rewrite_translate_1_2 = {
+ "vlan-type": "vpp-vlan:802dot1q",
+ "pop-tags": "1",
+ "push-tags": [
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": 111
+ }
+ },
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": 222
+ }
+ }
+ ]
+}
+
+# Expected operational data: tag-rewrite translate 1-2.
+tag_rewrite_translate_1_2_oper = {
+ "vlan-type": "vpp-vlan:802dot1q",
+ "pop-tags": 1,
+ "push-tags": [
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": 222
+ }
+ },
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": 111
+ }
+ }
+ ]
+}
+
+# Expected VAT data: tag-rewrite translate 1-2.
+tag_rewrite_translate_1_2_VAT = {
+ 'sub_default': 0,
+ 'sub_dot1ad': 0,
+ 'sub_exact_match': 0,
+ 'sub_inner_vlan_id': 0,
+ 'sub_inner_vlan_id_any': 1,
+ 'sub_number_of_tags': 2,
+ 'sub_outer_vlan_id': 100,
+ 'sub_outer_vlan_id_any': 0,
+ 'vtr_op': 6,
+ 'vtr_push_dot1q': 1,
+ 'vtr_tag1': 111,
+ 'vtr_tag2': 222
+}
+
+# Configuration data: Disable tag-rewrite.
+tag_rewrite_disabled = {}
+
+# Expected VAT data: Disable tag-rewrite.
+tag_rewrite_disabled_VAT = {
+ 'sub_default': 0,
+ 'sub_dot1ad': 0,
+ 'sub_exact_match': 0,
+ 'sub_inner_vlan_id': 0,
+ 'sub_inner_vlan_id_any': 1,
+ 'sub_number_of_tags': 2,
+ 'sub_outer_vlan_id': 100,
+ 'sub_outer_vlan_id_any': 0,
+ 'vtr_op': 0,
+ 'vtr_push_dot1q': 0,
+ 'vtr_tag1': 0,
+ 'vtr_tag2': 0
}
-# Parameters of a bridge domain with rewrite tag.
-bd_rw_settings = {
- 'bridge-domain': bd2_name,
- 'split-horizon-group': '0',
- 'bridged-virtual-interface': 'False',
- 'vlan-tag-rewrite': rw_params
+# Configuration data:
+# Wrong vlan-type for enable tag-rewrite translate 1-2.
+tag_rewrite_translate_1_2_wrong = {
+ "vlan-type": "vpp-vlan:WRONG",
+ "pop-tags": "1",
+ "push-tags": [
+ {
+ "index": 0,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:s-vlan",
+ "vlan-id": 111
+ }
+ },
+ {
+ "index": 1,
+ "dot1q-tag": {
+ "tag-type": "dot1q-types:c-vlan",
+ "vlan-id": 222
+ }
+ }
+ ]
}
diff --git a/tests/suites/honeycomb/resources/vxlan_gpe.py b/tests/suites/honeycomb/resources/vxlan_gpe.py
index 7f219f93b6..308cd0a316 100644
--- a/tests/suites/honeycomb/resources/vxlan_gpe.py
+++ b/tests/suites/honeycomb/resources/vxlan_gpe.py
@@ -43,7 +43,7 @@ vxlan_gpe_wrong_type_base_settings = {
'name': vxlan_gpe_if2,
'type': 'iana-if-type:ethernetCsmacd',
'description': 'for testing purposes',
- 'enabled': 'true',
+ 'enabled': True,
'link-up-down-trap-enable': 'enabled'
}
@@ -69,7 +69,7 @@ vxlan_gpe_if5 = 'vxlan_gpe_tunnel0'
vxlan_gpe_base_ipv6_settings = {
'name': vxlan_gpe_if5,
'description': 'for testing purposes',
- 'enabled': 'true',
+ 'enabled': True,
'link-up-down-trap-enable': 'enabled'
}
vxlan_gpe_ipv6_settings = {
@@ -86,7 +86,7 @@ vxlan_gpe_if6 = 'vxlan_gpe_tunnel1'
vxlan_gpe_base_ipv6_settings2 = {
'name': vxlan_gpe_if6,
'description': 'for testing purposes',
- 'enabled': 'true',
+ 'enabled': True,
'link-up-down-trap-enable': 'enabled'
}
vxlan_gpe_ipv6_settings2 = {