VOL-1509 : Partial fix for merging issue
- Changed channel map in etcd to a sync.Map
- Changed graph boundaryPorts to sync.Map
- Added logic to check if proxy access is currently reserved
- Changed watch logic to exit when proxy access in progress
- Fixed UpdateAllChildren method
- Commented out the Drop operation again in node.go
Change-Id: I8a61798e907be0ff6b0785dcc70721708308611d
diff --git a/rw_core/config/config.go b/rw_core/config/config.go
index f977be0..f87d8ce 100644
--- a/rw_core/config/config.go
+++ b/rw_core/config/config.go
@@ -124,6 +124,9 @@
var help string
+ help = fmt.Sprintf("RW instance id")
+ flag.StringVar(&(cf.InstanceID), "instance-id", default_InstanceID, help)
+
help = fmt.Sprintf("RW core endpoint address")
flag.StringVar(&(cf.RWCoreEndpoint), "vcore-endpoint", default_RWCoreEndpoint, help)
diff --git a/rw_core/graph/device_graph.go b/rw_core/graph/device_graph.go
index 9acda6d..d7192da 100644
--- a/rw_core/graph/device_graph.go
+++ b/rw_core/graph/device_graph.go
@@ -24,6 +24,7 @@
"github.com/opencord/voltha-go/protos/voltha"
"strconv"
"strings"
+ "sync"
)
func init() {
@@ -65,7 +66,7 @@
logicalPorts []*voltha.LogicalPort
RootPorts map[uint32]uint32
Routes map[OFPortLink][]RouteHop
- boundaryPorts map[string]uint32
+ boundaryPorts sync.Map
}
func NewDeviceGraph(getDevice GetDeviceFunc) *DeviceGraph {
@@ -76,6 +77,9 @@
}
func (dg *DeviceGraph) ComputeRoutes(lps []*voltha.LogicalPort) {
+ if dg == nil {
+ return
+ }
dg.logicalPorts = lps
// Set the root ports
dg.RootPorts = make(map[uint32]uint32)
@@ -85,9 +89,14 @@
}
}
// set the boundary ports
- dg.boundaryPorts = make(map[string]uint32)
+ dg.boundaryPorts.Range(func(key interface{}, value interface{}) bool {
+ dg.boundaryPorts.Delete(key)
+ return true
+ })
+ //dg.boundaryPorts = sync.Map{}
+
for _, lp := range lps {
- dg.boundaryPorts[fmt.Sprintf("%s:%d", lp.DeviceId, lp.DevicePortNo)] = lp.OfpPort.PortNo
+ dg.boundaryPorts.Store(fmt.Sprintf("%s:%d", lp.DeviceId, lp.DevicePortNo), lp.OfpPort.PortNo)
}
dg.Routes = make(map[OFPortLink][]RouteHop)
@@ -103,7 +112,7 @@
}
func (dg *DeviceGraph) addDevice(device *voltha.Device, g goraph.Graph, devicesAdded *map[string]string, portsAdded *map[string]string,
- boundaryPorts map[string]uint32) goraph.Graph {
+ boundaryPorts sync.Map) goraph.Graph {
if device == nil {
return g
@@ -150,27 +159,34 @@
paths := make(map[OFPortLink][]RouteHop)
var err error
var hop RouteHop
- for source, sourcePort := range dg.boundaryPorts {
- for target, targetPort := range dg.boundaryPorts {
+
+ dg.boundaryPorts.Range(func(src, srcPort interface{}) bool {
+ source := src.(string)
+ sourcePort := srcPort.(uint32)
+
+ dg.boundaryPorts.Range(func(dst, dstPort interface{}) bool {
+ target := dst.(string)
+ targetPort := dstPort.(uint32)
+
if source == target {
- continue
+ return true
}
//Ignore NNI - NNI Routes
if dg.IsRootPort(sourcePort) && dg.IsRootPort(targetPort) {
- continue
+ return true
}
//Ignore UNI - UNI Routes
if !dg.IsRootPort(sourcePort) && !dg.IsRootPort(targetPort) {
- continue
+ return true
}
if pathIds, _, err = goraph.Dijkstra(dg.GGraph, goraph.StringID(source), goraph.StringID(target)); err != nil {
log.Errorw("no-path", log.Fields{"source": source, "target": target, "error": err})
- continue
+ return true
}
if len(pathIds)%3 != 0 {
- continue
+ return true
}
var deviceId string
var ingressPort uint32
@@ -191,8 +207,10 @@
copy(tmp, path)
path = nil
paths[OFPortLink{Ingress: sourcePort, Egress: targetPort}] = tmp
- }
- }
+ return true
+ })
+ return true
+ })
return paths
}