X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPsecUtil.py;h=dd6ba181e8f5375ac1d8d9cf24b0b8903c47d554;hb=c8ea6f1fab0b77a0690548fbef825cf902ad4146;hp=16acb51234b7b3eda1d3aecd41c7608243f4c33f;hpb=141d5420a065734671ea17bbee8c4e927ae10dff;p=csit.git diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 16acb51234..dd6ba181e8 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -21,7 +21,6 @@ from string import letters from enum import Enum, IntEnum from ipaddress import ip_network, ip_address -from resources.libraries.python.Constants import Constants from resources.libraries.python.IPUtil import IPUtil from resources.libraries.python.InterfaceUtil import InterfaceUtil from resources.libraries.python.PapiExecutor import PapiSocketExecutor @@ -461,8 +460,6 @@ class IPsecUtil(object): if tunnel_src and tunnel_dst else dst_addr history = False if 1 < i < n_entries - 1 else True papi_exec.add(cmd, history=history, **args) - if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) @staticmethod @@ -528,16 +525,10 @@ class IPsecUtil(object): address=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}'.\ @@ -546,15 +537,16 @@ 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) + 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) - if i > 0 and i % Constants.PAPI_MAX_API_BULK / 2 == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) @staticmethod @@ -730,9 +722,9 @@ class IPsecUtil(object): raddr_s=raddr_s, raddr_e=raddr_e)) tmp_file.write(tunnel) - vat = VatExecutor() - vat.execute_script(tmp_filename, node, timeout=300, json_out=False, - copy_on_execute=True) + VatExecutor().execute_script( + tmp_filename, node, timeout=300, json_out=False, + copy_on_execute=True) os.remove(tmp_filename) return @@ -775,8 +767,6 @@ class IPsecUtil(object): IPUtil.union_addr(raddr_ip + i) history = False if 1 < i < n_entries - 1 else True papi_exec.add(cmd, history=history, **args) - if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) @staticmethod @@ -790,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 @@ -1034,11 +1024,6 @@ class IPsecUtil(object): history = False if 1 < i < n_tunnels - 1 else True papi_exec.add(cmd1, history=history, **args1).\ add(cmd2, history=history, **args2) - if i > 0 and i % Constants.PAPI_MAX_API_BULK / 2 == 0: - replies = papi_exec.get_replies(err_msg) - for reply in replies: - if 'sw_if_index' in reply: - ipsec_tunnels.append(reply["sw_if_index"]) replies = papi_exec.get_replies(err_msg) for reply in replies: if 'sw_if_index' in reply: @@ -1056,31 +1041,26 @@ class IPsecUtil(object): sw_if_index=0, admin_up_down=1) 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).\ add(cmd3, history=history, **args3) - if i > 0 and i % Constants.PAPI_MAX_API_BULK / 3 == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) with PapiSocketExecutor(nodes['DUT2']) as papi_exec: @@ -1137,11 +1117,6 @@ class IPsecUtil(object): args2['remote_integ_key'] = ikeys[i] history = False if 1 < i < n_tunnels - 1 else True papi_exec.add(cmd2, history=history, **args2) - if i > 0 and i % Constants.PAPI_MAX_API_BULK / 2 == 0: - replies = papi_exec.get_replies(err_msg) - for reply in replies: - if 'sw_if_index' in reply: - ipsec_tunnels.append(reply["sw_if_index"]) replies = papi_exec.get_replies(err_msg) for reply in replies: if 'sw_if_index' in reply: @@ -1172,31 +1147,26 @@ class IPsecUtil(object): sw_if_index=0, admin_up_down=1) 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). \ add(cmd3, history=history, **args3) - if i > 0 and i % Constants.PAPI_MAX_API_BULK / 3 == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) @staticmethod