diff options
author | 2025-01-31 08:44:49 +0100 | |
---|---|---|
committer | 2025-01-31 08:43:11 +0000 | |
commit | a8abc698a4d03488ac3808a9a3f106d6cb047e98 (patch) | |
tree | 1366e649c70cb1e5f090ad99380af54824898dc6 | |
parent | 4e6c67677f53c50e230672e0d0a2146ef963b70d (diff) |
fix(core): VPP startup sequence
Signed-off-by: Peter Mikus <peter.mikus@icloud.com>
Change-Id: I37899c45bf8d87f24cb67cdd120837a833955a3b
7 files changed, 6 insertions, 13 deletions
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 index dbe510ec58..445f524195 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 @@ -1,4 +1,4 @@ menuentry "Install s73-t34-sut2" { - linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:49:db:b4/ --- + linux /casper/ubuntu-noble-arm64/vmlinuz ip=dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:49:db:b4/ --- initrd /casper/ubuntu-noble-arm64/initrd }
\ No newline at end of file diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 index 2f55b12953..e2af022b54 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 @@ -1,4 +1,4 @@ menuentry "Install s72-t34-sut1" { - linux /casper/ubuntu-noble-arm64/vmlinuz ip=::::eno1::dhcp url=https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:55:be:32/ --- + linux /casper/ubuntu-noble-arm64/vmlinuz ip=dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:55:be:32/ --- initrd /casper/ubuntu-noble-arm64/initrd }
\ No newline at end of file diff --git a/resources/libraries/bash/function/gather_dpdk.sh b/resources/libraries/bash/function/gather_dpdk.sh index da3fa930e6..ead1079e7a 100644 --- a/resources/libraries/bash/function/gather_dpdk.sh +++ b/resources/libraries/bash/function/gather_dpdk.sh @@ -1,5 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. -# Copyright (c) 2024 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2025 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: @@ -57,7 +56,6 @@ function gather_dpdk () { die "Failed to read DPDK VPP version!" } fi - # TODO: Use "wget -N" instead checking for file presence? if [[ ! -f "${dpdk_stable_ver}" ]]; then wget -nv --no-check-certificate "${dpdk_repo}/${dpdk_stable_ver}" || { die "Failed to get DPDK package from: ${dpdk_repo}" diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 7d6d4d8673..887c869b8b 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -580,7 +580,6 @@ class ContainerManager: def stop_all_containers(self): """Stop all containers.""" - # TODO: Rework if containers can be affected outside ContainerManager. self._disconnect_papi_to_all_containers() for container in self.containers: self.engine.container = self.containers[container] @@ -588,7 +587,6 @@ class ContainerManager: def destroy_all_containers(self): """Destroy all containers.""" - # TODO: Rework if containers can be affected outside ContainerManager. self._disconnect_papi_to_all_containers() for container in self.containers: self.engine.container = self.containers[container] diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py index cf5f6fc79e..12800ba4fc 100644 --- a/resources/libraries/python/DPDK/DPDKTools.py +++ b/resources/libraries/python/DPDK/DPDKTools.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -94,7 +94,6 @@ class DPDKTools: command = f"cat {Constants.REMOTE_FW_DIR}/dpdk*/VERSION" message = u"Get DPDK version failed!" stdout, _ = exec_cmd_no_error(node, command, message=message) - # TODO: PAL should already tolerate stripped value in the log. logger.info(f"DPDK Version: {stdout}") return stdout.strip() diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 1ede76cdd4..29138da4f4 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -280,7 +280,6 @@ class VPPUtil: if_dump[u"sub_if_flags"] = if_dump[u"sub_if_flags"].value \ if hasattr(if_dump[u"sub_if_flags"], u"value") \ else int(if_dump[u"sub_if_flags"]) - # TODO: return only base data logger.trace(f"Interface data of host {node[u'host']}:\n{details}") @staticmethod diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index ea523b7cb0..384964eae0 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -790,7 +790,6 @@ class VppInitConfig: vpp_config.add_unix_log() vpp_config.add_unix_cli_listen() vpp_config.add_unix_cli_no_pager() - vpp_config.add_unix_coredump() vpp_config.add_socksvr(socket=Constants.SOCKSVR_PATH) vpp_config.add_main_heap_size("2G") vpp_config.add_main_heap_page_size(huge_size) |