graffiti: import node and edge APIs

skydive-project · Dec 3, 2020 · d1edb58 · d1edb58
1 parent 8f0c434
commit d1edb58
Show file tree

Hide file tree

Showing 12 changed files with 487 additions and 432 deletions.
diff --git a/.mk/swagger.mk b/.mk/swagger.mk
@@ -6,7 +6,7 @@ SWAGGER_JSON_FILES = $(patsubst %.go,%_swagger.json,$(shell git grep //go:genera
 .PHONY: swagger
 swagger: $(SWAGGER_JSON_FILES)
 	go run github.com/go-swagger/go-swagger/cmd/swagger generate spec -m -o /tmp/swagger.json
-	for def in `ls api/server/*_swagger.json`; do \
+	for def in `ls api/server/*_swagger.json` `ls graffiti/api/server/*_swagger.json`; do \
 		jq -s  '.[0] * .[1] * {tags: (.[0].tags + .[1].tags)}' /tmp/swagger.json $$def > swagger.json; \
 		cp swagger.json /tmp; \
 	done

diff --git a/analyzer/server.go b/analyzer/server.go
@@ -36,6 +36,7 @@ import (
 	"github.com/skydive-project/skydive/flow/server"
 	"github.com/skydive-project/skydive/flow/storage"
 	"github.com/skydive-project/skydive/graffiti/api/rest"
+	gapi "github.com/skydive-project/skydive/graffiti/api/server"
 	etcdclient "github.com/skydive-project/skydive/graffiti/etcd/client"
 	etcdserver "github.com/skydive-project/skydive/graffiti/etcd/server"
 	"github.com/skydive-project/skydive/graffiti/graph"
@@ -333,7 +334,7 @@ func NewServerFromConfig() (*Server, error) {
 
 	s.piClient = packetinjector.NewOnDemandInjectionClient(g, piAPIHandler, hub.PodServer(), hub.SubscriberServer(), etcdClient)
 
-	_, err = api.RegisterNodeAPI(apiServer, g, apiAuthBackend)
+	_, err = gapi.RegisterNodeAPI(apiServer, g, apiAuthBackend)
 	if err != nil {
 		return nil, err
 	}
@@ -343,7 +344,7 @@ func NewServerFromConfig() (*Server, error) {
 		return nil, err
 	}
 
-	_, err = api.RegisterEdgeAPI(apiServer, g, apiAuthBackend)
+	_, err = gapi.RegisterEdgeAPI(apiServer, g, apiAuthBackend)
 	if err != nil {
 		return nil, err
 	}

diff --git a/api/types/types.go b/api/types/types.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/skydive-project/skydive/graffiti/api/rest"
+	gtypes "github.com/skydive-project/skydive/graffiti/api/types"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/graffiti/schema"
 )
@@ -134,29 +135,8 @@ func NewCapture(query string, bpfFilter string) *Capture {
 }
 
 // Edge object
-// easyjson:json
 // swagger:model
-type Edge graph.Edge
-
-// GetID returns the edge ID
-func (e *Edge) GetID() string {
-	return string(e.ID)
-}
-
-// SetID sets the node ID
-func (e *Edge) SetID(i string) {
-	e.ID = graph.Identifier(i)
-}
-
-// GetName returns the edge resource name
-func (e *Edge) GetName() string {
-	return "Edge"
-}
-
-// Validate integrity of the resource
-func (e *Edge) Validate() error {
-	return nil
-}
+type Edge = gtypes.Edge
 
 // EdgeRule object
 //
@@ -193,29 +173,8 @@ func (e *EdgeRule) Validate() error {
 }
 
 // Node object
-// easyjson:json
 // swagger:model
-type Node graph.Node
-
-// GetID returns the node ID
-func (n *Node) GetID() string {
-	return string(n.ID)
-}
-
-// SetID sets the resource ID
-func (n *Node) SetID(i string) {
-	n.ID = graph.Identifier(i)
-}
-
-// GetName returns the node resource name
-func (n *Node) GetName() string {
-	return "Node"
-}
-
-// Validate integrity of the resource
-func (n *Node) Validate() error {
-	return nil
-}
+type Node = gtypes.Node
 
 // NodeRule object
 //