diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2016-08-22 10:32:50 +0200 |
|---|---|---|
| committer |   Matej Klotton <mklotton@cisco.com> | 2016-08-23 12:38:22 +0000 |
| commit | dc5e3431c0f50ec0c4df4c9c6ae4427258580613 (patch) | |
| tree | 166f47bf122381e6b64757b105f7fb558d7e3d74 | |
| parent | cccb893cb175ad29c192abd5e406f6a2bfea18db (diff) | |
Small fixies in IPSEC resources
Change-Id: I06e4000d93a86d885200ef1d0dd9b00e520ba77f
Signed-off-by: Jan Gelety <jgelety@cisco.com>
| -rw-r--r-- | resources/libraries/python/IPsecUtil.py | 14 | ||||
| -rw-r--r-- | resources/libraries/robot/ipsec.robot | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index fc3f8874ae..2cb8e2646b 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -36,7 +36,7 @@ class PolicyAction(Enum): class CryptoAlg(Enum): """Encryption algorithms.""" AES_CBC_128 = ('aes-cbc-128', 'AES-CBC', 16) - AES_CBC_192 = ('aes-cbc-128', 'AES-CBC', 24) + AES_CBC_192 = ('aes-cbc-192', 'AES-CBC', 24) AES_CBC_256 = ('aes-cbc-256', 'AES-CBC', 32) def __init__(self, alg_name, scapy_name, key_len): @@ -258,7 +258,7 @@ class IPsecUtil(object): @staticmethod def vpp_ipsec_spd_add_if(node, spd_id, interface): - """Add interface to the SPD. + """Add interface to the Security Policy Database. :param node: VPP node. :param spd_id: SPD ID to add interface on. @@ -299,9 +299,9 @@ class IPsecUtil(object): format IP/prefix or IP/mask. If no mask is provided, it's considered to be /32. :param proto: Policy selector next layer protocol number. - :param lport_range: Policy selector local TCP/UDP port range in foramt + :param lport_range: Policy selector local TCP/UDP port range in format <port_start>-<port_end>. - :param rport_range: Policy selector remote TCP/UDP port range in foramt + :param rport_range: Policy selector remote TCP/UDP port range in format <port_start>-<port_end>. :type node: dict :type spd_id: int @@ -311,13 +311,11 @@ class IPsecUtil(object): :type sa_id: int :type laddr_range: string :type raddr_range: string - :type proto: int + :type proto: intPolicyAction :type lport_range: string :type rport_range: string """ - direction = 'outbound' - if inbound: - direction = 'inbound' + direction = 'inbound' if inbound else 'outbound' act_str = action.value if PolicyAction.PROTECT == action and sa_id is not None: diff --git a/resources/libraries/robot/ipsec.robot b/resources/libraries/robot/ipsec.robot index cf7cc0f6c0..b393fa6249 100644 --- a/resources/libraries/robot/ipsec.robot +++ b/resources/libraries/robot/ipsec.robot @@ -149,7 +149,7 @@ | | ... | *Example:* | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \| | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \| -| | ... | \| Setup IPsec Manual Keyed Connection \| ${nodes['DUT1']} \ +| | ... | \| VPP Setup IPsec Manual Keyed Connection \| ${nodes['DUT1']} \ | | ... | \| 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 \| |