Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Docs: update links by S3
[csit.git]
/
resources
/
libraries
/
python
/
Dhcp.py
diff --git
a/resources/libraries/python/Dhcp.py
b/resources/libraries/python/Dhcp.py
index
cd074c3
..
2b4d03e
100644
(file)
--- a/
resources/libraries/python/Dhcp.py
+++ b/
resources/libraries/python/Dhcp.py
@@
-1,4
+1,4
@@
-# Copyright (c) 20
19
Cisco and/or its affiliates.
+# Copyright (c) 20
21
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:
# 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:
@@
-14,10
+14,10
@@
"""DHCP utilities for VPP."""
"""DHCP utilities for VPP."""
-from resources.libraries.python.
VatExecutor import Va
tExecutor
+from resources.libraries.python.
PapiExecutor import PapiSocke
tExecutor
-class DhcpProxy
(object)
:
+class DhcpProxy:
"""DHCP Proxy utilities."""
@staticmethod
"""DHCP Proxy utilities."""
@staticmethod
@@
-31,7
+31,11
@@
class DhcpProxy(object):
:returns: DHCP relay data.
:rtype: list
"""
: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