summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2023-05-22 08:25:38 -0400
committerDonald Sharp <sharpd@nvidia.com>2023-05-22 10:52:54 -0400
commitaf53f97f348247ffedb23bc850ce0a944c14113c (patch)
treeff7cf798a533480d634baa275cbda12416e57562
parentb9de32473d84c387d823fe9543a7f895f7c9fc54 (diff)
tests: Add `exit` stanzas to pre-generated config
A bunch of tests rely on pre-generated config from json files. These tests were not putting `exit` stanzas and a bunch of the tests as a result are silently failing to configure properly at all, as commands were being sent to the wrong daemons. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
-rw-r--r--tests/topotests/lib/bgp.py1
-rw-r--r--tests/topotests/lib/common_config.py1
-rw-r--r--tests/topotests/lib/ospf.py1
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py
index c58da996d7..0bd9408c28 100644
--- a/tests/topotests/lib/bgp.py
+++ b/tests/topotests/lib/bgp.py
@@ -529,6 +529,7 @@ def __create_bgp_unicast_neighbor(
config_data.extend(neigh_addr_data)
+ config_data.append("exit")
logger.debug("Exiting lib API: {}".format(sys._getframe().f_code.co_name))
return config_data
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index 67afe8739f..a85b86668c 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -2186,6 +2186,7 @@ def create_interfaces_cfg(tgen, topo, build=False):
interface_data += _create_interfaces_ospf_cfg(
"ospf6", c_data, data, ospf_keywords + ["area"]
)
+ interface_data.append("exit")
if interface_data:
interface_data_dict[c_router] = interface_data
diff --git a/tests/topotests/lib/ospf.py b/tests/topotests/lib/ospf.py
index ffe81fbd99..5486e904df 100644
--- a/tests/topotests/lib/ospf.py
+++ b/tests/topotests/lib/ospf.py
@@ -337,6 +337,7 @@ def __create_ospf_global(tgen, input_dict, router, build, load_config, ospf):
cmd = "no {}".format(cmd)
config_data.append(cmd)
+ config_data.append("exit")
logger.debug("Exiting lib API: create_ospf_global()")
return config_data