X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fcrypto%2Fipsec.robot;h=d5966a6cf5ed2c9c3788cbe242f04a11d935b639;hb=c58cba70baa74588619018a2e8b461592bff1bf4;hp=74a1a53f254672c5a42bc056c154206d90c5251d;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git

diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot
index 74a1a53f25..d5966a6cf5 100644
--- a/resources/libraries/robot/crypto/ipsec.robot
+++ b/resources/libraries/robot/crypto/ipsec.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -12,19 +12,17 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
+| Library | String
+| Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.IPsecUtil
+| Library | resources.libraries.python.IPUtil
+| Library | resources.libraries.python.IPv6Util
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.TrafficScriptExecutor
-| Library | resources.libraries.python.IPv4Util.IPv4Util
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.Routing
-| Library | String
-| Library | resources.libraries.python.IPv6Util
-| Library | resources.libraries.python.IPv6Setup
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ...     | WITH NAME | dut1_v4
-| Documentation | *IPsec keywords.*
+| ...
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Documentation | IPsec keywords
 
 *** Keywords ***
 | Generate keys for IPSec
@@ -42,7 +40,9 @@
 | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
 | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
 | | ... | \| Generate keys for IPSec \| ${encr_alg} \| ${auth_alg} \|
+| | ...
 | | [Arguments] | ${crypto_alg} | ${integ_alg}
+| | ...
 | | ${encr_key_len}= | Get Crypto Alg Key Len | ${crypto_alg}
 | | ${encr_key}= | Generate Random String | ${encr_key_len}
 | | ${auth_key_len}= | Get Integ Alg Key Len | ${integ_alg}
@@ -54,33 +54,16 @@
 | | [Documentation] | Setup path for IPsec testing TG<-->DUT1.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_if - TG interface connected to DUT. Type: string
-| | ... | - tg_if_mac - TG interface MAC. Type: string
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - dut_if - DUT interface connected to TG. Type: string
-| | ... | - dut_if_mac - DUT interface MAC. Type: string
 | | ... | - dut_lo - DUT loopback interface. Type: string
 | | ...
 | | ... | *Example:*
 | | ... | \| Configure path for IPSec test \|
-| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']}
-| | Compute Path
-| | ${tg_if} | ${tg_node}= | Next Interface
-| | ${dut_if} | ${dut_node}= | Next Interface
-| | ${dut_if_mac}= | Get Interface Mac | ${dut_node} | ${dut_if}
-| | ${tg_if_mac}= | Get Interface Mac | ${tg_node} | ${tg_if}
-| | ${dut_lo}= | Vpp Create Loopback | ${dut_node}
-| | Set Interface State | ${dut_node} | ${dut_if} | up
-| | Set Interface State | ${dut_node} | ${dut_lo} | up
-| | Vpp Node Interfaces Ready Wait | ${dut_node}
-| | Set Test Variable | ${tg_node}
-| | Set Test Variable | ${tg_if}
-| | Set Test Variable | ${tg_if_mac}
-| | Set Test Variable | ${dut_node}
-| | Set Test Variable | ${dut_if}
-| | Set Test Variable | ${dut_if_mac}
-| | Set Test Variable | ${dut_lo}
+| | ...
+| | ${dut1_lo1}= | Vpp Create Loopback | ${dut1}
+| | Set Interface State | ${dut1} | ${dut1_if1} | up
+| | Set Interface State | ${dut1} | ${dut1_lo1} | up
+| | Vpp Node Interfaces Ready Wait | ${dut1}
+| | Set Test Variable | ${dut1_lo1}
 
 | Configure topology for IPv4 IPsec testing
 | | [Documentation] | Setup topology for IPv4 IPsec testing.
@@ -93,14 +76,17 @@
 | | ...
 | | ... | *Example:*
 | | ... | \| Configure topology for IPv4 IPsec testing \|
+| | ...
 | | Configure path for IPSec test
-| | Set Interface Address | ${dut_node} | ${dut_if} | ${dut_if_ip4}
-| | ... | ${ip4_plen}
-| | Set Interface Address | ${dut_node} | ${dut_lo} | ${dut_lo_ip4}
-| | ... | ${ip4_plen}
-| | dut1_v4.Set Arp | ${dut_if} | ${tg_if_ip4} | ${tg_if_mac}
-| | Vpp Route Add | ${dut_node} | ${tg_lo_ip4} | ${ip4_plen} | ${tg_if_ip4}
-| | ... | ${dut_if}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${dut1_if1} | ${dut_if_ip4} | ${ip4_plen}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${dut1_lo1} | ${dut_lo_ip4} | ${ip4_plen}
+| | VPP Add IP Neighbor
+| | ... | ${dut1} | ${dut1_if1} | ${tg_if_ip4} | ${tg_if1_mac}
+| | Vpp Route Add
+| | ... | ${dut1} | ${tg_lo_ip4} | ${ip4_plen} | gateway=${tg_if_ip4}
+| | ... | interface=${dut1_if1}
 | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip4}
 | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip4}
 | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip4}
@@ -117,13 +103,18 @@
 | | ...
 | | ... | *Example:*
 | | ... | \| Configure topology for IPv6 IPsec testing \|
+| | ...
 | | Configure path for IPSec test
-| | VPP Set If IPv6 Addr | ${dut_node} | ${dut_if} | ${dut_if_ip6} | ${ip6_plen}
-| | VPP Set If IPv6 Addr | ${dut_node} | ${dut_lo} | ${dut_lo_ip6} | ${ip6_plen}
-| | Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip6} | ${tg_if_mac}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${dut1_if1} | ${dut_if_ip6} | ${ip6_plen}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${dut1_lo1} | ${dut_lo_ip6} | ${ip6_plen}
+| | VPP Add IP Neighbor
+| | ... | ${dut1} | ${dut1_if1} | ${tg_if_ip6} | ${tg_if1_mac}
 | | Vpp All RA Suppress Link Layer | ${nodes}
-| | Vpp Route Add | ${dut_node} | ${tg_lo_ip6} | ${ip6_plen_rt} | ${tg_if_ip6}
-| | ... | ${dut_if}
+| | Vpp Route Add
+| | ... | ${dut1} | ${tg_lo_ip6} | ${ip6_plen_rt} | gateway=${tg_if_ip6}
+| | ... | interface=${dut1_if1}
 | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip6}
 | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip6}
 | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip6}
@@ -157,9 +148,12 @@
 | | ... | \| GigabitEthernet0/8/0 \| ${encr_alg} \| sixteenbytes_key \
 | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1000} \| ${1001} \
 | | ... | \| 192.168.4.4 \| 192.168.3.3 \| 192.168.100.3 \| 192.168.100.2 \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${crypto_alg} | ${crypto_key}
 | | ... | ${integ_alg} | ${integ_key} | ${l_spi} | ${r_spi} | ${l_ip}
 | | ... | ${r_ip} | ${l_tunnel}=${None} | ${r_tunnel}=${None}
+| | ... | ${is_ipv6}=${FALSE}
+| | ...
 | | Set Test Variable | ${l_sa_id} | ${10}
 | | Set Test Variable | ${r_sa_id} | ${20}
 | | ${spd_id}= | Set Variable | ${1}
@@ -174,38 +168,20 @@
 | | VPP IPsec Add SPD | ${node} | ${spd_id}
 | | VPP IPsec SPD Add If | ${node} | ${spd_id} | ${interface}
 | | ${action}= | Policy Action Bypass
-| | VPP IPsec SPD Add Entry | ${node} | ${spd_id} | ${p_hi} | ${action}
-| | ... | inbound=${TRUE} | proto=${ESP_PROTO}
-| | VPP IPsec SPD Add Entry | ${node} | ${spd_id} | ${p_hi} | ${action}
-| | ... | inbound=${FALSE} | proto=${ESP_PROTO}
+| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_hi} | ${action}
+| | ... | inbound=${TRUE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6}
+| | ... | laddr_range=${tg_tun_ip} | raddr_range=${dut_tun_ip}
+| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_hi} | ${action}
+| | ... | inbound=${FALSE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6}
+| | ... | laddr_range=${dut_tun_ip} | raddr_range=${tg_tun_ip}
 | | ${action}= | Policy Action Protect
-| | VPP IPsec SPD Add Entry | ${node} | ${spd_id} | ${p_lo} | ${action}
+| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_lo} | ${action}
 | | ... | sa_id=${r_sa_id} | laddr_range=${l_ip}
 | | ... | raddr_range=${r_ip} | inbound=${TRUE}
-| | VPP IPsec SPD Add Entry | ${node} | ${spd_id} | ${p_lo} | ${action}
+| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_lo} | ${action}
 | | ... | sa_id=${l_sa_id} | laddr_range=${l_ip}
 | | ... | raddr_range=${r_ip} | inbound=${FALSE}
 
-| Update IPSec SA keys
-| | [Documentation] | Update IPsec SA keys on VPP node.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - VPP node to update SA keys. Type: dictionary
-| | ... | - l_sa_id - Local SA ID. Type: string
-| | ... | - r_sa_id - Remote SA ID. Type: string
-| | ... | - crypto_key - Encryption key. Type: string
-| | ... | - integ_key - Integrity key. Type: string
-| | ...
-| | ... | *Example:*
-| | ... | \| Update IPSec SA keys \| ${nodes['DUT1']} \
-| | ... | \| 10 \| 20 \| sixteenbytes_key \| twentybytessecretkey \|
-| | [Arguments] | ${node} | ${l_sa_id} | ${r_sa_id} | ${crypto_key}
-| | ... | ${integ_key}
-| | VPP IPsec SA Set Key | ${dut_node} | ${l_sa_id} | ${crypto_key}
-| | ... | ${integ_key}
-| | VPP IPsec SA Set Key | ${dut_node} | ${r_sa_id} | ${crypto_key}
-| | ... | ${integ_key}
-
 | Send IPsec Packet and verify ESP encapsulation in received packet
 | | [Documentation] | Send IPsec packet from TG to DUT. Receive IPsec packet\
 | | ... | from DUT on TG and verify ESP encapsulation.
@@ -233,10 +209,12 @@
 | | ... | \| 52:54:00:d4:d8:22 \| ${encr_alg} \| sixteenbytes_key \
 | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1001} \| ${1000} \
 | | ... | \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \| 192.168.100.3 \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${dst_mac} | ${crypto_alg}
 | | ... | ${crypto_key} | ${integ_alg} | ${integ_key} | ${l_spi}
 | | ... | ${r_spi} | ${l_ip} | ${r_ip} | ${l_tunnel}=${None}
 | | ... | ${r_tunnel}=${None}
+| | ...
 | | ${src_mac}= | Get Interface Mac | ${node} | ${interface}
 | | ${if_name}= | Get Interface Name | ${node} | ${interface}
 | | ${args}= | Traffic Script Gen Arg | ${if_name} | ${if_name} | ${src_mac}
@@ -251,30 +229,3 @@
 | | ${args}= | Set Variable If | "${r_tunnel}" == "${None}" | ${args}
 | | ... | ${args} --dst_tun ${r_tunnel}
 | | Run Traffic Script On Node | ipsec.py | ${node} | ${args}
-
-| Set up IPv4 IPSec functional test
-| | [Documentation]
-| | ... | Set up IPv4 IPSec functional test
-| | ...
-| | Set up functional test
-| | Configure topology for IPv4 IPsec testing
-
-| Set up IPv6 IPSec functional test
-| | [Documentation]
-| | ... | Set up IPv6 IPSec functional test
-| | ...
-| | Set up functional test
-| | Configure topology for IPv6 IPsec testing
-
-| Tear down IPSec functional test
-| | [Documentation]
-| | ... | Tear down IPSec functional test
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down IPSec functional test \| ${dut_node} \|
-| | ...
-| | [Arguments] | ${dut_node}
-| | ...
-| | VPP IPsec Show | ${dut_node}
-| | Tear down functional test