From eee0933cdd2ee048c267feaad083a1dd054e9509 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Fri, 12 Jul 2024 14:26:31 +0200
Subject: [PATCH] Fixed the migration down revision after rebasing with develop
and update the code base to make the linter happy.
---
.../2023-09-22_6c986f219e3f_add_router_validation_task.py | 4 ++--
gso/utils/workflow_steps.py | 2 +-
gso/workflows/__init__.py | 1 -
gso/workflows/router/validate_router.py | 3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/gso/migrations/versions/2023-09-22_6c986f219e3f_add_router_validation_task.py b/gso/migrations/versions/2023-09-22_6c986f219e3f_add_router_validation_task.py
index 54a07175d..40af7f4ec 100644
--- a/gso/migrations/versions/2023-09-22_6c986f219e3f_add_router_validation_task.py
+++ b/gso/migrations/versions/2023-09-22_6c986f219e3f_add_router_validation_task.py
@@ -1,7 +1,7 @@
"""Add router validation task.
Revision ID: 6c986f219e3f
-Revises: 1ec810b289c0
+Revises: f6a38f9e9e18
Create Date: 2023-09-22 17:13:01.223133
"""
@@ -10,7 +10,7 @@ from alembic import op
# revision identifiers, used by Alembic.
revision = '6c986f219e3f'
-down_revision = '1ec810b289c0'
+down_revision = 'f6a38f9e9e18'
branch_labels = None
depends_on = None
diff --git a/gso/utils/workflow_steps.py b/gso/utils/workflow_steps.py
index f62558247..176b83258 100644
--- a/gso/utils/workflow_steps.py
+++ b/gso/utils/workflow_steps.py
@@ -124,7 +124,7 @@ def prompt_sharepoint_checklist_url(checklist_url: str) -> FormGenerator:
@step("[DRY RUN] Add all PE routers to P router iBGP group")
-def add_all_pe_to_p_dry(subscription: dict[str, Any], callback_route: str, process_id: UUIDstr) -> None:
+def add_all_pe_to_p_dry(subscription: dict[str, Any], callback_route: str) -> None:
"""Perform a dry run of adding the list of all PE routers to the new P router."""
extra_vars = {
"dry_run": True,
diff --git a/gso/workflows/__init__.py b/gso/workflows/__init__.py
index 45bd020c9..f82409001 100644
--- a/gso/workflows/__init__.py
+++ b/gso/workflows/__init__.py
@@ -65,4 +65,3 @@ LazyWorkflowInstance("gso.workflows.office_router.create_imported_office_router"
# Opengear workflows
LazyWorkflowInstance("gso.workflows.opengear.create_imported_opengear", "create_imported_opengear")
LazyWorkflowInstance("gso.workflows.opengear.import_opengear", "import_opengear")
-
diff --git a/gso/workflows/router/validate_router.py b/gso/workflows/router/validate_router.py
index 81ceee92a..f5f078db0 100644
--- a/gso/workflows/router/validate_router.py
+++ b/gso/workflows/router/validate_router.py
@@ -12,7 +12,6 @@ from orchestrator.workflows.utils import wrap_modify_initial_input_form
from pydantic_forms.types import State, UUIDstr
from gso.products.product_types.router import Router
-from gso.services import infoblox
from gso.services import infoblox, lso_client, subscriptions
from gso.services.librenms_client import LibreNMSClient
from gso.services.lso_client import anonymous_lso_interaction, execute_playbook
@@ -53,7 +52,7 @@ def check_netbox_entry_exists(subscription: Router) -> None:
@step("Verify BGP configuration on P router")
-def verify_p_ibgp(subscription: dict[str, Any], callback_route: str, process_id: UUIDstr) -> None:
+def verify_p_ibgp(subscription: dict[str, Any], callback_route: str) -> None:
"""Perform a dry run of adding the list of all PE routers to the new P router."""
extra_vars = {
"dry_run": True,
--
GitLab