Remove un-interested VIRL tests and related resources

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

diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py
index 8b78f45..cd074c3 100644 (file)
--- a/resources/libraries/python/Dhcp.py
+++ b/resources/libraries/python/Dhcp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -15,34 +15,23 @@
 
 
 from resources.libraries.python.VatExecutor import VatExecutor
-from resources.libraries.python.topology import Topology
 
 
-class DhcpClient(object):
-    """DHCP Client utilities."""
+class DhcpProxy(object):
+    """DHCP Proxy utilities."""
 
     @staticmethod
-    def set_dhcp_client_on_interface(vpp_node, interface, hostname=None):
-        """Set DHCP client on interface.
-
-        :param vpp_node: VPP node to set DHCP client on.
-        :param interface: Interface name to set DHCP client on.
-        :param hostname: Hostname used in DHCP DISCOVER.
-        :type vpp_node: dict
-        :type interface: str
-        :type hostname: str
-        :raises RuntimeError: If unable to set DHCP client on interface.
+    def vpp_get_dhcp_proxy(node, ip_version):
+        """Retrieve DHCP relay configuration.
+
+        :param node: VPP node.
+        :param ip_version: IP protocol version: ipv4 or ipv6.
+        :type node: dict
+        :type ip_version: str
+        :returns: DHCP relay data.
+        :rtype: list
         """
-        sw_if_index = Topology.get_interface_sw_index(vpp_node, interface)
-        interface = 'sw_if_index {}'.format(sw_if_index)
-        hostname = 'hostname {}'.format(hostname) if hostname else ''
-        output = VatExecutor.cmd_from_template(vpp_node,
-                                               "dhcp_client.vat",
-                                               interface=interface,
-                                               hostname=hostname)
-        output = output[0]
-
-        if output["retval"] != 0:
-            raise RuntimeError('Unable to set DHCP client on node {} and'
-                               ' interface {}.'
-                               .format(vpp_node, interface))
+
+        return VatExecutor.cmd_from_template(
+            node, "dhcp_proxy_dump.vat",
+            ipv6="ipv6" if ip_version == "ipv6" else "")