X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPsecUtil.py;h=c109f417e50e745d632b803be9dd7f254b220d47;hb=ac37499ef8754d7ac8f6350ab80d389727bbcd03;hp=e7e79831bbdd12b96bd72cbaf40517e0fbececf9;hpb=dd6ca76e18898f97107b30b34a84bcae81aecfb3;p=csit.git diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index e7e79831bb..c109f417e5 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -22,7 +22,8 @@ from enum import Enum, IntEnum from ipaddress import ip_network, ip_address from resources.libraries.python.IPUtil import IPUtil -from resources.libraries.python.InterfaceUtil import InterfaceUtil +from resources.libraries.python.InterfaceUtil import InterfaceUtil, \ + InterfaceStatusFlags from resources.libraries.python.PapiExecutor import PapiSocketExecutor from resources.libraries.python.topology import Topology from resources.libraries.python.VatExecutor import VatExecutor @@ -518,23 +519,15 @@ class IPsecUtil(object): cmd1 = 'sw_interface_add_del_address' args1 = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), - is_add=1, - is_ipv6=1 if laddr.version == 6 else 0, - del_all=0, - address_length=raddr_range, - address=None + is_add=True, + del_all=False, + prefix=None ) cmd2 = 'ip_route_add_del' - route = IPUtil.compose_vpp_route_structure( - node, taddr, - prefix_len=128 if taddr.version == 6 else 32, - interface=interface, - gateway=tunnel_dst - ) args2 = dict( is_add=1, is_multipath=0, - route=route + route=None ) err_msg = 'Failed to configure IP addresses and IP routes on ' \ 'interface {ifc} on host {host}'.\ @@ -542,11 +535,15 @@ class IPsecUtil(object): with PapiSocketExecutor(node) as papi_exec: for i in xrange(n_tunnels): - args1['address'] = getattr(laddr + i * addr_incr, 'packed') - args2['route']['prefix']['address']['un'] = \ - IPUtil.union_addr(taddr + i) - args2['route']['paths'][0]['nh']['address'] = \ - IPUtil.union_addr(raddr + i * addr_incr) + args1['prefix'] = IPUtil.create_prefix_object( + laddr + i * addr_incr, raddr_range) + args2['route'] = IPUtil.compose_vpp_route_structure( + node, + taddr + i, + prefix_len=128 if taddr.version == 6 else 32, + interface=interface, + gateway=raddr + i * addr_incr + ) history = False if 1 < i < n_tunnels - 1 else True papi_exec.add(cmd1, history=history, **args1).\ add(cmd2, history=history, **args2) @@ -783,7 +780,7 @@ class IPsecUtil(object): :param if2_ip_addr: VPP node 2 interface IPv4/IPv6 address. :param if1_key: VPP node 1 interface key from topology file. :param if2_key: VPP node 2 interface key from topology file. - :param n_tunnels: Number of tunnell interfaces to create. + :param n_tunnels: Number of tunnel interfaces to create. :param crypto_alg: The encryption algorithm name. :param integ_alg: The integrity algorithm name. :param raddr_ip1: Policy selector remote IPv4/IPv6 start address for the @@ -815,7 +812,7 @@ class IPsecUtil(object): addr_incr = 1 << (128 - raddr_range) if if1_ip.version == 6 \ else 1 << (32 - raddr_range) - if n_tunnels > 1: + if n_tunnels > 10: tmp_fn1 = '/tmp/ipsec_create_tunnel_dut1.config' tmp_fn2 = '/tmp/ipsec_create_tunnel_dut2.config' vat = VatExecutor() @@ -954,7 +951,7 @@ class IPsecUtil(object): cmd1 = 'sw_interface_set_flags' args1 = dict( sw_if_index=loop_sw_if_idx, - admin_up_down=1) + flags=InterfaceStatusFlags.IF_STATUS_API_FLAG_ADMIN_UP.value) err_msg = 'Failed to set loopback interface state up on host ' \ '{host}'.format(host=nodes['DUT1']['host']) papi_exec.add(cmd1, **args1).get_reply(err_msg) @@ -963,22 +960,21 @@ class IPsecUtil(object): args1 = dict( sw_if_index=InterfaceUtil.get_interface_index( nodes['DUT1'], if1_key), - is_add=1, - is_ipv6=1 if if2_ip.version == 6 else 0, - del_all=0, - address_length=96 if if2_ip.version == 6 else 24, - address=getattr(if2_ip - 1, 'packed')) + is_add=True, + del_all=False, + prefix=IPUtil.create_prefix_object( + if2_ip - 1, 96 if if2_ip.version == 6 else 24) + ) err_msg = 'Failed to set IP address on interface {ifc} on host ' \ '{host}'.format(ifc=if1_key, host=nodes['DUT1']['host']) papi_exec.add(cmd1, **args1).get_reply(err_msg) # Configure IPsec tunnel interfaces args1 = dict( sw_if_index=loop_sw_if_idx, - is_add=1, - is_ipv6=1 if if1_ip.version == 6 else 0, - del_all=0, - address_length=128 if if1_ip.version == 6 else 32, - address='') + is_add=True, + del_all=False, + prefix=None + ) cmd2 = 'ipsec_tunnel_if_add_del' args2 = dict( is_add=1, @@ -1009,7 +1005,8 @@ class IPsecUtil(object): if integ_alg: ikeys.append( gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))) - args1['address'] = getattr(if1_ip + i * addr_incr, 'packed') + args1['prefix'] = IPUtil.create_prefix_object( + if1_ip + i * addr_incr, 128 if if1_ip.version == 6 else 32) args2['local_spi'] = spi_1 + i args2['remote_spi'] = spi_2 + i args2['local_ip'] = IPUtil.create_ip_address_object( @@ -1034,7 +1031,7 @@ class IPsecUtil(object): # Configure IP routes cmd1 = 'sw_interface_set_unnumbered' args1 = dict( - is_add=1, + is_add=True, sw_if_index=InterfaceUtil.get_interface_index( nodes['DUT1'], if1_key), unnumbered_sw_if_index=0 @@ -1042,27 +1039,24 @@ class IPsecUtil(object): cmd2 = 'sw_interface_set_flags' args2 = dict( sw_if_index=0, - admin_up_down=1) + flags=InterfaceStatusFlags.IF_STATUS_API_FLAG_ADMIN_UP.value) cmd3 = 'ip_route_add_del' - route = IPUtil.compose_vpp_route_structure( - nodes['DUT1'], raddr_ip2.compressed, - prefix_len=128 if raddr_ip2.version == 6 else 32, - interface=0 - ) args3 = dict( is_add=1, is_multipath=0, - route=route + route=None ) err_msg = 'Failed to add IP routes on host {host}'.format( host=nodes['DUT1']['host']) for i in xrange(n_tunnels): args1['unnumbered_sw_if_index'] = ipsec_tunnels[i] args2['sw_if_index'] = ipsec_tunnels[i] - args3['route']['prefix']['address']['un'] = \ - IPUtil.union_addr(raddr_ip2 + i) - args3['route']['paths'][0]['sw_if_index'] = \ - ipsec_tunnels[i] + args3['route'] = IPUtil.compose_vpp_route_structure( + nodes['DUT1'], + (raddr_ip2 + i).compressed, + prefix_len=128 if raddr_ip2.version == 6 else 32, + interface=ipsec_tunnels[i] + ) history = False if 1 < i < n_tunnels - 1 else True papi_exec.add(cmd1, history=history, **args1).\ add(cmd2, history=history, **args2).\ @@ -1075,11 +1069,11 @@ class IPsecUtil(object): args1 = dict( sw_if_index=InterfaceUtil.get_interface_index( nodes['DUT2'], if2_key), - is_add=1, - is_ipv6=1 if if2_ip.version == 6 else 0, - del_all=0, - address_length=96 if if2_ip.version == 6 else 24, - address=if2_ip.packed) + is_add=True, + del_all=False, + prefix=IPUtil.create_prefix_object( + if2_ip, 96 if if2_ip.version == 6 else 24) + ) err_msg = 'Failed to set IP address on interface {ifc} on host ' \ '{host}'.format(ifc=if2_key, host=nodes['DUT2']['host']) papi_exec.add(cmd1, **args1).get_reply(err_msg) @@ -1143,7 +1137,7 @@ class IPsecUtil(object): papi_exec.add(cmd1, **args1) cmd1 = 'sw_interface_set_unnumbered' args1 = dict( - is_add=1, + is_add=True, sw_if_index=InterfaceUtil.get_interface_index( nodes['DUT2'], if2_key), unnumbered_sw_if_index=0 @@ -1151,27 +1145,24 @@ class IPsecUtil(object): cmd2 = 'sw_interface_set_flags' args2 = dict( sw_if_index=0, - admin_up_down=1) + flags=InterfaceStatusFlags.IF_STATUS_API_FLAG_ADMIN_UP.value) cmd3 = 'ip_route_add_del' - route = IPUtil.compose_vpp_route_structure( - nodes['DUT2'], raddr_ip1.compressed, - prefix_len=128 if raddr_ip1.version == 6 else 32, - interface=0 - ) args3 = dict( is_add=1, is_multipath=0, - route=route + route=None ) err_msg = 'Failed to add IP routes on host {host}'.format( host=nodes['DUT2']['host']) for i in xrange(n_tunnels): args1['unnumbered_sw_if_index'] = ipsec_tunnels[i] args2['sw_if_index'] = ipsec_tunnels[i] - args3['route']['prefix']['address']['un'] = \ - IPUtil.union_addr(raddr_ip1 + i) - args3['route']['paths'][0]['sw_if_index'] = \ - ipsec_tunnels[i] + args3['route'] = IPUtil.compose_vpp_route_structure( + nodes['DUT1'], + (raddr_ip1 + i).compressed, + prefix_len=128 if raddr_ip1.version == 6 else 32, + interface=ipsec_tunnels[i] + ) history = False if 1 < i < n_tunnels - 1 else True papi_exec.add(cmd1, history=history, **args1). \ add(cmd2, history=history, **args2). \