From f206ea66ed032085601329d221a46d333ca8d5dc Mon Sep 17 00:00:00 2001
From: Mohammad Torkashvand <mohammad.torkashvand@geant.org>
Date: Mon, 18 Mar 2024 09:49:11 +0100
Subject: [PATCH] =?UTF-8?q?rename=20G=C3=89ANT=20to=20GEANT,=20except=20do?=
=?UTF-8?q?cumentations=20and=20branding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/source/conf.py | 2 +-
gso/cli/imports.py | 4 ++--
gso/cli/netbox.py | 4 ++--
gso/services/crm.py | 4 ++--
gso/workflows/iptrunk/create_iptrunk.py | 2 +-
gso/workflows/router/create_router.py | 2 +-
gso/workflows/site/create_site.py | 2 +-
setup.py | 4 ++--
test/api/test_imports.py | 10 +++++-----
test/workflows/site/test_create_site.py | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 74502fb2..a38860b6 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,6 +1,6 @@
# -- Project information -----------------------------------------------------
project = "GÉANT Service Orchestrator"
-copyright = "2023, GÉANT Vereniging"
+copyright = "2023-2024, GÉANT Vereniging"
author = "GÉANT Orchestration and Automation Team"
# -- General configuration ---------------------------------------------------
diff --git a/gso/cli/imports.py b/gso/cli/imports.py
index 1a20c14b..223278f0 100644
--- a/gso/cli/imports.py
+++ b/gso/cli/imports.py
@@ -63,7 +63,7 @@ def generic_import_data(
successfully_imported_data = []
data = read_data(filepath)
for details in data:
- details["customer"] = "GÉANT"
+ details["customer"] = "GEANT"
typer.echo(f"Importing {name_key}: {details[name_key]}")
try:
initial_data = import_model(**details)
@@ -163,7 +163,7 @@ def import_iptrunks(filepath: str = common_filepath_option) -> None:
)
try:
initial_data = IptrunkImportModel(
- customer="GÉANT",
+ customer="GEANT",
geant_s_sid=trunk["id"],
iptrunk_type=trunk["config"]["common"]["type"],
iptrunk_description=trunk["config"]["common"].get("description", ""),
diff --git a/gso/cli/netbox.py b/gso/cli/netbox.py
index b4a8b1b6..8765f1a4 100644
--- a/gso/cli/netbox.py
+++ b/gso/cli/netbox.py
@@ -14,7 +14,7 @@ def netbox_initial_setup() -> None:
"""Set up NetBox for the first time.
It includes:
- - Creating a default site (GÉANT)
+ - Creating a default site (GEANT)
- Creating device roles (Router)
"""
typer.echo("Initial setup of NetBox ...")
@@ -22,7 +22,7 @@ def netbox_initial_setup() -> None:
nbclient = NetboxClient()
- typer.echo("Creating GÉANT site ...")
+ typer.echo("Creating GEANT site ...")
try:
nbclient.create_device_site(DEFAULT_SITE["name"], DEFAULT_SITE["slug"])
typer.echo("Site created successfully.")
diff --git a/gso/services/crm.py b/gso/services/crm.py
index 810df588..b417b88a 100644
--- a/gso/services/crm.py
+++ b/gso/services/crm.py
@@ -1,6 +1,6 @@
"""A module that returns the customers available in :term:`GSO`.
-For the time being, it's hardcoded to only contain GÉANT as a customer, since this is needed for the deployment of phase
+For the time being, it's hardcoded to only contain GEANT as a customer, since this is needed for the deployment of phase
1.
"""
@@ -16,7 +16,7 @@ def all_customers() -> list[dict]:
return [
{
"id": "8f0df561-ce9d-4d9c-89a8-7953d3ffc961",
- "name": "GÉANT",
+ "name": "GEANT",
},
]
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index b54f0957..a9c8cda7 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -56,7 +56,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
title = product_name
tt_number: str
- customer: str = ReadOnlyField("GÉANT")
+ customer: str = ReadOnlyField("GEANT")
geant_s_sid: str
iptrunk_description: str
iptrunk_type: IptrunkType
diff --git a/gso/workflows/router/create_router.py b/gso/workflows/router/create_router.py
index 978e33ba..78bd2649 100644
--- a/gso/workflows/router/create_router.py
+++ b/gso/workflows/router/create_router.py
@@ -43,7 +43,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
title = product_name
tt_number: str
- customer: str = ReadOnlyField("GÉANT")
+ customer: str = ReadOnlyField("GEANT")
vendor: Vendor
router_site: _site_selector() # type: ignore[valid-type]
hostname: str
diff --git a/gso/workflows/site/create_site.py b/gso/workflows/site/create_site.py
index 8e6e13f8..52ed8c95 100644
--- a/gso/workflows/site/create_site.py
+++ b/gso/workflows/site/create_site.py
@@ -22,7 +22,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
class Config:
title = product_name
- customer: str = ReadOnlyField("GÉANT")
+ customer: str = ReadOnlyField("GEANT")
site_name: str
site_city: str
site_country: str
diff --git a/setup.py b/setup.py
index aca090ff..3f5d75dc 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@ from setuptools import find_packages, setup
setup(
name="geant-service-orchestrator",
version="0.9",
- author="GÉANT",
- author_email="swd@geant.org",
+ author="GÉANT Orchestration and Automation Team",
+ author_email="goat@geant.org",
description="GÉANT Service Orchestrator",
url="https://gitlab.software.geant.org/goat/gap/geant-service-orchestrator",
packages=find_packages(),
diff --git a/test/api/test_imports.py b/test/api/test_imports.py
index b4d58f86..d3e63ea9 100644
--- a/test/api/test_imports.py
+++ b/test/api/test_imports.py
@@ -23,7 +23,7 @@ def iptrunk_data(nokia_router_subscription_factory, faker):
router_side_a = nokia_router_subscription_factory()
router_side_b = nokia_router_subscription_factory()
return {
- "customer": "GÉANT",
+ "customer": "GEANT",
"geant_s_sid": faker.geant_sid(),
"iptrunk_type": IptrunkType.DARK_FIBER,
"iptrunk_description": faker.sentence(),
@@ -107,7 +107,7 @@ def site_data(faker):
"site_internal_id": faker.pyint(),
"site_tier": SiteTier.TIER1,
"site_ts_address": faker.ipv4(),
- "customer": "GÉANT",
+ "customer": "GEANT",
}
@@ -120,7 +120,7 @@ def router_data(faker, site_data):
"router_vendor": Vendor.JUNIPER,
"router_site": site_data["site_name"],
"ts_port": 1234,
- "customer": "GÉANT",
+ "customer": "GEANT",
"router_lo_ipv4_address": mock_ipv4,
"router_lo_ipv6_address": faker.ipv6(),
"router_lo_iso_address": iso_from_ipv4(mock_ipv4),
@@ -134,7 +134,7 @@ def super_pop_switch_data(faker, site_data):
"hostname": "127.0.0.1",
"super_pop_switch_site": site_data["site_name"],
"super_pop_switch_ts_port": 1234,
- "customer": "GÉANT",
+ "customer": "GEANT",
"super_pop_switch_mgmt_ipv4_address": mock_ipv4,
}
@@ -145,7 +145,7 @@ def office_router_data(faker, site_data):
"office_router_fqdn": "127.0.0.1",
"office_router_site": site_data["site_name"],
"office_router_ts_port": 1234,
- "customer": "GÉANT",
+ "customer": "GEANT",
"office_router_lo_ipv4_address": faker.ipv4(),
"office_router_lo_ipv6_address": faker.ipv6(),
}
diff --git a/test/workflows/site/test_create_site.py b/test/workflows/site/test_create_site.py
index 6a260bc1..54fdbce3 100644
--- a/test/workflows/site/test_create_site.py
+++ b/test/workflows/site/test_create_site.py
@@ -65,7 +65,7 @@ def test_site_name_is_incorrect(responses, faker):
"site_internal_id": faker.pyint(),
"site_tier": SiteTier.TIER1,
"site_ts_address": faker.ipv4(),
- "customer": get_customer_by_name("GÉANT")["id"],
+ "customer": get_customer_by_name("GEANT")["id"],
},
]
--
GitLab