X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FMemif.py;fp=resources%2Flibraries%2Fpython%2FMemif.py;h=f60972f64d0f81d1ea912d541e87b07e3b586f4f;hp=34cf6ce9c36278a53d097ad89c27fbd06ab24067;hb=2b67e8064904d4e43d1a9c8587b972d66ba3bf11;hpb=34b6e0c1400ac5da26ec3589ed1d7b59bc8b24ad diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py index 34cf6ce9c3..f60972f64d 100644 --- a/resources/libraries/python/Memif.py +++ b/resources/libraries/python/Memif.py @@ -19,7 +19,6 @@ from robot.api import logger from resources.libraries.python.topology import NodeType, Topology from resources.libraries.python.PapiExecutor import PapiSocketExecutor -from resources.libraries.python.L2Util import L2Util class MemifRole(IntEnum): @@ -47,8 +46,11 @@ class Memif(object): details = papi_exec.add("memif_dump").get_details() for memif in details: - memif["if_name"] = memif["if_name"].rstrip('\x00') - memif["hw_addr"] = L2Util.bin_to_mac(memif["hw_addr"]) + memif["hw_addr"] = str(memif["hw_addr"]) + memif["role"] = memif["role"].value + memif["mode"] = memif["mode"].value + memif["flags"] = memif["flags"].value \ + if hasattr(memif["flags"], 'value') else int(memif["flags"]) logger.debug("MEMIF details:\n{details}".format(details=details)) @@ -74,7 +76,7 @@ class Memif(object): err_msg = 'Failed to create memif socket on host {host}'.format( host=node['host']) args = dict( - is_add=int(is_add), + is_add=is_add, socket_id=int(sid), socket_filename=str('/tmp/' + filename) ) @@ -108,7 +110,8 @@ class Memif(object): rx_queues=int(rxq), tx_queues=int(txq), socket_id=int(sid), - id=int(mid) + id=int(mid), + secret="" ) with PapiSocketExecutor(node) as papi_exec: return papi_exec.add(cmd, **args).get_sw_if_index(err_msg)