Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
add the expected prompt for ubuntu root user
[csit.git]
/
resources
/
libraries
/
python
/
Memif.py
diff --git
a/resources/libraries/python/Memif.py
b/resources/libraries/python/Memif.py
index
e3cea93
..
acde3ec
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,16
+25,23
@@
class Memif(object):
pass
@staticmethod
pass
@staticmethod
- def create_memif_interface(node, socket, mid, 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.
"""Create Memif interface on the given node.
:param node: Given node to create Memif interface on.
- :param
socket: Memif interface socket path
.
+ :param
filename: Memif interface socket filename
.
:param mid: Memif interface ID.
: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
:param role: Memif interface role [master|slave]. Default is master.
:type node: dict
- :type
socket
: str
+ :type
filename
: str
:type mid: 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
@@
-43,8
+50,11
@@
class Memif(object):
with VatTerminal(node, json_param=False) as vat:
vat.vat_terminal_exec_cmd_from_template(
with VatTerminal(node, json_param=False) as vat:
vat.vat_terminal_exec_cmd_from_template(
- 'memif_create.vat',
- socket=socket, id=mid, role=role)
+ '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, 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])
@@
-56,7
+66,8
@@
class Memif(object):
Topology.update_interface_name(node, if_key, ifc_name)
ifc_mac = Memif.vpp_get_memif_interface_mac(node, sw_if_idx)
Topology.update_interface_mac_address(node, if_key, ifc_mac)
Topology.update_interface_name(node, if_key, ifc_name)
ifc_mac = Memif.vpp_get_memif_interface_mac(node, sw_if_idx)
Topology.update_interface_mac_address(node, if_key, ifc_mac)
- Topology.update_interface_memif_socket(node, if_key, socket)
+ Topology.update_interface_memif_socket(node, if_key,
+ '/tmp/'+filename)
Topology.update_interface_memif_id(node, if_key, mid)
Topology.update_interface_memif_role(node, if_key, role)
return sw_if_idx
Topology.update_interface_memif_id(node, if_key, mid)
Topology.update_interface_memif_role(node, if_key, role)
return sw_if_idx
@@
-67,6
+78,16
@@
class Memif(object):
raise ValueError('Create Memif interface failed on node '
'{}'.format(node['host']))
raise ValueError('Create Memif interface failed on node '
'{}'.format(node['host']))
+ @staticmethod
+ def dump_memif(node):
+ """Dump Memif data for the given node.
+
+ :param node: Given node to show Memif data on.
+ :type node: dict
+ """
+ vat = VatExecutor()
+ vat.execute_script("memif_dump.vat", node, json_out=False)
+
@staticmethod
def show_memif(node):
"""Show Memif data for the given node.
@staticmethod
def show_memif(node):
"""Show Memif data for the given node.
@@
-75,7
+96,18
@@
class Memif(object):
:type node: dict
"""
vat = VatExecutor()
:type node: dict
"""
vat = VatExecutor()
- vat.execute_script("memif_dump.vat", node, json_out=False)
+ 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):
@staticmethod
def clear_memif_socks(node, *socks):
@@
-154,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):