Finished release 2.2.

Changelog.md

@@ -2,9 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2] - 2024-06-18
+- Fixed DNS allocation when hostname is already in use during allocation process.
+- Fixed regex that validates interface names
+- Changed Modify IP trunk label to Modify ISIS
+
 ## [2.1] - 2024-06-17
 - Fixed tiny bugs in migrate IP trunk.
-§
+
 ## [2.0] - 2024-05-23
 - Upgraded `orchestrator-core` to version 2!
 - Added Opengear products.

gso/services/infoblox.py

@@ -250,9 +250,8 @@ def create_host_by_ip(
                         :term:`GSO`.
     """
     if not hostname_available(hostname):
-        msg = f"FQDN {hostname} already taken, nothing to be done."
-        logger.warning(msg)
-        return
+        msg = f"FQDN '{hostname}' is already in use, allocation aborted."
+        raise AllocationError(msg)
 
     conn, oss = _setup_connection()
     ipv6_object = objects.IP.create(ip=str(ipv6_address), mac=NULL_MAC, configure_for_dhcp=False)

gso/utils/helpers.py

@@ -252,8 +252,8 @@ def validate_interface_name_list(interface_name_list: list, vendor: str) -> list
     """Validate that the provided interface name matches the expected pattern.
 
     The expected pattern for the interface name is one of 'ge', 'et', 'xe' followed by a dash '-',
-    then a digit between 0 and 9, a forward slash '/', another digit between 0 and 9,
-    another forward slash '/', and ends with a digit between 0 and 9.
+    then a number between 0 and 19, a forward slash '/', another number between 0 and 99,
+    another forward slash '/', and ends with a number between 0 and 99.
     For example: 'xe-1/0/0'.
 
     :param list interface_name_list: List of interface names to validate.
@@ -265,7 +265,7 @@ def validate_interface_name_list(interface_name_list: list, vendor: str) -> list
     # For Nokia nothing to do
     if vendor == Vendor.NOKIA:
         return interface_name_list
-    pattern = re.compile(r"^(ge|et|xe)-[0-9]/[0-9]/[0-9]$")
+    pattern = re.compile(r"^(ge|et|xe)-1?[0-9]/[0-9]{1,2}/[0-9]{1,2}$")
     for interface in interface_name_list:
         if not bool(pattern.match(interface.interface_name)):
             error_msg = (

gso/workflows/iptrunk/modify_isis_metric.py

@@ -92,7 +92,7 @@ def provision_ip_trunk_isis_iface_real(
 
 
 @workflow(
-    "Modify IP trunk",
+    "Modify ISIS metric",
     initial_input_form=wrap_modify_initial_input_form(initial_input_form_generator),
     target=Target.MODIFY,
 )

setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="geant-service-orchestrator",
-    version="2.1",
+    version="2.2",
     author="GÉANT Orchestration and Automation Team",
     author_email="goat@geant.org",
     description="GÉANT Service Orchestrator",