remove 00-copp.config.json from swss debian package #1366
Conversation
|
why is there conflict? |
copp.json.j2 is moved into docker-orchagent Signed-off-by: Abhishek Dosi <[email protected]>
rebased with master. |
|
why do we have so many vstest failures? |
|
retest vs please |
|
retest this please |
|
since you have remove copp json, are these genuine failures? |
don't think so. failures are random and many other PR's have failure is past few days. Meanwhile I am trying to run locally also to re-confirm. |
|
retest this please |
|
retest this please |
|
retest this please |
|
vs failures are not related copp.json removal. copp.json is not loaded in DVS testing environment. APP_DB does not have copp entry. Basically this failures are random and not impacted by this change. To confirm run manually 4 failed test case of last vs test iteration and all are passing: sudo pytest --dvsname=vs -v test_port_dpb_acl.py::TestPortDPBAcl::test_acl_table_empty_port_list test_port_dpb_acl.py::TestPortDPBAcl::test_acl_table_empty_port_list ^[[APASSED [100%] ====================================== 1 passed in 105.06 seconds ======================================= test_port_dpb_acl.py::TestPortDPBAcl::test_one_port_two_acl_tables PASSED [100%] ====================================== 1 passed in 105.91 seconds ======================================= test_port_dpb_acl.py::TestPortDPBAcl::test_one_acl_table_many_ports PASSED [100%] ====================================== 1 passed in 131.79 seconds ======================================= test_port_dpb_acl.py::TestPortDPBAcl::test_one_port_many_acl_tables PASSED [100%] =========================================================================================== 1 passed in 128.02 seconds ============================================================================================ |
|
@lguohan Can we merge this ? |
|
retest this please |
lguohan
changed the title
Removed 00-copp.config.json from swss debian package Changes to make copp.json as j2 template based based on device role. copp.json.j2 is moved into docker-orchagent. docker-init.sh of orchagent will create json file form j2 template. This PR is dependent on : sonic-net/sonic-buildimage#5053 Signed-off-by: Abhishek Dosi <[email protected]>
…1366) Abstracted away the access to the path of the rootfs via a contextmanager. In Arista secureboot, the rootfs is never extracted on the flash. Instead it's mounted directly from within the signed SWI. The update_sonic_environment function however always assume that the rootfs to be at the same place. - How I did it To alleviate this restriction, a new context manager to obtain the rootfs is introduced. The choice of a context manager rather than a function is entirely based on error management and cleanup. Mounting a squashfs from a swi file requires the use of losetup which makes the rootfs available under /dev/loopX Once done or on error, we need to free this resource which becomes free when using a contextmanager.
Removed 00-copp.config.json from swss debian package
Changes to make copp.json as j2 template based based on device role.
copp.json.j2 is moved into docker-orchagent. docker-init.sh of orchagent will create json file form j2 template.
This PR is dependent on : sonic-net/sonic-buildimage#5053