diff --git a/docs/source/conf.py b/docs/source/conf.py
index 74502fb22f8ea416e23b894aae62d6e1d7727368..a38860b64ffea8f386ac3711263d7e88bcf2ba63 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 1a20c14be3840b76a6085f8756af943ef27c9b3d..223278f066141b28d7333c214d24d31c40217357 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 b4a8b1b6f3a2c387f06e93c77e6956ac6389474b..8765f1a49ecc3653be9b6bf14a730080b5974177 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 810df588e5b3c93081be1796d78bf9b21f4ae23f..b417b88acdaa19e86c8bcd6d2d4a75d29ba6ff03 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 b54f095758b5da8c10724e3fa9bc7ec279f87542..a9c8cda79344ac6fdb03770ca21bebf9a71c9070 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 978e33ba3205edd747e2193a30eca2f82699a77f..78bd2649b86af7691c992039070717fadf5e6a4d 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 8e6e13f8436375b4465959985cc115c1e74c40cc..52ed8c95e566a814d0d2c40435fa64a192133e74 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 aca090ffb02788ef8399819c22d01bb6535b8492..3f5d75dc656e6416e47693fdc10235a230469d77 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 b4d58f86cef94b2992973cc487fcede995819f14..d3e63ea9c267906a01955357c322ac18b0f0668f 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 6a260bc111f055b5724af699da61d4d6a145886f..54fdbce36f654dba93813debe98d0ee957abf883 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"],
},
]