Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PapiExecutor always verifies
[csit.git]
/
resources
/
libraries
/
python
/
Classify.py
diff --git
a/resources/libraries/python/Classify.py
b/resources/libraries/python/Classify.py
index
2b9ab3d
..
b2cc3a6
100644
(file)
--- a/
resources/libraries/python/Classify.py
+++ b/
resources/libraries/python/Classify.py
@@
-290,11
+290,10
@@
class Classify(object):
host=node['host'])
with PapiExecutor(node) as papi_exec:
host=node['host'])
with PapiExecutor(node) as papi_exec:
- data = papi_exec.add(cmd, **args).get_replies(err_msg).\
- verify_reply(err_msg=err_msg)
+ reply = papi_exec.add(cmd, **args).get_reply(err_msg)
- return int(
data["new_table_index"]), int(data
["skip_n_vectors"]),\
- int(
data
["match_n_vectors"])
+ return int(
reply["new_table_index"]), int(reply
["skip_n_vectors"]),\
+ int(
reply
["match_n_vectors"])
@staticmethod
def _classify_add_del_session(node, is_add, table_index, match,
@staticmethod
def _classify_add_del_session(node, is_add, table_index, match,
@@
-357,8
+356,7
@@
class Classify(object):
host=node['host'])
with PapiExecutor(node) as papi_exec:
host=node['host'])
with PapiExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_replies(err_msg). \
- verify_reply(err_msg=err_msg)
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def _macip_acl_add(node, rules, tag=""):
@staticmethod
def _macip_acl_add(node, rules, tag=""):
@@
-382,8
+380,7
@@
class Classify(object):
host=node['host'])
with PapiExecutor(node) as papi_exec:
host=node['host'])
with PapiExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_replies(err_msg). \
- verify_reply(err_msg=err_msg)
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def _acl_interface_set_acl_list(node, sw_if_index, acl_type, acls):
@staticmethod
def _acl_interface_set_acl_list(node, sw_if_index, acl_type, acls):
@@
-411,8
+408,7
@@
class Classify(object):
format(idx=sw_if_index, host=node['host'])
with PapiExecutor(node) as papi_exec:
format(idx=sw_if_index, host=node['host'])
with PapiExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_replies(err_msg). \
- verify_reply(err_msg=err_msg)
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def _acl_add_replace(node, acl_idx, rules, tag=""):
@staticmethod
def _acl_add_replace(node, acl_idx, rules, tag=""):
@@
-439,8
+435,7
@@
class Classify(object):
host=node['host'])
with PapiExecutor(node) as papi_exec:
host=node['host'])
with PapiExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_replies(err_msg). \
- verify_reply(err_msg=err_msg)
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def vpp_creates_classify_table_l3(node, ip_version, direction, ip_addr):
@staticmethod
def vpp_creates_classify_table_l3(node, ip_version, direction, ip_addr):
@@
-738,10
+733,8
@@
class Classify(object):
table_id=int(table_index)
)
with PapiExecutor(node) as papi_exec:
table_id=int(table_index)
)
with PapiExecutor(node) as papi_exec:
- data = papi_exec.add(cmd, **args).get_replies(err_msg).\
- verify_reply(err_msg=err_msg)
-
- return data
+ reply = papi_exec.add(cmd, **args).get_reply(err_msg)
+ return reply
@staticmethod
def get_classify_session_data(node, table_index):
@staticmethod
def get_classify_session_data(node, table_index):
@@
-754,14
+747,14
@@
class Classify(object):
:returns: List of classify session settings.
:rtype: list or dict
"""
:returns: List of classify session settings.
:rtype: list or dict
"""
+ cmd = "classify_session_dump"
args = dict(
table_id=int(table_index)
)
with PapiExecutor(node) as papi_exec:
args = dict(
table_id=int(table_index)
)
with PapiExecutor(node) as papi_exec:
- dump = papi_exec.add("classify_session_dump", **args).\
- get_dump().reply[0]["api_reply"]["classify_session_details"]
+ details = papi_exec.add(cmd, **args).get_details()
- return d
ump
+ return d
etails
@staticmethod
def vpp_log_plugin_acl_settings(node):
@staticmethod
def vpp_log_plugin_acl_settings(node):
@@
-941,8
+934,7
@@
class Classify(object):
acl_index=int(acl_idx)
)
with PapiExecutor(node) as papi_exec:
acl_index=int(acl_idx)
)
with PapiExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_replies(err_msg).\
- verify_reply(err_msg=err_msg)
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def vpp_log_macip_acl_interface_assignment(node):
@staticmethod
def vpp_log_macip_acl_interface_assignment(node):
@@
-955,5
+947,5
@@
class Classify(object):
err_msg = "Failed to get 'macip_acl_interface' on host {host}".format(
host=node['host'])
with PapiExecutor(node) as papi_exec:
err_msg = "Failed to get 'macip_acl_interface' on host {host}".format(
host=node['host'])
with PapiExecutor(node) as papi_exec:
- r
pl = papi_exec.add(cmd).get_replies(err_msg).reply[0]["api_reply"]
- logger.info(r
pl["macip_acl_interface_get_reply"]
)
+ r
eply = papi_exec.add(cmd).get_reply(err_msg)
+ logger.info(r
eply
)