Renamed for clarification

Author: MrMatAP

src/cloud_provider_mdns/base.py

@@ -50,7 +50,7 @@ class Condition(PydanticIgnoreExtraFields):
     type: str
     status: bool
 
-class RouteParentStatus(PydanticIgnoreExtraFields):
+class HTTPRouteParentStatus(PydanticIgnoreExtraFields):
     """
     Status for a HTTPRoute parent
     """
@@ -62,7 +62,7 @@ class HTTPRouteStatus(PydanticIgnoreExtraFields):
     """
     Status for a HTTPRoute
     """
-    parents: typing.List[RouteParentStatus] = pydantic.Field(default_factory=list)
+    parents: typing.List[HTTPRouteParentStatus] = pydantic.Field(default_factory=list)
 
 class HTTPRoute(PydanticIgnoreExtraFields):
     """
@@ -80,7 +80,7 @@ def accepted(self) -> bool:
         return all(condition.status for condition in self.status.parents[0].conditions \
                    if condition.type == 'Accepted')
 
-    def spec_parent_by_status_parent_ref(self, parent: RouteParentStatus) -> ParentReference:
+    def spec_parent_by_status_parent_ref(self, parent: HTTPRouteParentStatus) -> ParentReference:
         """
         Return the spec parent for the given status parent ref of the HTTPRoute
         """
@@ -92,7 +92,7 @@ def spec_parent_by_status_parent_ref(self, parent: RouteParentStatus) -> ParentR
     def __str__(self) -> str:
         return f'{self.metadata.namespace}/{self.metadata.name}'
 
-class GatewayListenerSpec(PydanticIgnoreExtraFields):
+class KubernetesGatewayListenerSpec(PydanticIgnoreExtraFields):
     """
     Spec for a GatewayListener
     """
@@ -104,9 +104,9 @@ class KubernetesGatewaySpec(PydanticIgnoreExtraFields):
     """
     Spec for a Gateway
     """
-    listeners: typing.List[GatewayListenerSpec] = pydantic.Field(default_factory=list)
+    listeners: typing.List[KubernetesGatewayListenerSpec] = pydantic.Field(default_factory=list)
 
-class GatewayAddresses(PydanticIgnoreExtraFields):
+class KubernetesGatewayAddresses(PydanticIgnoreExtraFields):
     """
     Addresses for a Gateway
     """
@@ -117,7 +117,7 @@ class KubernetesGatewayStatus(PydanticIgnoreExtraFields):
     """
     Status for a Gateway
     """
-    addresses: typing.List[GatewayAddresses] = pydantic.Field(default_factory=list)
+    addresses: typing.List[KubernetesGatewayAddresses] = pydantic.Field(default_factory=list)
 
 class KubernetesGateway(PydanticIgnoreExtraFields):
     """

tests/conftest.py

@@ -4,8 +4,8 @@
 import pydantic
 
 from cloud_provider_mdns.base import KubernetesGateway, HTTPRoute, ObjectMeta, HTTPRouteSpec, \
-    ParentReference, HTTPRouteStatus, RouteParentStatus, Condition, BaseNameserver, Record, \
-    KubernetesGatewaySpec, GatewayListenerSpec, KubernetesGatewayStatus, GatewayAddresses
+    ParentReference, HTTPRouteStatus, HTTPRouteParentStatus, Condition, BaseNameserver, Record, \
+    KubernetesGatewaySpec, KubernetesGatewayListenerSpec, KubernetesGatewayStatus, KubernetesGatewayAddresses
 from cloud_provider_mdns.registry import Registry
 
 @pytest.fixture(scope='function')
@@ -21,8 +21,8 @@ def gateway(registry):
         apiVersion='gateway.networking.k8s.io/v1',
         kind='Gateway',
         metadata=ObjectMeta(name='gw', namespace='edge'),
-        spec=KubernetesGatewaySpec(listeners=[GatewayListenerSpec(name='https', port=443, protocol='HTTPS')]),
-        status=KubernetesGatewayStatus(addresses=[GatewayAddresses(type='IPAddress', value='172.18.0.2')]))
+        spec=KubernetesGatewaySpec(listeners=[KubernetesGatewayListenerSpec(name='https', port=443, protocol='HTTPS')]),
+        status=KubernetesGatewayStatus(addresses=[KubernetesGatewayAddresses(type='IPAddress', value='172.18.0.2')]))
 
 @pytest.fixture(scope='function')
 def route():
@@ -32,12 +32,12 @@ def route():
         metadata=ObjectMeta(name='app-route', namespace='app'),
         spec=HTTPRouteSpec(hostnames=['app.local'], parentRefs=[ParentReference(namespace='edge', name='gw')]),
         status=HTTPRouteStatus(
-            parents=[RouteParentStatus(parentRef=ParentReference(namespace='edge', name='gw'),
-                                       controllerName='istio.io/gateway-controller',
-                                       conditions=[
+            parents=[HTTPRouteParentStatus(parentRef=ParentReference(namespace='edge', name='gw'),
+                                           controllerName='istio.io/gateway-controller',
+                                           conditions=[
                                            Condition(type='Accepted', status=True),
                                            Condition(type='ResolvedRefs', status=True)
                                        ])
-            ]
+                     ]
         )
     )

tests/test_registry.py

@@ -1,6 +1,6 @@
 import pytest
 
-from cloud_provider_mdns.base import ParentReference, GatewayListenerSpec
+from cloud_provider_mdns.base import ParentReference, KubernetesGatewayListenerSpec
 
 
 @pytest.mark.asyncio