From 0d30d69d515130098eab5d21d8dd59c21400a433 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 22 Feb 2021 14:43:46 +0100 Subject: Ipsec: Always generate ikey Some tests use a crypto algorithm with no integrity algorithm. Generate empty binary strings as fake integrity keys to keep return values of low level methods consistent. + Add return_keys argument to avoid returning long lists. + Improve various docstrings. Change-Id: Idae1877bdde32d194ce4e3bb3053c8dba39d377a Signed-off-by: Vratko Polak --- ...hip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot | 10 +++++----- ...thip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/vpp/device/crypto') diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot index 4338fa35b5..27451b138e 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -84,15 +84,15 @@ | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | And Initialize IPSec in 2-node circular topology -| | ${encr_key} | ${auth_key} | ${dut_spi} | ${tg_spi} = +| | ${encr_keys} | ${auth_keys} | ${dut_spi} | ${tg_spi} = | | ... | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${tun_if1_ip4} | ${tun_if2_ip4} | ${DUT1_${int}2}[0] | | ... | ${TG_pf2}[0] | ${n_tunnels} | ${encr_alg} | ${auth_alg} -| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} | return_keys=${True} | | Then Send IP Packet and verify ESP encapsulation in received packet | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] | ${DUT1_${int}1_mac}[0] -| | ... | ${DUT1_${int}2_mac}[0] | ${encr_alg} | ${encr_key} | ${auth_alg} -| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${laddr_ip4} | ${raddr_ip4} +| | ... | ${DUT1_${int}2_mac}[0] | ${encr_alg} | ${encr_keys}[0] | ${auth_alg} +| | ... | ${auth_keys}[0] | ${dut_spi} | ${tg_spi} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${tun_if1_ip4} | ${tun_if2_ip4} *** Test Cases *** diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot index f8ab71565b..e5203ca42b 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -84,15 +84,15 @@ | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | And Initialize IPSec in 2-node circular topology -| | ${encr_key} | ${auth_key} | ${dut_spi} | ${tg_spi} = +| | ${encr_keys} | ${auth_keys} | ${dut_spi} | ${tg_spi} = | | ... | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${tun_if1_ip4} | ${tun_if2_ip4} | ${DUT1_${int}2}[0] | | ... | ${TG_pf2}[0] | ${n_tunnels} | ${encr_alg} | ${auth_alg} -| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} | return_keys=${True} | | Then Send IP Packet and verify ESP encapsulation in received packet | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] | ${DUT1_${int}1_mac}[0] -| | ... | ${DUT1_${int}2_mac}[0] | ${encr_alg} | ${encr_key} | ${auth_alg} -| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${laddr_ip4} | ${raddr_ip4} +| | ... | ${DUT1_${int}2_mac}[0] | ${encr_alg} | ${encr_keys}[0] | ${auth_alg} +| | ... | ${auth_keys}[0] | ${dut_spi} | ${tg_spi} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${tun_if1_ip4} | ${tun_if2_ip4} | | And Show Ipsec Security Association | ${dut1} -- cgit 1.2.3-korg