Merge pull request #3384 from opsmill/pog-reconcile-after-pool-assign…

…ment Run IPAM reconcilement after assignment from pool
opsmill · May 21, 2024 · 23198a1 · 23198a1
2 parents 5493efe + d0d2a8f
commit 23198a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/backend/infrahub/core/node/resource_manager/ip_address_pool.py b/backend/infrahub/core/node/resource_manager/ip_address_pool.py
@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 from infrahub.core import registry
+from infrahub.core.ipam.reconciler import IpamReconciler
 from infrahub.core.query.ipam import get_ip_addresses
 from infrahub.core.query.resource_manager import (
     IPAddressPoolGetReserved,
@@ -65,6 +66,8 @@ async def get_resource(
         node = await Node.init(db=db, schema=target_schema, branch=branch)
         await node.new(db=db, address=str(next_prefix), ip_namespace=ip_namespace, **data)
         await node.save(db=db)
+        reconciler = IpamReconciler(db=db, branch=branch)
+        await reconciler.reconcile(ip_value=next_prefix, namespace=ip_namespace.id, node_uuid=node.get_id())
 
         if identifier:
             query_set = await IPAddressPoolSetReserved.init(

diff --git a/backend/infrahub/core/node/resource_manager/ip_prefix_pool.py b/backend/infrahub/core/node/resource_manager/ip_prefix_pool.py
@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 from infrahub.core import registry
+from infrahub.core.ipam.reconciler import IpamReconciler
 from infrahub.core.query.ipam import get_subnets
 from infrahub.core.query.resource_manager import (
     PrefixPoolGetReserved,
@@ -69,6 +70,8 @@ async def get_resource(
         node = await Node.init(db=db, schema=target_schema, branch=branch)
         await node.new(db=db, prefix=str(next_prefix), member_type=member_type, ip_namespace=ip_namespace, **data)
         await node.save(db=db)
+        reconciler = IpamReconciler(db=db, branch=branch)
+        await reconciler.reconcile(ip_value=next_prefix, namespace=ip_namespace.id, node_uuid=node.get_id())
 
         if identifier:
             query_set = await PrefixPoolSetReserved.init(