diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 32 | ||||
| -rw-r--r-- | resources/libraries/python/VatExecutor.py | 21 | ||||
| -rw-r--r-- | resources/libraries/python/topology.py | 24 | ||||
| -rw-r--r-- | resources/libraries/robot/l2_traffic.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/vxlan.robot | 138 | ||||
| -rw-r--r-- | resources/templates/vat/create_vlan_subif.vat | 1 |
6 files changed, 165 insertions, 59 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 4631ccce7a..6526fe83ca 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -400,6 +400,38 @@ class InterfaceUtil(object): InterfaceUtil.update_tg_interface_data_on_node(node_data) @staticmethod + def create_vlan_subinterface(node, interface, vlan): + """Create VLAN subinterface on node. + + :param node: Node to add VLAN subinterface on. + :param interface: Interface name on which create VLAN subinterface. + :param vlan: VLAN ID of the subinterface to be created. + :type node: dict + :type interface: str + :type vlan: int + :return: Name and index of created subinterface. + :rtype: tuple + """ + sw_if_index = Topology.get_interface_sw_index(node, interface) + + output = VatExecutor.cmd_from_template(node, "create_vlan_subif.vat", + sw_if_index=sw_if_index, + vlan=vlan) + if output[0]["retval"] == 0: + sw_subif_index = output[0]["sw_if_index"] + logger.trace('VLAN subinterface with sw_if_index {} and VLAN ID {} ' + 'created on node {}'.format(sw_subif_index, + vlan, node['host'])) + else: + raise RuntimeError('Unable to create VLAN subinterface on node {}' + .format(node['host'])) + + with VatTerminal(node, False) as vat: + vat.vat_terminal_exec_cmd('exec show interfaces') + + return '{}.{}'.format(interface, vlan), sw_subif_index + + @staticmethod def create_vxlan_interface(node, vni, source_ip, destination_ip): """Create VXLAN interface and return sw if index of created interface. diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index 136b7cc0ef..9851d93edd 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -142,18 +142,25 @@ class VatTerminal(object): """VAT interactive terminal :param node: Node to open VAT terminal on. + :param json_param: Defines if outputs from VAT are in JSON format. + Default is True. + :type node: dict + :type json_param: bool + """ __VAT_PROMPT = "vat# " __LINUX_PROMPT = ":~$ " - def __init__(self, node): + def __init__(self, node, json_param=True): + json_text = ' json' if json_param else '' + self.json = json_param self._ssh = SSH() self._ssh.connect(node) self._tty = self._ssh.interactive_terminal_open() self._ssh.interactive_terminal_exec_command( self._tty, - 'sudo -S {vat} json'.format(vat=Constants.VAT_BIN_NAME), + 'sudo -S {}{}'.format(Constants.VAT_BIN_NAME, json_text), self.__VAT_PROMPT) def __enter__(self): @@ -167,15 +174,19 @@ class VatTerminal(object): :param cmd: Command to be executed. - :return: Command output in python representation of JSON format. + :return: Command output in python representation of JSON format or + None if not in JSON mode. """ logger.debug("Executing command in VAT terminal: {}".format(cmd)) out = self._ssh.interactive_terminal_exec_command(self._tty, cmd, self.__VAT_PROMPT) logger.debug("VAT output: {}".format(out)) - json_out = json.loads(out) - return json_out + if self.json: + json_out = json.loads(out) + return json_out + else: + return None def vat_terminal_close(self): """Close VAT terminal.""" diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index d04d584623..0f26d2c6e9 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -164,20 +164,22 @@ class Topology(object): @staticmethod def get_interface_sw_index(node, interface): - """Get VPP sw_index for the interface. + """Get VPP sw_if_index for the interface. - :param node: Node to get interface sw_index on. - :param interface: Interface name. + :param node: Node to get interface sw_if_index on. + :param interface: Interface identifier. :type node: dict - :type interface: str - :return: Return sw_index or None if not found. + :type interface: str or int + :return: Return sw_if_index or None if not found. """ - for port in node['interfaces'].values(): - port_name = port.get('name') - if port_name == interface: - return port.get('vpp_sw_index') - - return None + try: + return int(interface) + except ValueError: + for port in node['interfaces'].values(): + port_name = port.get('name') + if port_name == interface: + return port.get('vpp_sw_index') + return None @staticmethod def get_interface_mtu(node, interface): diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot index 2ba53d5821..bb66d9035d 100644 --- a/resources/libraries/robot/l2_traffic.robot +++ b/resources/libraries/robot/l2_traffic.robot @@ -27,3 +27,11 @@ | | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} + +| Send and receive ICMPv4 bidirectionally +| | [Documentation] | Send ICMPv4 echo request from both directions, +| | ... | from interface1 to interface2 and +| | ... | from interface2 to interface1. +| | [Arguments] | ${tg_node} | ${int1} | ${int2} +| | Send and receive ICMPv4 | ${tg_node} | ${int1} | ${int2} +| | Send and receive ICMPv4 | ${tg_node} | ${int2} | ${int1} diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot index 1f3b141470..ebf5d351ca 100644 --- a/resources/libraries/robot/vxlan.robot +++ b/resources/libraries/robot/vxlan.robot @@ -23,10 +23,22 @@ | Library | resources.libraries.python.IPv4Setup | Library | resources.libraries.python.NodePath - *** Keywords *** -| Setup VXLAN tunnel on nodes -| | [Arguments] | ${TG} | ${DUT1} | ${DUT2} | ${VNI} +| Path for VXLAN testing is set +| | [Documentation] | *Compute path for VXLAN testing on nodes.* +| | ... +| | ... | _Set testcase variables with interfaces and nodes:_ +| | ... | - ${tgs_to_dut1} +| | ... | - ${dut1s_to_tg} +| | ... | - ${tgs_to_dut2} +| | ... | - ${dut2s_to_tg} +| | ... | - ${dut1s_to_dut2} +| | ... | - ${dut2s_to_dut1} +| | ... | - ${tg} +| | ... | - ${dut1} +| | ... | - ${dut2} +| | ... +| | [Arguments] | ${TG} | ${DUT1} | ${DUT2} | | Append Nodes | ${TG} | ${DUT1} | ${DUT2} | ${TG} | | Compute Path | | ${tgs_to_dut1} | ${tg}= | Next Interface @@ -35,45 +47,85 @@ | | ${dut2s_to_dut1} | ${dut2}= | Next Interface | | ${dut2s_to_tg} | ${dut2}= | Next Interface | | ${tgs_to_dut2} | ${tg}= | Next Interface -| | Set Suite Variable | ${tgs_to_dut1} -| | Set Suite Variable | ${dut1s_to_tg} -| | Set Suite Variable | ${tgs_to_dut2} -| | Set Suite Variable | ${dut2s_to_tg} -| | Set Suite Variable | ${dut1s_to_dut2} -| | Set Suite Variable | ${dut2s_to_dut1} -# TODO: replace with address generator -| | Set Suite Variable | ${dut1s_ip_address} | 172.16.0.1 -| | Set Suite Variable | ${dut2s_ip_address} | 172.16.0.2 -| | Set Suite Variable | ${duts_ip_address_prefix} | 24 -| | Set Interface State | ${TG} | ${tgs_to_dut1} | up -| | Set Interface State | ${TG} | ${tgs_to_dut2} | up -| | ${vxlan_dut1}= | Setup VXLAN on DUT | ${DUT1} | ${VNI} | ${dut1s_ip_address} -| | ... | ${dut2s_ip_address} | ${dut1s_to_tg} -| | ... | ${dut1s_to_dut2} | ${dut1s_ip_address} -| | ... | ${duts_ip_address_prefix} -| | Set Suite Variable | ${vxlan_dut1} -| | ${vxlan_dut2}= | Setup VXLAN on DUT | ${DUT2} | ${VNI} | ${dut2s_ip_address} -| | ... | ${dut1s_ip_address} | ${dut2s_to_tg} -| | ... | ${dut2s_to_dut1} | ${dut2s_ip_address} -| | ... | ${duts_ip_address_prefix} -| | Set Suite Variable | ${vxlan_dut2} -| | @{test_nodes}= | Create list | ${DUT1} | ${DUT2} -| | Vpp Nodes Interfaces Ready Wait | ${test_nodes} -# ip arp table must be filled on both nodes with neighbors address -| | VPP IP Probe | ${DUT1} | ${dut1s_to_dut2} | ${dut2s_ip_address} +| | Set Test Variable | ${tgs_to_dut1} +| | Set Test Variable | ${dut1s_to_tg} +| | Set Test Variable | ${tgs_to_dut2} +| | Set Test Variable | ${dut2s_to_tg} +| | Set Test Variable | ${dut1s_to_dut2} +| | Set Test Variable | ${dut2s_to_dut1} +| | Set Test Variable | ${tg} +| | Set Test Variable | ${dut1} +| | Set Test Variable | ${dut2} + +| Interfaces in path are up +| | [Documentation] | *Set UP state on interfaces in path on nodes.* +| | ... +| | Set Interface State | ${tg} | ${tgs_to_dut1} | up +| | Set Interface State | ${tg} | ${tgs_to_dut2} | up +| | Set Interface State | ${dut1} | ${dut1s_to_tg} | up +| | Set Interface State | ${dut1} | ${dut1s_to_dut2} | up +| | Set Interface State | ${dut2} | ${dut2s_to_tg} | up +| | Set Interface State | ${dut2} | ${dut2s_to_dut1} | up +| | Vpp Node Interfaces Ready Wait | ${dut1} +| | Vpp Node Interfaces Ready Wait | ${dut2} + +| IP addresses are set on interfaces +| | [Documentation] | *Set IPv4 addresses on interfaces on DUTs.* +| | ... | If interface index is None then is determines with Get Interface Sw Index +| | ... | It also executes VPP IP Probe to determine MACs to IPs on DUTs +| | ... +| | ... | _Set testcase variables with IP addresses and prefix length:_ +| | ... | - ${dut1s_ip_address} +| | ... | - ${dut2s_ip_address} +| | ... | - ${duts_ip_address_prefix} +| | ... +| | [Arguments] | ${DUT1} | ${DUT1_INT_NAME} | ${DUT1_INT_INDEX} +| | ... | ${DUT2} | ${DUT2_INT_NAME} | ${DUT2_INT_INDEX} +| | Set Test Variable | ${dut1s_ip_address} | 172.16.0.1 +| | Set Test Variable | ${dut2s_ip_address} | 172.16.0.2 +| | Set Test Variable | ${duts_ip_address_prefix} | 24 +| | ${DUT1_INT_INDEX}= | Run Keyword If | ${DUT1_INT_INDEX} is None +| | | ... | Get Interface Sw Index | ${DUT1} | ${DUT1_INT_NAME} +| | | ... | ELSE | Set Variable | ${DUT1_INT_INDEX} +| | ${DUT2_INT_INDEX}= | Run Keyword If | ${DUT2_INT_INDEX} is None +| | | ... | Get Interface Sw Index | ${DUT2} | ${DUT2_INT_NAME} +| | | ... | ELSE | Set Variable | ${DUT2_INT_INDEX} +| | Set Interface Address | ${DUT1} | ${DUT1_INT_INDEX} +| | ... | ${dut1s_ip_address} | ${duts_ip_address_prefix} +| | Set Interface Address | ${DUT2} | ${DUT2_INT_INDEX} +| | ... | ${dut2s_ip_address} | ${duts_ip_address_prefix} +| | VPP IP Probe | ${DUT1} | ${DUT1_INT_NAME} | ${dut2s_ip_address} +| | VPP IP Probe | ${DUT2} | ${DUT2_INT_NAME} | ${dut1s_ip_address} + +| VXLAN interface is created +| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} +| | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} + +| Interfaces are added to BD +| | [Arguments] | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} +| | Vpp Add L2 Bridge Domain | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} -| Setup DUT for VXLAN using BD -| | [Arguments] | ${DUT} | ${VNI} | ${INGRESS} | ${vxlan_if_index} -| | Create L2 BD | ${DUT} | ${VNI} -| | Add sw if index To L2 BD | ${DUT} | ${vxlan_if_index} | ${VNI} -| | Add Interface To L2 BD | ${DUT} | ${INGRESS} | ${VNI} +| Interfaces are added to xconnect +| | [Arguments] | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2} +| | L2 setup xconnect on DUT | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2} -| Setup VXLAN on DUT -| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} | ${INGRESS} -| | ... | ${EGRESS} | ${IP} | ${PREFIX} -| | Set Interface State | ${DUT} | ${EGRESS} | up -| | Set Interface State | ${DUT} | ${INGRESS} | up -| | Set Interface Address | ${DUT} | ${EGRESS} | ${IP} | ${PREFIX} -| | ${vxlan_if_index}= | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} -| | ... | ${DST_IP} -| | [Return] | ${vxlan_if_index} +| Vlan interfaces for VXLAN are created +| | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given VLAN ID.* +| | ... +| | ... | _Set testcase variables with name and index of created interfaces:_ +| | ... | - ${dut1s_vlan_name} +| | ... | - ${dut1s_vlan_index} +| | ... | - ${dut2s_vlan_name} +| | ... | - ${dut2s_vlan_index} +| | ... +| | [Arguments] | ${VLAN} | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} +| | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface +| | | ... | ${DUT1} | ${INT1} | ${VLAN} +| | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface +| | | ... | ${DUT2} | ${INT2} | ${VLAN} +| | Set Interface State | ${DUT1} | ${dut1s_vlan_index} | up +| | Set Interface State | ${DUT2} | ${dut2s_vlan_index} | up +| | Set Test Variable | ${dut1s_vlan_name} +| | Set Test Variable | ${dut1s_vlan_index} +| | Set Test Variable | ${dut2s_vlan_name} +| | Set Test Variable | ${dut2s_vlan_index} diff --git a/resources/templates/vat/create_vlan_subif.vat b/resources/templates/vat/create_vlan_subif.vat new file mode 100644 index 0000000000..6520aef911 --- /dev/null +++ b/resources/templates/vat/create_vlan_subif.vat @@ -0,0 +1 @@ +create_vlan_subif sw_if_index {sw_if_index} vlan {vlan}
\ No newline at end of file |