From ea835ed03593f7005dd8a70dc5bfece1a3a957a6 Mon Sep 17 00:00:00 2001 From: Jorge Sasiain <jorge.sasiain@ehu.eus> Date: Thu, 16 Nov 2023 08:57:05 +0000 Subject: [PATCH] Address SonarQube code smells --- gso/services/netbox_client.py | 3 +-- gso/utils/device_info.py | 4 ++-- gso/workflows/iptrunk/migrate_iptrunk.py | 12 +++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gso/services/netbox_client.py b/gso/services/netbox_client.py index 9a9d65e04..2fb397af0 100644 --- a/gso/services/netbox_client.py +++ b/gso/services/netbox_client.py @@ -145,7 +145,7 @@ class NetboxClient: """Create a new device in Netbox.""" # Get device type id - tier_info = TierInfo().get_module_by_name(f"Tier{site_tier}") + tier_info = TierInfo().get_module_by_name(f"tier{site_tier}") device_type = self.netbox.dcim.device_types.get(model=tier_info.device_type) # Get device role id @@ -261,7 +261,6 @@ class NetboxClient: ): interface.lag = None interface.save() - return def get_available_lags(self, router_id: UUID) -> list[str]: """Return all available :term:`LAG`s not assigned to a device.""" diff --git a/gso/utils/device_info.py b/gso/utils/device_info.py index 5a1398892..15eaa6220 100644 --- a/gso/utils/device_info.py +++ b/gso/utils/device_info.py @@ -11,14 +11,14 @@ class ModuleInfo(BaseModel): class TierInfo: def __init__(self) -> None: - self.Tier1 = ModuleInfo( + self.tier1 = ModuleInfo( device_type="7750 SR-7s", module_bays_slots=[1, 2], module_type="XMA2-s-36p-400g", breakout_interfaces_per_slot=[36, 35, 34, 33], total_10g_interfaces=80, ) - self.Tier2 = ModuleInfo( + self.tier2 = ModuleInfo( device_type="7750-SR7s", module_bays_slots=[1, 2], module_type="XMA2-s-36p-400g", diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py index 0d238437f..596a4399c 100644 --- a/gso/workflows/iptrunk/migrate_iptrunk.py +++ b/gso/workflows/iptrunk/migrate_iptrunk.py @@ -35,6 +35,8 @@ from gso.utils.helpers import ( logger = getLogger(__name__) +PLAYBOOK_VERB_NOT_YET_PROPERLY_SET = "Playbook verb is not yet properly set." + def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator: subscription = Iptrunk.from_subscription(subscription_id) @@ -232,7 +234,7 @@ def deploy_new_config_dry( "trunk_interface", ) - logger.warning("Playbook verb is not yet properly set.") + logger.warning(PLAYBOOK_VERB_NOT_YET_PROPERLY_SET) return { "subscription": subscription, @@ -264,7 +266,7 @@ def deploy_new_config_real( False, ) - logger.warning("Playbook verb is not yet properly set.") + logger.warning(PLAYBOOK_VERB_NOT_YET_PROPERLY_SET) return { "subscription": subscription, @@ -315,7 +317,7 @@ def deploy_new_isis( False, ) - logger.warning("Playbook verb is not yet properly set.") + logger.warning(PLAYBOOK_VERB_NOT_YET_PROPERLY_SET) return { "subscription": subscription, @@ -371,7 +373,7 @@ def delete_old_config_dry( "delete", ) - logger.warning("Playbook verb is not yet properly set.") + logger.warning(PLAYBOOK_VERB_NOT_YET_PROPERLY_SET) return {"subscription": subscription} @@ -401,7 +403,7 @@ def delete_old_config_real( False, ) - logger.warning("Playbook verb is not yet properly set.") + logger.warning(PLAYBOOK_VERB_NOT_YET_PROPERLY_SET) return {"subscription": subscription} -- GitLab