Skip to content
Snippets Groups Projects
Commit f206ea66 authored by Mohammad Torkashvand's avatar Mohammad Torkashvand
Browse files

rename GÉANT to GEANT, except documentations and branding

parent cd49961f
Branches
Tags
1 merge request!174rename GÉANT to GEANT
Pipeline #85908 failed
# -- 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 ---------------------------------------------------
......
......@@ -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", ""),
......
......@@ -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.")
......
"""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",
},
]
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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(),
......
......@@ -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(),
}
......
......@@ -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"],
},
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment