Merge pull request #232 from Nordix/ipam

Release IP on connection close
Nordix · Jun 10, 2022 · 5add698 · 5add698
2 parents 9178e20 + cd6121e
commit 5add698
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/pkg/ipam/server.go b/pkg/ipam/server.go
@@ -118,7 +118,35 @@ func (is *IpamServer) Allocate(ctx context.Context, child *ipamAPI.Child) (*ipam
 }
 
 func (is *IpamServer) Release(ctx context.Context, child *ipamAPI.Child) (*emptypb.Empty, error) {
-	return &emptypb.Empty{}, nil
+	logrus.Infof("Release: %v", child)
+	trench, exists := is.Trenches[child.GetSubnet().GetIpFamily()]
+	if !exists {
+		return &emptypb.Empty{}, nil
+	}
+	if child.GetSubnet().GetConduit() == nil {
+		return &emptypb.Empty{}, nil
+	}
+	if child.GetSubnet().GetConduit().GetTrench() == nil {
+		return &emptypb.Empty{}, nil
+	}
+	if trench.GetName() != getTrenchName(child.GetSubnet().GetConduit().GetTrench().GetName(), child.GetSubnet().GetIpFamily()) {
+		return &emptypb.Empty{}, nil
+	}
+	conduit, err := trench.GetConduit(ctx, child.GetSubnet().GetConduit().GetName())
+	if err != nil {
+		return &emptypb.Empty{}, err
+	}
+	if conduit == nil {
+		return &emptypb.Empty{}, nil
+	}
+	node, err := conduit.GetNode(ctx, child.GetSubnet().GetNode())
+	if err != nil {
+		return &emptypb.Empty{}, err
+	}
+	if node == nil {
+		return &emptypb.Empty{}, nil
+	}
+	return &emptypb.Empty{}, node.Release(ctx, child.GetName())
 }
 
 func getTrenchName(trenchName string, ipFamily ipamAPI.IPFamily) string {

diff --git a/pkg/nsm/ipcontext/client.go b/pkg/nsm/ipcontext/client.go
@@ -49,6 +49,9 @@ func (icc *ipcontextClient) Request(ctx context.Context, request *networkservice
 
 // Close
 func (icc *ipcontextClient) Close(ctx context.Context, conn *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) {
-	// TODO: free IPs
+	err := icc.ics.UnsetIPContext(conn, networking.NSC)
+	if err != nil {
+		return nil, err
+	}
 	return next.Client(ctx).Close(ctx, conn, opts...)
 }
diff --git a/pkg/nsm/ipcontext/common.go b/pkg/nsm/ipcontext/common.go
@@ -23,4 +23,5 @@ import (
 
 type ipContextSetter interface {
 	SetIPContext(conn *networkservice.Connection, interfaceType networking.InterfaceType) error
+	UnsetIPContext(conn *networkservice.Connection, interfaceType networking.InterfaceType) error
 }
diff --git a/pkg/nsm/ipcontext/server.go b/pkg/nsm/ipcontext/server.go
@@ -47,6 +47,9 @@ func (ics *ipcontextServer) Request(ctx context.Context, request *networkservice
 
 // Close
 func (ics *ipcontextServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
-	// TODO: free IPs
+	err := ics.ics.UnsetIPContext(conn, networking.NSE)
+	if err != nil {
+		return nil, err
+	}
 	return next.Server(ctx).Close(ctx, conn)
 }
diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -172,6 +172,20 @@ func (p *Proxy) SetIPContext(conn *networkservice.Connection, interfaceType netw
 	return nil
 }
 
+func (p *Proxy) UnsetIPContext(conn *networkservice.Connection, interfaceType networking.InterfaceType) error {
+	for _, subnet := range p.Subnets {
+		child := &ipamAPI.Child{
+			Name:   fmt.Sprintf("%s-src", conn.Id),
+			Subnet: subnet,
+		}
+		_, err := p.ipamClient.Release(context.TODO(), child)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (p *Proxy) setBridgeIP(prefix string) error {
 	err := p.bridge.AddLocalPrefix(prefix)
 	if err != nil {