Python3: resources and libraries

[csit.git] / resources / libraries / python / Dhcp.py

diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py
index cd074c3..ec2c895 100644 (file)
--- a/resources/libraries/python/Dhcp.py
+++ b/resources/libraries/python/Dhcp.py
@@ -14,10 +14,10 @@
 """DHCP utilities for VPP."""
 
 
-from resources.libraries.python.VatExecutor import VatExecutor
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 
 
-class DhcpProxy(object):
+class DhcpProxy:
     """DHCP Proxy utilities."""
 
     @staticmethod
@@ -31,7 +31,11 @@ class DhcpProxy(object):
         :returns: DHCP relay data.
         :rtype: list
         """
+        cmd = u"dhcp_proxy_dump"
+        args = dict(is_ip6=1 if ip_version == u"ipv6" else 0)
+        err_msg = f"Failed to get DHCP proxy dump on host {node[u'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