Skip to content

Commit

Permalink
Save the IP-addresses assigned to the interface (#310)
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
  • Loading branch information
glazychev-art authored Jul 20, 2021
1 parent 3c0abd6 commit 7b2757c
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
21 changes: 21 additions & 0 deletions pkg/networkservice/connectioncontext/ipcontext/ipaddress/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,22 @@ func addDel(ctx context.Context, conn *networkservice.Connection, vppConn api.Co
if ipNets == nil {
return nil
}

curIPs, ok := load(ctx, isClient)
for _, ipNet := range ipNets {
// Сheck if the interface already has ipNet
if isAdd && ok {
has := false
for _, addr := range curIPs {
if addr.IP.Equal(ipNet.IP) {
has = true
break
}
}
if has {
continue
}
}
now := time.Now()
if _, err := interfaces.NewServiceClient(vppConn).SwInterfaceAddDelAddress(ctx, &interfaces.SwInterfaceAddDelAddress{
SwIfIndex: swIfIndex,
Expand All @@ -58,5 +73,11 @@ func addDel(ctx context.Context, conn *networkservice.Connection, vppConn api.Co
WithField("duration", time.Since(now)).
WithField("vppapi", "SwInterfaceAddDelAddress").Debug("completed")
}
if isAdd {
store(ctx, isClient, ipNets)
} else {
delete(ctx, isClient)
}

return nil
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Copyright (c) 2021 Doc.ai and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at:
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package ipaddress

import (
"context"
"net"

"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
)

type key struct{}

func store(ctx context.Context, isClient bool, ips []*net.IPNet) {
metadata.Map(ctx, isClient).Store(key{}, ips)
}

func delete(ctx context.Context, isClient bool) {
metadata.Map(ctx, isClient).Delete(key{})
}

func load(ctx context.Context, isClient bool) (value []*net.IPNet, ok bool) {
rawValue, ok := metadata.Map(ctx, isClient).Load(key{})
if !ok {
return
}
value, ok = rawValue.([]*net.IPNet)
return value, ok
}

0 comments on commit 7b2757c

Please sign in to comment.