diff --git a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES
index a238cf9c4aa9ace65c39dfb652a057ca53ab8ec9..44333b51519691ba1428cad21ca5c707b9b66549 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES
+++ b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES
@@ -34,6 +34,7 @@ published_apis/models/ipv6_address_range.py
 published_apis/models/local2d_point_uncertainty_ellipse.py
 published_apis/models/local3d_point_uncertainty_ellipsoid.py
 published_apis/models/local_origin.py
+published_apis/models/o_auth_grant_type.py
 published_apis/models/operation.py
 published_apis/models/point.py
 published_apis/models/point_altitude.py
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION
index 18bb4182dd01428f1d4c3c2145501ee5d40455a3..b23eb27529e2bacf6c8c06f725c323d9fb87f042 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION
+++ b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION
@@ -1 +1 @@
-7.5.0
+7.11.0
diff --git a/services/TS29222_CAPIF_Publish_Service_API/README.md b/services/TS29222_CAPIF_Publish_Service_API/README.md
index a8ee25750f7e1979fac432c942c9975c6e9b778b..60ff8b067416f4815ed1c0b7b954e45a1a0e0189 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/README.md
+++ b/services/TS29222_CAPIF_Publish_Service_API/README.md
@@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory:
 
 ```
 pip3 install -r requirements.txt
-python3 -m openapi_server
+python3 -m published_apis
 ```
 
 and open your browser to here:
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py
index 695b3ae2d76701115deac7f2d80317cafaa8793f..4f43631cfd498ab301b360d4d55394cd6eeef80a 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py
@@ -14,7 +14,6 @@ service_operations = PublishServiceOperations()
 
 valid_user = ControlAccess()
 
-
 def cert_validation():
     def _cert_validation(f):
         @wraps(f)
@@ -51,7 +50,6 @@ def cert_validation():
         return __cert_validation
     return _cert_validation
 
-
 @cert_validation()
 def apf_id_service_apis_get(apf_id):  # noqa: E501
     """apf_id_service_apis_get
@@ -68,7 +66,6 @@ def apf_id_service_apis_get(apf_id):  # noqa: E501
 
     return res
 
-
 @cert_validation()
 def apf_id_service_apis_post(apf_id, body):  # noqa: E501
     """apf_id_service_apis_post
@@ -114,7 +111,6 @@ def apf_id_service_apis_post(apf_id, body):  # noqa: E501
 
     return res
 
-
 @cert_validation()
 def apf_id_service_apis_service_api_id_delete(service_api_id, apf_id):  # noqa: E501
     """apf_id_service_apis_service_api_id_delete
@@ -134,7 +130,6 @@ def apf_id_service_apis_service_api_id_delete(service_api_id, apf_id):  # noqa:
 
     return res
 
-
 @cert_validation()
 def apf_id_service_apis_service_api_id_get(service_api_id, apf_id):  # noqa: E501
     """apf_id_service_apis_service_api_id_get
@@ -153,7 +148,6 @@ def apf_id_service_apis_service_api_id_get(service_api_id, apf_id):  # noqa: E50
 
     return res
 
-
 @cert_validation()
 def apf_id_service_apis_service_api_id_put(service_api_id, apf_id, body):  # noqa: E501
     """apf_id_service_apis_service_api_id_put
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py
index 139597f9cb07c5d48bed18984ec4747f4b4f3438..6d294ffd6df1a26a469dbb4e72533b01503468dd 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py
@@ -1,2 +1,2 @@
-
+from typing import List
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py
index d036df693ea41dfaa3debffffad0462c1fcd8e4a..809cf1b1c02cb19bb8a89adb72fe206591eb50e1 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py
@@ -1,2 +1,44 @@
 # flake8: noqa
 # import models into model package
+from published_apis.models.aef_location import AefLocation
+from published_apis.models.aef_profile import AefProfile
+from published_apis.models.api_status import ApiStatus
+from published_apis.models.civic_address import CivicAddress
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.custom_operation import CustomOperation
+from published_apis.models.data_format import DataFormat
+from published_apis.models.ellipsoid_arc import EllipsoidArc
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographic_area import GeographicArea
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.interface_description import InterfaceDescription
+from published_apis.models.invalid_param import InvalidParam
+from published_apis.models.ip_addr_range import IpAddrRange
+from published_apis.models.ipv4_address_range import Ipv4AddressRange
+from published_apis.models.ipv6_addr1 import Ipv6Addr1
+from published_apis.models.ipv6_address_range import Ipv6AddressRange
+from published_apis.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse
+from published_apis.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid
+from published_apis.models.local_origin import LocalOrigin
+from published_apis.models.o_auth_grant_type import OAuthGrantType
+from published_apis.models.operation import Operation
+from published_apis.models.point import Point
+from published_apis.models.point_altitude import PointAltitude
+from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle
+from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from published_apis.models.polygon import Polygon
+from published_apis.models.problem_details import ProblemDetails
+from published_apis.models.protocol import Protocol
+from published_apis.models.published_api_path import PublishedApiPath
+from published_apis.models.relative_cartesian_location import RelativeCartesianLocation
+from published_apis.models.resource import Resource
+from published_apis.models.security_method import SecurityMethod
+from published_apis.models.service_api_description import ServiceAPIDescription
+from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch
+from published_apis.models.service_kpis import ServiceKpis
+from published_apis.models.shareable_information import ShareableInformation
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipse import UncertaintyEllipse
+from published_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid
+from published_apis.models.version import Version
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py
index 40e90aa6254b2b16f5338c80305125cdd9fbf05b..ccc48596a26feb79bdbd871b3a4c7e8793247a7e 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.civic_address import CivicAddress
+from published_apis.models.geographic_area import GeographicArea
+from published_apis import util
+
 from published_apis.models.civic_address import CivicAddress  # noqa: E501
 from published_apis.models.geographic_area import GeographicArea  # noqa: E501
 
-
 class AefLocation(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py
index 8d8ae4708c42e76200ee598aacf4d643a4df8c07..249c595eb549b6bb7a0378ff18437584a09a7995 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py
@@ -1,25 +1,36 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from published_apis.models.base_model import Model
+from published_apis.models.aef_location import AefLocation
+from published_apis.models.data_format import DataFormat
+from published_apis.models.interface_description import InterfaceDescription
+from published_apis.models.ip_addr_range import IpAddrRange
+from published_apis.models.o_auth_grant_type import OAuthGrantType
+from published_apis.models.protocol import Protocol
+from published_apis.models.security_method import SecurityMethod
+from published_apis.models.service_kpis import ServiceKpis
+from published_apis.models.version import Version
 from published_apis import util
+
 from published_apis.models.aef_location import AefLocation  # noqa: E501
-from published_apis.models.base_model import Model
 from published_apis.models.data_format import DataFormat  # noqa: E501
 from published_apis.models.interface_description import InterfaceDescription  # noqa: E501
 from published_apis.models.ip_addr_range import IpAddrRange  # noqa: E501
+from published_apis.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
 from published_apis.models.protocol import Protocol  # noqa: E501
 from published_apis.models.security_method import SecurityMethod  # noqa: E501
 from published_apis.models.service_kpis import ServiceKpis  # noqa: E501
 from published_apis.models.version import Version  # noqa: E501
 
-
 class AefProfile(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
     Do not edit the class manually.
     """
 
-    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None, aef_location=None, service_kpis=None, ue_ip_range=None):  # noqa: E501
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, grant_types=None, domain_name=None, interface_descriptions=None, aef_location=None, service_kpis=None, ue_ip_range=None):  # noqa: E501
         """AefProfile - a model defined in OpenAPI
 
         :param aef_id: The aef_id of this AefProfile.  # noqa: E501
@@ -32,6 +43,8 @@ class AefProfile(Model):
         :type data_format: DataFormat
         :param security_methods: The security_methods of this AefProfile.  # noqa: E501
         :type security_methods: List[SecurityMethod]
+        :param grant_types: The grant_types of this AefProfile.  # noqa: E501
+        :type grant_types: List[OAuthGrantType]
         :param domain_name: The domain_name of this AefProfile.  # noqa: E501
         :type domain_name: str
         :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
@@ -49,6 +62,7 @@ class AefProfile(Model):
             'protocol': Protocol,
             'data_format': DataFormat,
             'security_methods': List[SecurityMethod],
+            'grant_types': List[OAuthGrantType],
             'domain_name': str,
             'interface_descriptions': List[InterfaceDescription],
             'aef_location': AefLocation,
@@ -62,6 +76,7 @@ class AefProfile(Model):
             'protocol': 'protocol',
             'data_format': 'dataFormat',
             'security_methods': 'securityMethods',
+            'grant_types': 'grantTypes',
             'domain_name': 'domainName',
             'interface_descriptions': 'interfaceDescriptions',
             'aef_location': 'aefLocation',
@@ -74,6 +89,7 @@ class AefProfile(Model):
         self._protocol = protocol
         self._data_format = data_format
         self._security_methods = security_methods
+        self._grant_types = grant_types
         self._domain_name = domain_name
         self._interface_descriptions = interface_descriptions
         self._aef_location = aef_location
@@ -210,6 +226,29 @@ class AefProfile(Model):
 
         self._security_methods = security_methods
 
+    @property
+    def grant_types(self) -> List[OAuthGrantType]:
+        """Gets the grant_types of this AefProfile.
+
+
+        :return: The grant_types of this AefProfile.
+        :rtype: List[OAuthGrantType]
+        """
+        return self._grant_types
+
+    @grant_types.setter
+    def grant_types(self, grant_types: List[OAuthGrantType]):
+        """Sets the grant_types of this AefProfile.
+
+
+        :param grant_types: The grant_types of this AefProfile.
+        :type grant_types: List[OAuthGrantType]
+        """
+        if grant_types is not None and len(grant_types) < 1:
+            raise ValueError("Invalid value for `grant_types`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._grant_types = grant_types
+
     @property
     def domain_name(self) -> str:
         """Gets the domain_name of this AefProfile.
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py
index 14b0d36b47f51f02a1eba14e8904e281668bdd19..0492b259ec217abc70a8edc84128d50d86634ca1 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class ApiStatus(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py
index d4fac36d17bd2ff6e56040683fc20ccbc914a556..ae24c559a7c66fe5c1347118c1d7b04a91f838a1 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py
@@ -1,4 +1,5 @@
 import pprint
+
 import typing
 
 from published_apis import util
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py
index 94b868bebcd2edca4e57d5b7a1c7e6d87446f0a1..b4fa7c063c1254b87ff7f99311aa84f0d202a5ad 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class CivicAddress(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py
index d69e24ba75985f9a34b7370fd6ebdeb8d8bc36c6..a91645f44f43bbc33b3e377ef8b998a10ec67772 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class CommunicationType(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py
index f99e4aedae9b09337c670881277243a2966f467f..1f4a66a6170d6244f192112194f9b1a686420432 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.operation import Operation
+from published_apis import util
+
 from published_apis.models.communication_type import CommunicationType  # noqa: E501
 from published_apis.models.operation import Operation  # noqa: E501
 
-
 class CustomOperation(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py
index b8892d621d6c465009716813c0d4ce3010f849e6..5c6c9072ba0adaebc4159ab1cab4634fd596dfb2 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class DataFormat(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py
index 550649e40a9e3c4371175299c3a22a2ef8d06372..ca81b714099046680e2cad9028cbf1791a245065 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class EllipsoidArc(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py
index 1bee0024fd3a619ecf1d16813f26af9a3725b324..f4754606966d1d27ee0da8a40eb20199c8544dcf 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
-from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
 
+from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
 class GADShape(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py
index 4c88245f94b88b140eeac6171d234019815855a2..0fa074cd8f170dcceb8e5da6544f6c8855955dd9 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py
@@ -1,13 +1,31 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.ellipsoid_arc import EllipsoidArc
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.point import Point
+from published_apis.models.point_altitude import PointAltitude
+from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle
+from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from published_apis.models.polygon import Polygon
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipse import UncertaintyEllipse
+from published_apis import util
+
+from published_apis.models.ellipsoid_arc import EllipsoidArc  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from published_apis.models.point import Point  # noqa: E501
+from published_apis.models.point_altitude import PointAltitude  # noqa: E501
+from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty  # noqa: E501
+from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle  # noqa: E501
+from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse  # noqa: E501
+from published_apis.models.polygon import Polygon  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from published_apis.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class GeographicArea(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py
index 7ef6a2cd12e48b4c1ea27dbb6603a21b6c8a5b50..49c59769846a4ade20f6c52aaf14bb4f45beeaea 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class GeographicalCoordinates(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py
index dec959628c16f492cff126fdd8c2928b700cccda..9dc53d393faad9390ece7486441dba0901b04947 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py
@@ -1,11 +1,16 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
-from published_apis.models.security_method import SecurityMethod  # noqa: E501
+from published_apis.models.o_auth_grant_type import OAuthGrantType
+from published_apis.models.security_method import SecurityMethod
+import re
+from published_apis import util
 
+from published_apis.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
+from published_apis.models.security_method import SecurityMethod  # noqa: E501
+import re  # noqa: E501
 
 class InterfaceDescription(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,7 +18,7 @@ class InterfaceDescription(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None):  # noqa: E501
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None, grant_types=None):  # noqa: E501
         """InterfaceDescription - a model defined in OpenAPI
 
         :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
@@ -28,6 +33,8 @@ class InterfaceDescription(Model):
         :type api_prefix: str
         :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
         :type security_methods: List[SecurityMethod]
+        :param grant_types: The grant_types of this InterfaceDescription.  # noqa: E501
+        :type grant_types: List[OAuthGrantType]
         """
         self.openapi_types = {
             'ipv4_addr': str,
@@ -35,7 +42,8 @@ class InterfaceDescription(Model):
             'fqdn': str,
             'port': int,
             'api_prefix': str,
-            'security_methods': List[SecurityMethod]
+            'security_methods': List[SecurityMethod],
+            'grant_types': List[OAuthGrantType]
         }
 
         self.attribute_map = {
@@ -44,7 +52,8 @@ class InterfaceDescription(Model):
             'fqdn': 'fqdn',
             'port': 'port',
             'api_prefix': 'apiPrefix',
-            'security_methods': 'securityMethods'
+            'security_methods': 'securityMethods',
+            'grant_types': 'grantTypes'
         }
 
         self._ipv4_addr = ipv4_addr
@@ -53,6 +62,7 @@ class InterfaceDescription(Model):
         self._port = port
         self._api_prefix = api_prefix
         self._security_methods = security_methods
+        self._grant_types = grant_types
 
     @classmethod
     def from_dict(cls, dikt) -> 'InterfaceDescription':
@@ -136,7 +146,7 @@ class InterfaceDescription(Model):
         if fqdn is not None and len(fqdn) < 4:
             raise ValueError("Invalid value for `fqdn`, length must be greater than or equal to `4`")  # noqa: E501
         if fqdn is not None and not re.search(r'^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$', fqdn):  # noqa: E501
-            raise ValueError("Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
 
         self._fqdn = fqdn
 
@@ -214,3 +224,26 @@ class InterfaceDescription(Model):
             raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
 
         self._security_methods = security_methods
+
+    @property
+    def grant_types(self) -> List[OAuthGrantType]:
+        """Gets the grant_types of this InterfaceDescription.
+
+
+        :return: The grant_types of this InterfaceDescription.
+        :rtype: List[OAuthGrantType]
+        """
+        return self._grant_types
+
+    @grant_types.setter
+    def grant_types(self, grant_types: List[OAuthGrantType]):
+        """Sets the grant_types of this InterfaceDescription.
+
+
+        :param grant_types: The grant_types of this InterfaceDescription.
+        :type grant_types: List[OAuthGrantType]
+        """
+        if grant_types is not None and len(grant_types) < 1:
+            raise ValueError("Invalid value for `grant_types`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._grant_types = grant_types
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py
index 4dd00c7af87dc50fe1ad6b9940c8b470f10dcae9..16472eccf79cf966ceec53f4e07fb293bdca4795 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class InvalidParam(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py
index e4bffa1c6834d9da8fadd80a9ef0a58a4e8fdbc4..7934c226363efd82ecf40b994d721fac182e7c3a 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.ipv4_address_range import Ipv4AddressRange
+from published_apis.models.ipv6_address_range import Ipv6AddressRange
+from published_apis import util
+
 from published_apis.models.ipv4_address_range import Ipv4AddressRange  # noqa: E501
 from published_apis.models.ipv6_address_range import Ipv6AddressRange  # noqa: E501
 
-
 class IpAddrRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py
index bfca85a70a36e4bc6fa708d32a8d74c889f82e04..f72ef00e6bf87a6aed898b2a5bdc557276251c9a 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py
@@ -1,10 +1,12 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+import re
+from published_apis import util
 
+import re  # noqa: E501
 
 class Ipv4AddressRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -67,7 +69,7 @@ class Ipv4AddressRange(Model):
         if start is None:
             raise ValueError("Invalid value for `start`, must not be `None`")  # noqa: E501
         if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start):  # noqa: E501
-            raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._start = start
 
@@ -94,6 +96,6 @@ class Ipv4AddressRange(Model):
         if end is None:
             raise ValueError("Invalid value for `end`, must not be `None`")  # noqa: E501
         if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end):  # noqa: E501
-            raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._end = end
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py
index 082fbaf1aeb951e7199eb70647a2f8d39735f162..268ec6662c346df7d7e0d4af5a914aac0f202c68 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class Ipv6Addr1(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py
index 3270bfc550671772f04e9089e3c70e68cbeff70a..37f319c85b44885b5729400062f56e81c435c2e6 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
-from published_apis.models.ipv6_addr1 import Ipv6Addr1  # noqa: E501
+from published_apis.models.ipv6_addr1 import Ipv6Addr1
+from published_apis import util
 
+from published_apis.models.ipv6_addr1 import Ipv6Addr1  # noqa: E501
 
 class Ipv6AddressRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py
index 777b98ed5fbc2c0337000ee68db6b003d80c1a08..2c575408c88f0cece05c3ff00959596fe07417da 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py
@@ -1,14 +1,21 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.local_origin import LocalOrigin
+from published_apis.models.relative_cartesian_location import RelativeCartesianLocation
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipse import UncertaintyEllipse
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.local_origin import LocalOrigin  # noqa: E501
 from published_apis.models.relative_cartesian_location import RelativeCartesianLocation  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from published_apis.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class Local2dPointUncertaintyEllipse(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py
index 728f69a97952fdd9d256ba460856f91bd8307d12..2dfe87ae7eec132d21d6ad1b13b5877467077ade 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py
@@ -1,21 +1,28 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.local_origin import LocalOrigin
+from published_apis.models.relative_cartesian_location import RelativeCartesianLocation
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.local_origin import LocalOrigin  # noqa: E501
 from published_apis.models.relative_cartesian_location import RelativeCartesianLocation  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from published_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid  # noqa: E501
 
-
 class Local3dPointUncertaintyEllipsoid(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
     Do not edit the class manually.
     """
 
-    def __init__(self, shape=None, local_origin=None, point=None, uncertainty_ellipsoid=None, confidence=None):  # noqa: E501
+    def __init__(self, shape=None, local_origin=None, point=None, uncertainty_ellipsoid=None, confidence=None, v_confidence=None):  # noqa: E501
         """Local3dPointUncertaintyEllipsoid - a model defined in OpenAPI
 
         :param shape: The shape of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
@@ -28,13 +35,16 @@ class Local3dPointUncertaintyEllipsoid(Model):
         :type uncertainty_ellipsoid: UncertaintyEllipsoid
         :param confidence: The confidence of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
         :type confidence: int
+        :param v_confidence: The v_confidence of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
+        :type v_confidence: int
         """
         self.openapi_types = {
             'shape': SupportedGADShapes,
             'local_origin': LocalOrigin,
             'point': RelativeCartesianLocation,
             'uncertainty_ellipsoid': UncertaintyEllipsoid,
-            'confidence': int
+            'confidence': int,
+            'v_confidence': int
         }
 
         self.attribute_map = {
@@ -42,7 +52,8 @@ class Local3dPointUncertaintyEllipsoid(Model):
             'local_origin': 'localOrigin',
             'point': 'point',
             'uncertainty_ellipsoid': 'uncertaintyEllipsoid',
-            'confidence': 'confidence'
+            'confidence': 'confidence',
+            'v_confidence': 'vConfidence'
         }
 
         self._shape = shape
@@ -50,6 +61,7 @@ class Local3dPointUncertaintyEllipsoid(Model):
         self._point = point
         self._uncertainty_ellipsoid = uncertainty_ellipsoid
         self._confidence = confidence
+        self._v_confidence = v_confidence
 
     @classmethod
     def from_dict(cls, dikt) -> 'Local3dPointUncertaintyEllipsoid':
@@ -182,3 +194,30 @@ class Local3dPointUncertaintyEllipsoid(Model):
             raise ValueError("Invalid value for `confidence`, must be a value greater than or equal to `0`")  # noqa: E501
 
         self._confidence = confidence
+
+    @property
+    def v_confidence(self) -> int:
+        """Gets the v_confidence of this Local3dPointUncertaintyEllipsoid.
+
+        Indicates value of confidence.  # noqa: E501
+
+        :return: The v_confidence of this Local3dPointUncertaintyEllipsoid.
+        :rtype: int
+        """
+        return self._v_confidence
+
+    @v_confidence.setter
+    def v_confidence(self, v_confidence: int):
+        """Sets the v_confidence of this Local3dPointUncertaintyEllipsoid.
+
+        Indicates value of confidence.  # noqa: E501
+
+        :param v_confidence: The v_confidence of this Local3dPointUncertaintyEllipsoid.
+        :type v_confidence: int
+        """
+        if v_confidence is not None and v_confidence > 100:  # noqa: E501
+            raise ValueError("Invalid value for `v_confidence`, must be a value less than or equal to `100`")  # noqa: E501
+        if v_confidence is not None and v_confidence < 0:  # noqa: E501
+            raise ValueError("Invalid value for `v_confidence`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._v_confidence = v_confidence
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py
index 82df6391e1ac6b1253028f6edac90e0c7840b1ec..6686d14df63e8345f75331cb192d0ac1690ff23d 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py
@@ -1,10 +1,14 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
-from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from published_apis.models.geographic_area import GeographicArea
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis import util
 
+from published_apis.models.geographic_area import GeographicArea  # noqa: E501
+from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 
 class LocalOrigin(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -12,26 +16,36 @@ class LocalOrigin(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, coordinate_id=None, point=None):  # noqa: E501
+    def __init__(self, coordinate_id=None, point=None, area=None, horiz_axes_orientation=None):  # noqa: E501
         """LocalOrigin - a model defined in OpenAPI
 
         :param coordinate_id: The coordinate_id of this LocalOrigin.  # noqa: E501
         :type coordinate_id: str
         :param point: The point of this LocalOrigin.  # noqa: E501
         :type point: GeographicalCoordinates
+        :param area: The area of this LocalOrigin.  # noqa: E501
+        :type area: GeographicArea
+        :param horiz_axes_orientation: The horiz_axes_orientation of this LocalOrigin.  # noqa: E501
+        :type horiz_axes_orientation: int
         """
         self.openapi_types = {
             'coordinate_id': str,
-            'point': GeographicalCoordinates
+            'point': GeographicalCoordinates,
+            'area': GeographicArea,
+            'horiz_axes_orientation': int
         }
 
         self.attribute_map = {
             'coordinate_id': 'coordinateId',
-            'point': 'point'
+            'point': 'point',
+            'area': 'area',
+            'horiz_axes_orientation': 'horizAxesOrientation'
         }
 
         self._coordinate_id = coordinate_id
         self._point = point
+        self._area = area
+        self._horiz_axes_orientation = horiz_axes_orientation
 
     @classmethod
     def from_dict(cls, dikt) -> 'LocalOrigin':
@@ -62,6 +76,8 @@ class LocalOrigin(Model):
         :param coordinate_id: The coordinate_id of this LocalOrigin.
         :type coordinate_id: str
         """
+        if coordinate_id is None:
+            raise ValueError("Invalid value for `coordinate_id`, must not be `None`")  # noqa: E501
 
         self._coordinate_id = coordinate_id
 
@@ -85,3 +101,51 @@ class LocalOrigin(Model):
         """
 
         self._point = point
+
+    @property
+    def area(self) -> GeographicArea:
+        """Gets the area of this LocalOrigin.
+
+
+        :return: The area of this LocalOrigin.
+        :rtype: GeographicArea
+        """
+        return self._area
+
+    @area.setter
+    def area(self, area: GeographicArea):
+        """Sets the area of this LocalOrigin.
+
+
+        :param area: The area of this LocalOrigin.
+        :type area: GeographicArea
+        """
+
+        self._area = area
+
+    @property
+    def horiz_axes_orientation(self) -> int:
+        """Gets the horiz_axes_orientation of this LocalOrigin.
+
+        Horizontal axes orientation angle clockwise from northing in 0.1 degrees.  # noqa: E501
+
+        :return: The horiz_axes_orientation of this LocalOrigin.
+        :rtype: int
+        """
+        return self._horiz_axes_orientation
+
+    @horiz_axes_orientation.setter
+    def horiz_axes_orientation(self, horiz_axes_orientation: int):
+        """Sets the horiz_axes_orientation of this LocalOrigin.
+
+        Horizontal axes orientation angle clockwise from northing in 0.1 degrees.  # noqa: E501
+
+        :param horiz_axes_orientation: The horiz_axes_orientation of this LocalOrigin.
+        :type horiz_axes_orientation: int
+        """
+        if horiz_axes_orientation is not None and horiz_axes_orientation > 3600:  # noqa: E501
+            raise ValueError("Invalid value for `horiz_axes_orientation`, must be a value less than or equal to `3600`")  # noqa: E501
+        if horiz_axes_orientation is not None and horiz_axes_orientation < 0:  # noqa: E501
+            raise ValueError("Invalid value for `horiz_axes_orientation`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._horiz_axes_orientation = horiz_axes_orientation
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..d957daf835fab450ea839b4133f127ca700ebdf9
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py
@@ -0,0 +1,34 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model import Model
+from published_apis import util
+
+
+class OAuthGrantType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """OAuthGrantType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OAuthGrantType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The OAuthGrantType of this OAuthGrantType.  # noqa: E501
+        :rtype: OAuthGrantType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py
index c59a6702cbbb5458c6fb9df20adf3969f0f18006..0923ce76b63a5a33925780b7b7c9d56a2164939e 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class Operation(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py
index 433aa9e86eed54a6499d9592629ee17d96d8cf12..d16cbaaa4e715e6eaf3f8745acca75c61c6b1483 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class Point(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py
index 7bfb24aea35a99d1598137df1cb78f603953e66b..0fb374f741ca0a8cdce6cc64e9d50f575677ec13 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class PointAltitude(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py
index 9bc6dbd52c146d8a6b477ec6d520f9c62c9fe00d..cf96f55d0b98e7e28b3966c9c7f83b49d43c6b96 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py
@@ -1,13 +1,19 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipse import UncertaintyEllipse
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from published_apis.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class PointAltitudeUncertainty(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py
index 7b15b671711acb96bf78cb2d285aa43c89613f9c..3b773f5106ed3a6842128c624b58280216dc363c 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class PointUncertaintyCircle(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py
index 13c8e1b728b0c0e5c1aa77b258e8b3eec1601aaa..ea57f68d20cee813da2e048c99546e89fe3eba5d 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py
@@ -1,13 +1,19 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis.models.uncertainty_ellipse import UncertaintyEllipse
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from published_apis.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class PointUncertaintyEllipse(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py
index d4ce9418c9f81429e04d259f481296f6b0fb84d0..8a3f6baaa04281e9bc98bd4cddaa548e1cff25af 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.gad_shape import GADShape
+from published_apis.models.geographical_coordinates import GeographicalCoordinates
+from published_apis.models.supported_gad_shapes import SupportedGADShapes
+from published_apis import util
+
+from published_apis.models.gad_shape import GADShape  # noqa: E501
 from published_apis.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from published_apis.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class Polygon(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py
index ac7c9ee947d49dbbf350ba9b552285d5192504a0..41b69ae84d49593bdc0ddff4927b40121e7c7045 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py
@@ -1,11 +1,14 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
-from published_apis.models.invalid_param import InvalidParam  # noqa: E501
+from published_apis.models.invalid_param import InvalidParam
+import re
+from published_apis import util
 
+from published_apis.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
 
 class ProblemDetails(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -259,6 +262,6 @@ class ProblemDetails(Model):
         :type supported_features: str
         """
         if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
-            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py
index dc6ae7eb66a5790f3ad46a5469d3e3edaa5adc50..9eb3203eeb8c81225b7cd9c1be7b50c750d03532 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class Protocol(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py
index a76f56fae938dacb1734239ba6e81cdf70038454..4d3538df63d55171b62948b7511b91f697737d76 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class PublishedApiPath(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py
index 35c9dbf5b7190a018396cd9529d63e23829b752f..2f17cb84bb6483097e037622aec5c1b41d503630 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class RelativeCartesianLocation(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py
index 6c8d09d8689135cde8c056ccb40395e5a233eaf2..fe7445dfb4764311b450577c3f4ea23b40d54082 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.custom_operation import CustomOperation
+from published_apis.models.operation import Operation
+from published_apis import util
+
 from published_apis.models.communication_type import CommunicationType  # noqa: E501
 from published_apis.models.custom_operation import CustomOperation  # noqa: E501
 from published_apis.models.operation import Operation  # noqa: E501
 
-
 class Resource(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py
index 01847e2b25c67b269906c42ed1c1bcda2cb2823c..59142370a751028a1d3ac63d73f707cf78f7ce63 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class SecurityMethod(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py
index e50c9e0156d90e4b43dc914951ff08f787b8e186..d1c2fef1b7287712ba8818b99e5651bd5628e68d 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py
@@ -1,14 +1,20 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from published_apis.models.base_model import Model
+from published_apis.models.aef_profile import AefProfile
+from published_apis.models.api_status import ApiStatus
+from published_apis.models.published_api_path import PublishedApiPath
+from published_apis.models.shareable_information import ShareableInformation
+import re
 from published_apis import util
+
 from published_apis.models.aef_profile import AefProfile  # noqa: E501
 from published_apis.models.api_status import ApiStatus  # noqa: E501
-from published_apis.models.base_model import Model
 from published_apis.models.published_api_path import PublishedApiPath  # noqa: E501
 from published_apis.models.shareable_information import ShareableInformation  # noqa: E501
-
+import re  # noqa: E501
 
 class ServiceAPIDescription(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -106,6 +112,7 @@ class ServiceAPIDescription(Model):
             "VendorExt": True if supp_feat_in_bin[8] == "1" else False
         }
 
+
     @classmethod
     def from_dict(cls, dikt) -> 'ServiceAPIDescription':
         """Returns the dict as a model
@@ -255,7 +262,7 @@ class ServiceAPIDescription(Model):
         :type supported_features: str
         """
         if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
-            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._supported_features = supported_features
 
@@ -324,7 +331,7 @@ class ServiceAPIDescription(Model):
         :type api_supp_feats: str
         """
         if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
-            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._api_supp_feats = api_supp_feats
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py
index d812d30d0c2d01195a9b3a1d8e13533df9900d60..71dd39c9f9132c3f0cbbbe1f4dcbfebce9b1d039 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py
@@ -1,14 +1,20 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from published_apis.models.base_model import Model
+from published_apis.models.aef_profile import AefProfile
+from published_apis.models.api_status import ApiStatus
+from published_apis.models.published_api_path import PublishedApiPath
+from published_apis.models.shareable_information import ShareableInformation
+import re
 from published_apis import util
+
 from published_apis.models.aef_profile import AefProfile  # noqa: E501
 from published_apis.models.api_status import ApiStatus  # noqa: E501
-from published_apis.models.base_model import Model
 from published_apis.models.published_api_path import PublishedApiPath  # noqa: E501
 from published_apis.models.shareable_information import ShareableInformation  # noqa: E501
-
+import re  # noqa: E501
 
 class ServiceAPIDescriptionPatch(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -212,7 +218,7 @@ class ServiceAPIDescriptionPatch(Model):
         :type api_supp_feats: str
         """
         if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
-            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._api_supp_feats = api_supp_feats
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py
index 2d0b3c17db4afbc15b0b13d915399174cd6b9cc8..f4b8ae1288c3ed10b3cbdaa10d67f9993ecab5ef 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py
@@ -1,10 +1,12 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+import re
+from published_apis import util
 
+import re  # noqa: E501
 
 class ServiceKpis(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -170,7 +172,7 @@ class ServiceKpis(Model):
         :type aval_comp: str
         """
         if aval_comp is not None and not re.search(r'^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$', aval_comp):  # noqa: E501
-            raise ValueError("Invalid value for `aval_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
 
         self._aval_comp = aval_comp
 
@@ -195,7 +197,7 @@ class ServiceKpis(Model):
         :type aval_gra_comp: str
         """
         if aval_gra_comp is not None and not re.search(r'^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$', aval_gra_comp):  # noqa: E501
-            raise ValueError("Invalid value for `aval_gra_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_gra_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
 
         self._aval_gra_comp = aval_gra_comp
 
@@ -220,7 +222,7 @@ class ServiceKpis(Model):
         :type aval_mem: str
         """
         if aval_mem is not None and not re.search(r'^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$', aval_mem):  # noqa: E501
-            raise ValueError("Invalid value for `aval_mem`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_mem`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
 
         self._aval_mem = aval_mem
 
@@ -245,7 +247,7 @@ class ServiceKpis(Model):
         :type aval_stor: str
         """
         if aval_stor is not None and not re.search(r'^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$', aval_stor):  # noqa: E501
-            raise ValueError("Invalid value for `aval_stor`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_stor`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
 
         self._aval_stor = aval_stor
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py
index 548e3753599f8f5140d3f4fc30815af64dd70e03..ff4aea1cb44ce283b31767862f5c3209134b1b35 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class ShareableInformation(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py
index 7b5da39915dde3f281e64fed7538a37ec001d0b4..50d7db722fbce2ecc82dc8bb214de23fb897b9a6 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class SupportedGADShapes(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py
index 7fc3e1720fe863c3e4fcf1a5e108266b2377005f..2aef9633efc33a1693d6d19825544c48bb21e1cc 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class UncertaintyEllipse(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py
index 7a89fe9675241a553b87ce3a27e81e53dbaa7547..88a428d469081c0d273a1997263692c40bc77c25 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis import util
 
 
 class UncertaintyEllipsoid(Model):
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py
index a53e20f2d53c692458e5042c6f57659efd32be3d..4126d65a176ac2538ca85993ce978050fe1bd0ee 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from published_apis import util
 from published_apis.models.base_model import Model
+from published_apis.models.custom_operation import CustomOperation
+from published_apis.models.resource import Resource
+from published_apis import util
+
 from published_apis.models.custom_operation import CustomOperation  # noqa: E501
 from published_apis.models.resource import Resource  # noqa: E501
 
-
 class Version(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml b/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml
index 041eed50493715bf874d53f509ae22769e7a3d11..149cc4c7a100f412d087e3d1ad8db1fc3c5e80cc 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml
@@ -3,9 +3,9 @@ info:
   description: "API for publishing service APIs.  \n© 2024, 3GPP Organizational Partners\
     \ (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
   title: CAPIF_Publish_Service_API
-  version: 1.3.0-alpha.5
+  version: 1.3.1
 externalDocs:
-  description: 3GPP TS 29.222 V18.5.0 Common API Framework for 3GPP Northbound APIs
+  description: 3GPP TS 29.222 V18.7.0 Common API Framework for 3GPP Northbound APIs
   url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
 servers:
 - url: "{apiRoot}/published-apis/v1"
@@ -715,6 +715,9 @@ components:
           - aefIds
         aefProfiles:
         - protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -893,6 +896,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -901,6 +907,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -918,6 +927,9 @@ components:
             maxReqRate: 0
             avalGraComp: avalGraComp
         - protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -1096,6 +1108,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -1104,6 +1119,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -1185,6 +1203,9 @@ components:
       description: Represents the description of an API's interface.
       example:
         ipv6Addr: ipv6Addr
+        grantTypes:
+        - null
+        - null
         securityMethods:
         - null
         - null
@@ -1193,13 +1214,10 @@ components:
         apiPrefix: apiPrefix
         ipv4Addr: ipv4Addr
       nullable: true
-      oneOf:
-      - required:
-        - ipv4Addr
-      - required:
-        - ipv6Addr
-      - required:
-        - fqdn
+      oneOf: 
+        - required: ["fqdn"]
+        - required: ["ipv4Addr"]
+        - required: ["ipv6Addr"]
       properties:
         ipv4Addr:
           description: |
@@ -1238,12 +1256,21 @@ components:
           minItems: 1
           title: securityMethods
           type: array
+        grantTypes:
+          items:
+            $ref: '#/components/schemas/OAuthGrantType'
+          minItems: 1
+          title: grantTypes
+          type: array
       title: InterfaceDescription
       type: object
     AefProfile:
       description: Represents the AEF profile data.
       example:
         protocol: HTTP_1_1
+        grantTypes:
+        - CLIENT_CREDENTIALS
+        - CLIENT_CREDENTIALS
         ueIpRange:
           ueIpv4AddrRanges:
           - start: 198.51.100.1
@@ -1422,6 +1449,9 @@ components:
         aefId: aefId
         interfaceDescriptions:
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -1430,6 +1460,9 @@ components:
           apiPrefix: apiPrefix
           ipv4Addr: ipv4Addr
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -1447,11 +1480,9 @@ components:
           maxReqRate: 0
           avalGraComp: avalGraComp
       nullable: true
-      oneOf:
-      - required:
-        - domainName
-      - required:
-        - interfaceDescriptions
+      oneOf: 
+        - required: ["domainName"]
+        - required: ["interfaceDescriptions"]
       properties:
         aefId:
           description: Identifier of the API exposing function
@@ -1475,6 +1506,12 @@ components:
           minItems: 1
           title: securityMethods
           type: array
+        grantTypes:
+          items:
+            $ref: '#/components/schemas/OAuthGrantType'
+          minItems: 1
+          title: grantTypes
+          type: array
         domainName:
           description: Domain to which API belongs to
           title: domainName
@@ -1907,7 +1944,9 @@ components:
       title: ServiceKpis
       type: object
     IpAddrRange:
-      anyOf: []
+      anyOf: 
+        - required: ["ueIpv4AddrRanges"]
+        - required: ["ueIpv6AddrRanges"]
       description: Represents the list of public IP ranges
       example:
         ueIpv4AddrRanges:
@@ -2112,6 +2151,23 @@ components:
       minimum: 0
       title: Port
       type: integer
+    OAuthGrantType:
+      anyOf:
+      - enum:
+        - CLIENT_CREDENTIALS
+        - AUTHORIZATION_CODE
+        - AUTHORIZATION_CODE_WITH_PKCE
+        type: string
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration and is not used to encode content defined in the present version of this API.
+        type: string
+      description: "Indicates the supported authorization flow (e.g. client credentials\
+        \ flow, authorization code         flow, etc.) to the API invoker.  \nPossible\
+        \ values are:\n- CLIENT_CREDENTIALS: Indicate that the grant type is is client\
+        \ credentials flow.\n- AUTHORIZATION_CODE: Indicate that the grant type is\
+        \ authorization code.\n- AUTHORIZATION_CODE_WITH_PKCE: Indicate that the grant\
+        \ type is authorization code with PKCE.\n"
+      title: OAuthGrantType
     DateTime:
       description: string with format "date-time" as defined in OpenAPI.
       format: date-time
@@ -2551,8 +2607,26 @@ components:
           type: string
         point:
           $ref: '#/components/schemas/GeographicalCoordinates'
+        area:
+          $ref: '#/components/schemas/GeographicArea'
+        horizAxesOrientation:
+          description: Horizontal axes orientation angle clockwise from northing in
+            0.1 degrees.
+          maximum: 3600
+          minimum: 0
+          title: HorizAxesOrientation
+          type: integer
+      required:
+      - coordinateId
       title: LocalOrigin
       type: object
+    HorizAxesOrientation:
+      description: Horizontal axes orientation angle clockwise from northing in 0.1
+        degrees.
+      maximum: 3600
+      minimum: 0
+      title: HorizAxesOrientation
+      type: integer
     RelativeCartesianLocation:
       description: Relative Cartesian Location
       properties:
@@ -2588,6 +2662,8 @@ components:
             $ref: '#/components/schemas/UncertaintyEllipsoid'
           confidence:
             $ref: '#/components/schemas/Confidence'
+          vConfidence:
+            $ref: '#/components/schemas/Confidence'
         required:
         - confidence
         - localOrigin
@@ -2687,9 +2763,6 @@ components:
       title: Ipv6AddressRange
       type: object
     Ipv6Addr_1:
-      allOf:
-      - pattern: "^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$"
-      - pattern: "^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$"
       description: |
         String identifying an IPv6 address formatted according to clause 4 of RFC5952. The mixed IPv4 IPv6 notation according to clause 5 of RFC5952 shall not be used.
       example: 2001:db8:85a3::8a2e:370:7334
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py
index 07e31c34943f330f77a4548c2e7f12628701a50e..108a343af2bf38eab1be3306648e840ca9c05c36 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py
@@ -2,6 +2,7 @@ import logging
 
 import connexion
 from flask_testing import TestCase
+
 from published_apis.encoder import JSONEncoder
 
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py
index 7f824b920aa117a74730d8d5cb6a7236e729534a..f194cded114dc612b58590f27e3b450ae05ed7be 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py
@@ -1,6 +1,9 @@
 import unittest
 
 from flask import json
+
+from published_apis.models.problem_details import ProblemDetails  # noqa: E501
+from published_apis.models.service_api_description import ServiceAPIDescription  # noqa: E501
 from published_apis.test import BaseTestCase
 
 
@@ -27,7 +30,7 @@ class TestDefaultController(BaseTestCase):
 
         
         """
-        service_api_description = {"serviceAPICategory":"serviceAPICategory","ccfId":"ccfId","apiName":"apiName","shareableInfo":{"capifProvDoms":["capifProvDoms","capifProvDoms"],"isShareable":True},"apiProvName":"apiProvName","supportedFeatures":"supportedFeatures","description":"description","apiSuppFeats":"apiSuppFeats","apiId":"apiId","apiStatus":{"aefIds":["aefIds","aefIds"]},"aefProfiles":[{"protocol":"HTTP_1_1","ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}},{"protocol":"HTTP_1_1","ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}}],"pubApiPath":{"ccfIds":["ccfIds","ccfIds"]}}
+        service_api_description = {"serviceAPICategory":"serviceAPICategory","ccfId":"ccfId","apiName":"apiName","shareableInfo":{"capifProvDoms":["capifProvDoms","capifProvDoms"],"isShareable":True},"apiProvName":"apiProvName","supportedFeatures":"supportedFeatures","description":"description","apiSuppFeats":"apiSuppFeats","apiId":"apiId","apiStatus":{"aefIds":["aefIds","aefIds"]},"aefProfiles":[{"protocol":"HTTP_1_1","grantTypes":["CLIENT_CREDENTIALS","CLIENT_CREDENTIALS"],"ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}},{"protocol":"HTTP_1_1","grantTypes":["CLIENT_CREDENTIALS","CLIENT_CREDENTIALS"],"ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}}],"pubApiPath":{"ccfIds":["ccfIds","ccfIds"]}}
         headers = { 
             'Accept': 'application/json',
             'Content-Type': 'application/json',
@@ -76,7 +79,7 @@ class TestDefaultController(BaseTestCase):
 
         
         """
-        service_api_description = {"serviceAPICategory":"serviceAPICategory","ccfId":"ccfId","apiName":"apiName","shareableInfo":{"capifProvDoms":["capifProvDoms","capifProvDoms"],"isShareable":True},"apiProvName":"apiProvName","supportedFeatures":"supportedFeatures","description":"description","apiSuppFeats":"apiSuppFeats","apiId":"apiId","apiStatus":{"aefIds":["aefIds","aefIds"]},"aefProfiles":[{"protocol":"HTTP_1_1","ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}},{"protocol":"HTTP_1_1","ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}}],"pubApiPath":{"ccfIds":["ccfIds","ccfIds"]}}
+        service_api_description = {"serviceAPICategory":"serviceAPICategory","ccfId":"ccfId","apiName":"apiName","shareableInfo":{"capifProvDoms":["capifProvDoms","capifProvDoms"],"isShareable":True},"apiProvName":"apiProvName","supportedFeatures":"supportedFeatures","description":"description","apiSuppFeats":"apiSuppFeats","apiId":"apiId","apiStatus":{"aefIds":["aefIds","aefIds"]},"aefProfiles":[{"protocol":"HTTP_1_1","grantTypes":["CLIENT_CREDENTIALS","CLIENT_CREDENTIALS"],"ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}},{"protocol":"HTTP_1_1","grantTypes":["CLIENT_CREDENTIALS","CLIENT_CREDENTIALS"],"ueIpRange":{"ueIpv4AddrRanges":[{"start":"198.51.100.1","end":"198.51.100.1"},{"start":"198.51.100.1","end":"198.51.100.1"}],"ueIpv6AddrRanges":[{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"},{"start":"2001:db8:85a3::8a2e:370:7334","end":"2001:db8:85a3::8a2e:370:7334"}]},"securityMethods":["PSK","PSK"],"versions":[{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"},{"apiVersion":"apiVersion","resources":[{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"},{"operations":[null,null],"commType":"REQUEST_RESPONSE","custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"description":"description","resourceName":"resourceName","custOpName":"custOpName","uri":"uri"}],"custOperations":[{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"},{"operations":["GET","GET"],"description":"description","custOpName":"custOpName"}],"expiry":"2000-01-23T04:56:07.000+00:00"}],"dataFormat":"JSON","domainName":"domainName","aefLocation":{"dcId":"dcId","geoArea":{"shape":"POINT","point":{"lon":36.988422590534526,"lat":-63.615366350946985}},"civicAddr":{"POBOX":"POBOX","usageRules":"usageRules","country":"country","PRD":"PRD","PLC":"PLC","HNO":"HNO","PRM":"PRM","HNS":"HNS","FLR":"FLR","A1":"A1","A2":"A2","A3":"A3","A4":"A4","STS":"STS","A5":"A5","A6":"A6","RDSEC":"RDSEC","providedBy":"providedBy","LOC":"LOC","UNIT":"UNIT","SEAT":"SEAT","POD":"POD","RDBR":"RDBR","method":"method","LMK":"LMK","POM":"POM","ADDCODE":"ADDCODE","RD":"RD","PC":"PC","PCN":"PCN","NAM":"NAM","BLD":"BLD","ROOM":"ROOM","RDSUBBR":"RDSUBBR"}},"aefId":"aefId","interfaceDescriptions":[{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"},{"ipv6Addr":"ipv6Addr","grantTypes":[null,null],"securityMethods":[null,null],"fqdn":"fqdn","port":5248,"apiPrefix":"apiPrefix","ipv4Addr":"ipv4Addr"}],"serviceKpis":{"avalMem":"avalMem","avalStor":"avalStor","avalComp":"avalComp","conBand":0,"maxRestime":0,"availability":0,"maxReqRate":0,"avalGraComp":"avalGraComp"}}],"pubApiPath":{"ccfIds":["ccfIds","ccfIds"]}}
         headers = { 
             'Accept': 'application/json',
             'Content-Type': 'application/json',
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py
index 76ef07950be6c5c7741944d89558faa4c457d238..c9978525d679bc3bac99264aadc3cfd7c45bb188 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py
@@ -1,6 +1,10 @@
 import unittest
 
 from flask import json
+
+from published_apis.models.problem_details import ProblemDetails  # noqa: E501
+from published_apis.models.service_api_description import ServiceAPIDescription  # noqa: E501
+from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch  # noqa: E501
 from published_apis.test import BaseTestCase
 
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py
index d21c4f633653a0eae75d04b2f6eff684ff9d200d..74e3c913a7db6246bc765f147ca872996112c6bb 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py
@@ -1,6 +1,7 @@
 import sys
 
 if sys.version_info < (3, 7):
+    import typing
 
     def is_generic(klass):
         """ Determine whether klass is a generic class """
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py
index 1b1956659bd24a0eb3af866e2001b7098986dd01..2e3d203f2e4c8a347ea4955a6e561abb9bcef864 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py
@@ -1,5 +1,6 @@
 import datetime
 
+import typing
 from published_apis import typing_utils
 
 
diff --git a/services/TS29222_CAPIF_Publish_Service_API/setup.py b/services/TS29222_CAPIF_Publish_Service_API/setup.py
index 8b1c991255816f36ad3ecced8745484a6162e5a6..5ae15b44aedd9aac26d9f1b19b76bc34ed9f97a1 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/setup.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/setup.py
@@ -1,3 +1,4 @@
+import sys
 from setuptools import setup, find_packages
 
 NAME = "published_apis"