From 13bc34ab5a07eff486a8a0d9a1cffa6cbc0b5dc5 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 12 Jul 2019 17:31:25 +0200 Subject: CSIT-1471: Migrate Dhcp library from VAT to PAPI Change-Id: Ibc9b9b736532cce31994537e632daa4d4e62459c Signed-off-by: Jan Gelety --- resources/libraries/python/Dhcp.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py index cd074c3702..e69ee0bcb8 100644 --- a/resources/libraries/python/Dhcp.py +++ b/resources/libraries/python/Dhcp.py @@ -14,7 +14,7 @@ """DHCP utilities for VPP.""" -from resources.libraries.python.VatExecutor import VatExecutor +from resources.libraries.python.PapiExecutor import PapiSocketExecutor class DhcpProxy(object): @@ -31,7 +31,12 @@ class DhcpProxy(object): :returns: DHCP relay data. :rtype: list """ + cmd = 'dhcp_proxy_dump' + args = dict(is_ip6=1 if ip_version == 'ipv6' else 0) + err_msg = 'Failed to get DHCP proxy dump on host {host}'.format( + host=node['host']) - return VatExecutor.cmd_from_template( - node, "dhcp_proxy_dump.vat", - ipv6="ipv6" if ip_version == "ipv6" else "") + with PapiSocketExecutor(node) as papi_exec: + details = papi_exec.add(cmd, **args).get_details(err_msg) + + return details -- cgit 1.2.3-korg