Dpdk in VM: Increase num_mbufs

[csit.git] / resources / libraries / python / NsimUtil.py

diff --git a/resources/libraries/python/NsimUtil.py b/resources/libraries/python/NsimUtil.py
index 9d60a91..85e41a4 100644 (file)
--- a/resources/libraries/python/NsimUtil.py
+++ b/resources/libraries/python/NsimUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -13,14 +13,11 @@
 
 """VPP Network Simulator Plugin util library."""
 
-from robot.api import logger
-
-from resources.libraries.python.Constants import Constants
 from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.InterfaceUtil import InterfaceUtil
 
 
-class NsimUtil(object):
+class NsimUtil():
     """VPP NSIM Plugin Keywords."""
 
     @staticmethod
@@ -33,33 +30,41 @@ class NsimUtil(object):
         :param interface1: 2nd Interface name for cross-connect feature
         :type node: dict
         :type vpp_nsim_attr: dict
-        :type interface0: string or int
-        :type interface1: string or int
+        :type interface0: str or int
+        :type interface1: str or int
         :raises RuntimeError: if no NSIM features are enabled or
                 vpp papi command fails.
         """
         host = node[u"host"]
-        if vpp_nsim_attr[u"output_feature_enable"] == False \
-                and vpp_nsim_attr[u"cross_connect_feature_enable"] == False:
+        if not vpp_nsim_attr[u"output_nsim_enable"] \
+                and not vpp_nsim_attr[u"xc_nsim_enable"]:
             raise RuntimeError(f"No NSIM features enabled on host {host}:\n"
                                f"vpp_nsim_attr = {vpp_nsim_attr}")
-        cmd = u"nsim_configure"
+        cmd = u"nsim_configure2"
         args = dict(
             delay_in_usec=vpp_nsim_attr[u"delay_in_usec"],
             average_packet_size=vpp_nsim_attr[u"average_packet_size"],
             bandwidth_in_bits_per_second=vpp_nsim_attr[
-                u"bandwidth_in_bits_per_second"
+                u"bw_in_bits_per_second"
             ],
             packets_per_drop=vpp_nsim_attr[u"packets_per_drop"],
+            packets_per_reorder=vpp_nsim_attr.get(u"packets_per_reorder", 0)
         )
         err_msg = f"Failed to configure NSIM on host {host}"
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_reply(err_msg)
+        try:
+            with PapiSocketExecutor(node) as papi_exec:
+                papi_exec.add(cmd, **args).get_reply(err_msg)
+        except AssertionError:
+            # Perhaps VPP is an older version
+            old_cmd = u"nsim_configure"
+            args.pop(u"packets_per_reorder")
+            with PapiSocketExecutor(node) as papi_exec:
+                papi_exec.add(old_cmd, **args).get_reply(err_msg)
 
-        if vpp_nsim_attr[u"output_feature_enable"] == True:
+        if vpp_nsim_attr[u"output_nsim_enable"]:
             cmd = u"nsim_output_feature_enable_disable"
             args = dict(
-                enable_disable=vpp_nsim_attr[u"output_feature_enable"],
+                enable_disable=vpp_nsim_attr[u"output_nsim_enable"],
                 sw_if_index=InterfaceUtil.get_interface_index(node, interface0),
             )
             err_msg = f"Failed to enable NSIM output feature on " \
@@ -67,10 +72,10 @@ class NsimUtil(object):
             with PapiSocketExecutor(node) as papi_exec:
                 papi_exec.add(cmd, **args).get_reply(err_msg)
 
-        elif vpp_nsim_attr[u"cross_connect_feature_enable"] == True:
+        elif vpp_nsim_attr[u"xc_nsim_enable"]:
             cmd = u"nsim_cross_connect_feature_enable_disable"
             args = dict(
-                enable_disable=vpp_nsim_attr[u"cross_connect_feature_enable"],
+                enable_disable=vpp_nsim_attr[u"xc_nsim_enable"],
                 sw_if_index0=InterfaceUtil.get_interface_index(node,
                                                                interface0),
                 sw_if_index1=InterfaceUtil.get_interface_index(node,