topology: add GetOwner method

Author: lebauce

topology/probes/ovn/ovn.go

@@ -132,11 +132,7 @@ func (l *switchPortLinker) GetABLinks(lsNode *graph.Node) (edges []*graph.Edge)
 	ports, _ := l.probe.ovndbapi.LSPList(name)
 	for _, lp := range ports {
 		if lpNode, _ := probe.lspIndexer.GetNode(lp.UUID); lpNode != nil {
-			link, err := topology.NewLink(probe.graph, lsNode, lpNode, topology.OwnershipLink, nil)
-			if err != nil {
-				logging.GetLogger().Error(err)
-				continue
-			}
+			link := topology.NewLink(probe.graph, lsNode, lpNode, topology.OwnershipLink, nil)
 			edges = append(edges, link)
 		}
 	}
@@ -153,11 +149,7 @@ func (l *switchPortLinker) GetBALinks(lpNode *graph.Node) (edges []*graph.Edge)
 		for _, lp := range ports {
 			if lp.UUID == uuid {
 				if lsNode, _ := probe.lsIndexer.GetNode(ls.UUID); lsNode != nil {
-					link, err := topology.NewLink(probe.graph, lsNode, lpNode, topology.OwnershipLink, nil)
-					if err != nil {
-						logging.GetLogger().Error(link)
-						continue
-					}
+					link := topology.NewLink(probe.graph, lsNode, lpNode, topology.OwnershipLink, nil)
 					edges = append(edges, link)
 				}
 			}
@@ -177,11 +169,7 @@ func (l *routerPortLinker) GetABLinks(lrNode *graph.Node) (edges []*graph.Edge)
 	ports, _ := l.probe.ovndbapi.LRPList(name)
 	for _, lp := range ports {
 		if lrpNode, _ := probe.lrpIndexer.GetNode(lp.UUID); lrpNode != nil {
-			link, err := topology.NewLink(probe.graph, lrNode, lrpNode, topology.OwnershipLink, nil)
-			if err != nil {
-				logging.GetLogger().Error(err)
-				continue
-			}
+			link := topology.NewLink(probe.graph, lrNode, lrpNode, topology.OwnershipLink, nil)
 			edges = append(edges, link)
 		}
 	}
@@ -198,11 +186,7 @@ func (l *routerPortLinker) GetBALinks(lrpNode *graph.Node) (edges []*graph.Edge)
 		for _, lp := range ports {
 			if lp.UUID == uuid {
 				if lrNode, _ := probe.lrIndexer.GetNode(lr.UUID); lrNode != nil {
-					link, err := topology.NewLink(probe.graph, lrNode, lrpNode, topology.OwnershipLink, nil)
-					if err != nil {
-						logging.GetLogger().Error(link)
-						continue
-					}
+					link := topology.NewLink(probe.graph, lrNode, lrpNode, topology.OwnershipLink, nil)
 					edges = append(edges, link)
 				}
 			}
@@ -221,9 +205,8 @@ func (l *aclLinker) GetABLinks(lsNode *graph.Node) (edges []*graph.Edge) {
 	acls, _ := l.probe.ovndbapi.ACLList(name)
 	for _, acl := range acls {
 		if aclNode, _ := l.probe.aclIndexer.GetNode(acl.UUID); aclNode != nil {
-			if link, _ := topology.NewLink(l.probe.graph, lsNode, aclNode, topology.OwnershipLink, nil); link != nil {
-				edges = append(edges, link)
-			}
+			link := topology.NewLink(l.probe.graph, lsNode, aclNode, topology.OwnershipLink, nil)
+			edges = append(edges, link)
 		}
 	}
 	return edges
@@ -238,11 +221,7 @@ func (l *aclLinker) GetBALinks(aclNode *graph.Node) (edges []*graph.Edge) {
 		for _, acl := range acls {
 			if acl.UUID == uuid {
 				if lsNode, _ := l.probe.lsIndexer.GetNode(ls.UUID); lsNode != nil {
-					link, err := topology.NewLink(l.probe.graph, lsNode, aclNode, topology.OwnershipLink, nil)
-					if err != nil {
-						logging.GetLogger().Error(link)
-						continue
-					}
+					link := topology.NewLink(l.probe.graph, lsNode, aclNode, topology.OwnershipLink, nil)
 					edges = append(edges, link)
 				}
 			}

topology/topology.go

@@ -120,9 +120,12 @@ func IsOwnershipLinked(g *graph.Graph, node *graph.Node) bool {
 	return len(edges) != 0
 }
 
-// GetOwnershipLink get ownership Link between the parent and the child node or nil
-func GetOwnershipLink(g *graph.Graph, parent *graph.Node, child *graph.Node) *graph.Edge {
-	return g.GetFirstLink(parent, child, OwnershipMetadata())
+// GetOwner returns the parent linked with an ownership link
+func GetOwner(g *graph.Graph, child *graph.Node) *graph.Node {
+	if parents := g.LookupParents(child, nil, OwnershipMetadata()); len(parents) > 0 {
+		return parents[0]
+	}
+	return nil
 }
 
 // AddOwnershipLink Link between the parent and the child node, the child can have only one parent, previous will be overwritten
@@ -146,26 +149,19 @@ func HaveLink(g *graph.Graph, node1 *graph.Node, node2 *graph.Node, relationType
 }
 
 // NewLink creates a link between a parent and a child node with the specified relation type and metadata
-func NewLink(g *graph.Graph, node1 *graph.Node, node2 *graph.Node, relationType string, metadata graph.Metadata) (*graph.Edge, error) {
+func NewLink(g *graph.Graph, node1 *graph.Node, node2 *graph.Node, relationType string, metadata graph.Metadata) *graph.Edge {
 	m := graph.Metadata{"RelationType": relationType}
 	for k, v := range metadata {
 		m[k] = v
 	}
 
 	id, _ := uuid.NewV5(uuid.NamespaceOID, []byte(node1.ID+node2.ID+graph.Identifier(relationType)))
-	edge := g.CreateEdge(graph.Identifier(id.String()), node1, node2, m, graph.Time(time.Now()))
-	if edge == nil {
-		return nil, fmt.Errorf("Failed to create edge with id %s", id.String())
-	}
-	return edge, nil
+	return g.CreateEdge(graph.Identifier(id.String()), node1, node2, m, graph.Time(time.Now()))
 }
 
 // AddLink links the parent and the child node with the specified relation type and metadata
 func AddLink(g *graph.Graph, node1 *graph.Node, node2 *graph.Node, relationType string, metadata graph.Metadata) (*graph.Edge, error) {
-	edge, err := NewLink(g, node1, node2, relationType, metadata)
-	if err != nil {
-		return nil, err
-	}
+	edge := NewLink(g, node1, node2, relationType, metadata)
 	return edge, g.AddEdge(edge)
 }