Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1338 FIX: Failed to get VPP version on host
[csit.git]
/
resources
/
libraries
/
python
/
Memif.py
diff --git
a/resources/libraries/python/Memif.py
b/resources/libraries/python/Memif.py
index
4a31864
..
76e775f
100644
(file)
--- a/
resources/libraries/python/Memif.py
+++ b/
resources/libraries/python/Memif.py
@@
-1,4
+1,4
@@
-# Copyright (c) 201
7
Cisco and/or its affiliates.
+# Copyright (c) 201
8
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:
@@
-15,7
+15,7
@@
from resources.libraries.python.ssh import SSH
from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal
from resources.libraries.python.ssh import SSH
from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal
-from resources.libraries.python.topology import Topology
+from resources.libraries.python.topology import
NodeType,
Topology
class Memif(object):
class Memif(object):
@@
-25,18
+25,23
@@
class Memif(object):
pass
@staticmethod
pass
@staticmethod
- def create_memif_interface(node, filename, mid, sid, role='master'):
+ def create_memif_interface(node, filename, mid, sid, rxq=1, txq=1,
+ role='slave'):
"""Create Memif interface on the given node.
:param node: Given node to create Memif interface on.
:param filename: Memif interface socket filename.
:param mid: Memif interface ID.
:param sid: Socket ID.
"""Create Memif interface on the given node.
:param node: Given node to create Memif interface on.
:param filename: Memif interface socket filename.
:param mid: Memif interface ID.
:param sid: Socket ID.
+ :param rxq: Number of RX queues.
+ :param txq: Number of TX queues.
:param role: Memif interface role [master|slave]. Default is master.
:type node: dict
:type filename: str
:type mid: str
:type sid: str
:param role: Memif interface role [master|slave]. Default is master.
:type node: dict
:type filename: str
:type mid: str
:type sid: str
+ :type rxq: int
+ :type txq: int
:type role: str
:returns: SW interface index.
:rtype: int
:type role: str
:returns: SW interface index.
:rtype: int
@@
-48,7
+53,8
@@
class Memif(object):
'memif_socket_filename_add_del.vat',
add_del='add', id=sid, filename='/tmp/'+filename)
vat.vat_terminal_exec_cmd_from_template(
'memif_socket_filename_add_del.vat',
add_del='add', id=sid, filename='/tmp/'+filename)
vat.vat_terminal_exec_cmd_from_template(
- 'memif_create.vat', id=mid, socket=sid, role=role)
+ 'memif_create.vat', id=mid, socket=sid, rxq=rxq, txq=txq,
+ role=role)
if 'sw_if_index' in vat.vat_stdout:
try:
sw_if_idx = int(vat.vat_stdout.split()[4])
if 'sw_if_index' in vat.vat_stdout:
try:
sw_if_idx = int(vat.vat_stdout.split()[4])
@@
-92,6
+98,17
@@
class Memif(object):
vat = VatExecutor()
vat.execute_script("show_memif.vat", node, json_out=False)
vat = VatExecutor()
vat.execute_script("show_memif.vat", node, json_out=False)
+ @staticmethod
+ def show_memif_on_all_duts(nodes):
+ """Show Memif data on all DUTs.
+
+ :param nodes: Topology nodes.
+ :type nodes: dict
+ """
+ for node in nodes.values():
+ if node['type'] == NodeType.DUT:
+ Memif.show_memif(node)
+
@staticmethod
def clear_memif_socks(node, *socks):
"""Clear Memif sockets for the given node.
@staticmethod
def clear_memif_socks(node, *socks):
"""Clear Memif sockets for the given node.
@@
-128,7
+145,7
@@
class Memif(object):
memif_data = memif_data.replace(garbage, '')
for line in memif_data.splitlines():
memif_data = memif_data.replace(garbage, '')
for line in memif_data.splitlines():
- if
line.startswith('Sending') or len(line) == 0
:
+ if
not line or line.startswith('Sending')
:
continue
elif line.startswith('memif'):
if memif_name:
continue
elif line.startswith('memif'):
if memif_name:
@@
-160,7
+177,7
@@
class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface name.
+ :returns: Memif interface name
, or None if not found
.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@
-169,7
+186,7
@@
class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return item
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return item
-
return None
+ return None
@staticmethod
def vpp_get_memif_interface_mac(node, sw_if_idx):
@staticmethod
def vpp_get_memif_interface_mac(node, sw_if_idx):
@@
-179,7
+196,7
@@
class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface MAC address.
+ :returns: Memif interface MAC address
, or None if not found
.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@
-188,6
+205,7
@@
class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('mac', None)
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('mac', None)
+ return None
@staticmethod
def vpp_get_memif_interface_socket(node, sw_if_idx):
@staticmethod
def vpp_get_memif_interface_socket(node, sw_if_idx):
@@
-197,7
+215,7
@@
class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface socket path.
+ :returns: Memif interface socket path
, or None if not found
.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@
-206,6
+224,7
@@
class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('socket', None)
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('socket', None)
+ return None
@staticmethod
def vpp_get_memif_interface_id(node, sw_if_idx):
@staticmethod
def vpp_get_memif_interface_id(node, sw_if_idx):
@@
-215,7
+234,7
@@
class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface ID.
+ :returns: Memif interface ID
, or None if not found
.
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
@@
-224,6
+243,7
@@
class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return int(memif_data[item].get('id', None))
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return int(memif_data[item].get('id', None))
+ return None
@staticmethod
def vpp_get_memif_interface_role(node, sw_if_idx):
@staticmethod
def vpp_get_memif_interface_role(node, sw_if_idx):
@@
-233,7
+253,7
@@
class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface role.
+ :returns: Memif interface role
, or None if not found
.
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
@@
-242,3
+262,4
@@
class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('role', None)
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('role', None)
+ return None