diff --git a/tests/copp/copp_utils.py b/tests/copp/copp_utils.py index 599b2bf1ba3..aef0927549b 100644 --- a/tests/copp/copp_utils.py +++ b/tests/copp/copp_utils.py @@ -19,6 +19,8 @@ _TEMP_COPP_TEMPLATE = "/tmp/copp.json.j2" _COPP_TEMPLATE_PATH = "/usr/share/sonic/templates/copp.json.j2" _SWSS_COPP_TEMPLATE = ":" + _COPP_TEMPLATE_PATH +_DEFAULT_COPP_TEMPLATE = "/usr/share/sonic/templates/copp_cfg.j2" +_BASE_COPP_TEMPLATE = "/tmp/copp_cfg_base.j2" _PTF_NN_TEMPLATE = "templates/ptf_nn_agent.conf.ptf.j2" _PTF_NN_DEST = "/etc/supervisor/conf.d/ptf_nn_agent.conf" @@ -47,6 +49,7 @@ def limit_policer(dut, pps_limit, nn_target_namespace): dut.command("docker cp {} {}".format(swss_docker_name + _APP_DB_COPP_CONFIG, _BASE_COPP_CONFIG)) config_format = "app_db" else: + dut.command("cp {} {}".format(_DEFAULT_COPP_TEMPLATE, _BASE_COPP_TEMPLATE)) dut.command("cp {} {}".format(_CONFIG_DB_COPP_CONFIG, _BASE_COPP_CONFIG)) config_format = "config_db" @@ -67,7 +70,7 @@ def limit_policer(dut, pps_limit, nn_target_namespace): dut.command("docker cp {} {}".format(swss_docker_name + _SWSS_COPP_TEMPLATE, _TEMP_COPP_TEMPLATE)) dut.command("docker cp {} {}".format(_TEMP_COPP_CONFIG, swss_docker_name + _SWSS_COPP_TEMPLATE)) else: - dut.command("cp {} {}".format(_TEMP_COPP_CONFIG, _CONFIG_DB_COPP_CONFIG)) + dut.command("cp {} {}".format(_TEMP_COPP_CONFIG, _DEFAULT_COPP_TEMPLATE)) def restore_policer(dut, nn_target_namespace): """ @@ -87,7 +90,7 @@ def restore_policer(dut, nn_target_namespace): dut.command("docker cp {} {}".format(_BASE_COPP_CONFIG, swss_docker_name + _APP_DB_COPP_CONFIG)) dut.command("docker cp {} {}".format(_TEMP_COPP_TEMPLATE, swss_docker_name + _SWSS_COPP_TEMPLATE)) else: - dut.command("cp {} {}".format(_BASE_COPP_CONFIG, _CONFIG_DB_COPP_CONFIG)) + dut.command("cp {} {}".format(_BASE_COPP_TEMPLATE, _DEFAULT_COPP_TEMPLATE)) def configure_ptf(ptf, nn_target_port): """