From 08e3017f7ad308bcd06178f10eb66e57589d83f8 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:33:39 +0530 Subject: [PATCH 01/14] T6789: test commit --- src/utils/vyos-config-file-query | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/vyos-config-file-query b/src/utils/vyos-config-file-query index a10c7e9..69b4812 100644 --- a/src/utils/vyos-config-file-query +++ b/src/utils/vyos-config-file-query @@ -17,6 +17,7 @@ import re import os +import math import sys import json import argparse From 2621338d7cd1d741a14eca7f7db4520891112626 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:44:11 +0530 Subject: [PATCH 02/14] T6789: test commit --- .github/workflows/check-unused-imports.yml | 2 +- src/tests/helper.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml index b89f965..e05aa38 100644 --- a/.github/workflows/check-unused-imports.yml +++ b/.github/workflows/check-unused-imports.yml @@ -10,5 +10,5 @@ permissions: jobs: check-unused-imports: - uses: vyos/.github/.github/workflows/check-unused-imports.yml@T6789-unused-import-checkout-current + uses: vyos/.github/.github/workflows/check-unused-imports.yml@T6789-unused-import-checkout-curre secrets: inherit diff --git a/src/tests/helper.py b/src/tests/helper.py index c3aed20..faa0aa6 100644 --- a/src/tests/helper.py +++ b/src/tests/helper.py @@ -16,7 +16,6 @@ import sys import importlib.util -import math import json import os From 4a6314bcacfefb04aee85fb45f7d66fb870267d8 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:50:14 +0530 Subject: [PATCH 03/14] T0000: test --- src/utils/initial-setup | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/initial-setup b/src/utils/initial-setup index 37fc457..bf4ba27 100644 --- a/src/utils/initial-setup +++ b/src/utils/initial-setup @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import argparse +import json import vyos.configtree From a439f7571309cdcc0ae0f84194df26c33894aeef Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:52:55 +0530 Subject: [PATCH 04/14] T6789: test --- src/utils/initial-setup | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/initial-setup b/src/utils/initial-setup index bf4ba27..37fc457 100644 --- a/src/utils/initial-setup +++ b/src/utils/initial-setup @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import argparse -import json import vyos.configtree From 0768f81fd795fab3c70318e7d79d093b4f0da035 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:56:33 +0530 Subject: [PATCH 05/14] T6789: check --- src/utils/initial-setup | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/initial-setup b/src/utils/initial-setup index 37fc457..bf4ba27 100644 --- a/src/utils/initial-setup +++ b/src/utils/initial-setup @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import argparse +import json import vyos.configtree From f2992d3d149d768bcc69ab4e155b43d63615efe2 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:10:36 +0530 Subject: [PATCH 06/14] T0000: dont merge --- src/tests/test_op_mode.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/test_op_mode.py b/src/tests/test_op_mode.py index 5e64d41..ad661c3 100644 --- a/src/tests/test_op_mode.py +++ b/src/tests/test_op_mode.py @@ -16,6 +16,7 @@ from unittest import TestCase import os +import json import vyos.opmode class TestVyOSOpMode(TestCase): From 742bc0687ee6b00bf0315137b66cabff95f4abc9 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:14:57 +0530 Subject: [PATCH 07/14] T0000: dont merge --- src/tests/test_configverify.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/test_configverify.py b/src/tests/test_configverify.py index e598679..bf48981 100644 --- a/src/tests/test_configverify.py +++ b/src/tests/test_configverify.py @@ -15,6 +15,7 @@ # along with this program. If not, see . from unittest import TestCase +import json from vyos.configverify import verify_diffie_hellman_length from vyos.utils.process import cmd From 109f607388e658453b13f5794a82790685beabaf Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:17:40 +0530 Subject: [PATCH 08/14] T0000: dont merge --- src/migration-scripts/config-management/0-to-1 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/config-management/0-to-1 b/src/migration-scripts/config-management/0-to-1 index 44c6856..38c8193 100644 --- a/src/migration-scripts/config-management/0-to-1 +++ b/src/migration-scripts/config-management/0-to-1 @@ -16,6 +16,7 @@ # Add commit-revisions option if it doesn't exist from vyos.configtree import ConfigTree +import json def migrate(config: ConfigTree) -> None: if config.exists(['system', 'config-management', 'commit-revisions']): From df25fb744e1f7d72404b529354276d5c99a9a287 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:28:36 +0530 Subject: [PATCH 09/14] T0000: dont merge --- src/migration-scripts/cluster/1-to-2 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/cluster/1-to-2 b/src/migration-scripts/cluster/1-to-2 index 5ca4531..6bee6d7 100644 --- a/src/migration-scripts/cluster/1-to-2 +++ b/src/migration-scripts/cluster/1-to-2 @@ -15,6 +15,7 @@ import re import sys +import json from vyos.configtree import ConfigTree from vyos.base import MigrationError From f4db32077c45cc8ec62fd6fcca6292c791ef1fcd Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:31:18 +0530 Subject: [PATCH 10/14] T0000: dont merge --- src/migration-scripts/conntrack/1-to-2 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/conntrack/1-to-2 b/src/migration-scripts/conntrack/1-to-2 index 0a4fb3d..6d7b860 100644 --- a/src/migration-scripts/conntrack/1-to-2 +++ b/src/migration-scripts/conntrack/1-to-2 @@ -16,6 +16,7 @@ # Delete "set system conntrack modules gre" option from vyos.configtree import ConfigTree +import json def migrate(config: ConfigTree) -> None: From 8d095fb85f2fa6db014f081b98280b7eb1b8faac Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:45:36 +0530 Subject: [PATCH 11/14] T0000: dont merge --- src/migration-scripts/bgp/0-to-1 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/bgp/0-to-1 b/src/migration-scripts/bgp/0-to-1 index a2f3343..828a3a6 100644 --- a/src/migration-scripts/bgp/0-to-1 +++ b/src/migration-scripts/bgp/0-to-1 @@ -16,6 +16,7 @@ # T3417: migrate BGP tagNode to node as we can only have one BGP process from vyos.configtree import ConfigTree +import json def migrate(config: ConfigTree) -> None: base = ['protocols', 'bgp'] From d461614bc111595a0c169b5cc1c085ab935eb086 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 01:02:16 +0530 Subject: [PATCH 12/14] T0000: dont merge --- src/migration-scripts/bgp/1-to-2 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/bgp/1-to-2 b/src/migration-scripts/bgp/1-to-2 index c0fc3b0..f910994 100644 --- a/src/migration-scripts/bgp/1-to-2 +++ b/src/migration-scripts/bgp/1-to-2 @@ -17,6 +17,7 @@ # T5937: Migrate IPv6 BGP Neighbor Peer Groups from vyos.configtree import ConfigTree +import json base = ['protocols', 'bgp'] From 9b34d3e37018f6bd592dcf35011590f9ac9c2aa8 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Thu, 7 Nov 2024 01:05:47 +0530 Subject: [PATCH 13/14] T0000: dont merge --- src/migration-scripts/bgp/1-to-2 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/migration-scripts/bgp/1-to-2 b/src/migration-scripts/bgp/1-to-2 index f910994..4b34e0f 100644 --- a/src/migration-scripts/bgp/1-to-2 +++ b/src/migration-scripts/bgp/1-to-2 @@ -18,6 +18,7 @@ from vyos.configtree import ConfigTree import json +import os base = ['protocols', 'bgp'] From 55cc639174bd67d409fafc84448cfbfbc4f76d22 Mon Sep 17 00:00:00 2001 From: Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:44:56 +0530 Subject: [PATCH 14/14] T0000: test --- src/migration-scripts/bgp/0-to-1 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/migration-scripts/bgp/0-to-1 b/src/migration-scripts/bgp/0-to-1 index 828a3a6..a2f3343 100644 --- a/src/migration-scripts/bgp/0-to-1 +++ b/src/migration-scripts/bgp/0-to-1 @@ -16,7 +16,6 @@ # T3417: migrate BGP tagNode to node as we can only have one BGP process from vyos.configtree import ConfigTree -import json def migrate(config: ConfigTree) -> None: base = ['protocols', 'bgp']