X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FNATUtil.py;h=f018d38335f54bdb9d4f5ceae554570c613f6c74;hb=fb2fb651fa600a94c2e02891db2676c66490e875;hp=5c0278db902cb694382ac0f98cbb6b91324bf020;hpb=33fb34665214bbbd0a4b3154169b21c2da01f69b;p=csit.git diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 5c0278db90..f018d38335 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -21,7 +21,7 @@ from enum import IntEnum from robot.api import logger from resources.libraries.python.InterfaceUtil import InterfaceUtil -from resources.libraries.python.PapiExecutor import PapiExecutor +from resources.libraries.python.PapiExecutor import PapiSocketExecutor class NATConfigFlags(IntEnum): @@ -65,7 +65,7 @@ class NATUtil(object): is_add=1, flags=getattr(NATConfigFlags, "NAT_IS_INSIDE").value ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) int_out_idx = InterfaceUtil.get_sw_if_index(node, int_out) @@ -76,7 +76,7 @@ class NATUtil(object): is_add=1, flags=getattr(NATConfigFlags, "NAT_IS_OUTSIDE").value ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) @staticmethod @@ -105,7 +105,7 @@ class NATUtil(object): out_addr=inet_pton(AF_INET, str(ip_out)), out_plen=int(subnet_out) ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) @staticmethod @@ -131,7 +131,7 @@ class NATUtil(object): cmd = 'nat_show_config' err_msg = 'Failed to get NAT configuration on host {host}'.\ format(host=node['host']) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: reply = papi_exec.add(cmd).get_reply(err_msg) logger.debug("NAT Configuration:\n{reply}".format(reply=pformat(reply))) @@ -145,4 +145,4 @@ class NATUtil(object): "nat44_user_session_dump", "nat_det_map_dump" ] - PapiExecutor.dump_and_log(node, cmds) + PapiSocketExecutor.dump_and_log(node, cmds)