[management] Add API of new network concept (#3012)

management/server/networks/manager.go

@@ -0,0 +1,63 @@
+package networks
+
+import (
+	"context"
+	"errors"
+
+	"github.com/netbirdio/netbird/management/server/networks/resources"
+	"github.com/netbirdio/netbird/management/server/networks/routers"
+	"github.com/netbirdio/netbird/management/server/networks/types"
+	"github.com/netbirdio/netbird/management/server/store"
+)
+
+type Manager interface {
+	GetAllNetworks(ctx context.Context, accountID, userID string) ([]*types.Network, error)
+	CreateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error)
+	GetNetwork(ctx context.Context, accountID, userID, networkID string) (*types.Network, error)
+	UpdateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error)
+	DeleteNetwork(ctx context.Context, accountID, userID, networkID string) error
+	GetResourceManager() resources.Manager
+	GetRouterManager() routers.Manager
+}
+
+type managerImpl struct {
+	store            store.Store
+	routersManager   routers.Manager
+	resourcesManager resources.Manager
+}
+
+func NewManager(store store.Store) Manager {
+	return &managerImpl{
+		store:            store,
+		routersManager:   routers.NewManager(store),
+		resourcesManager: resources.NewManager(store),
+	}
+}
+
+func (m *managerImpl) GetAllNetworks(ctx context.Context, accountID, userID string) ([]*types.Network, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) CreateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) GetNetwork(ctx context.Context, accountID, userID, networkID string) (*types.Network, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) UpdateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) DeleteNetwork(ctx context.Context, accountID, userID, networkID string) error {
+	return errors.New("not implemented")
+}
+
+func (m *managerImpl) GetResourceManager() resources.Manager {
+	return m.resourcesManager
+}
+
+func (m *managerImpl) GetRouterManager() routers.Manager {
+	return m.routersManager
+}

management/server/networks/resources/manager.go

@@ -0,0 +1,47 @@
+package resources
+
+import (
+	"context"
+	"errors"
+
+	"github.com/netbirdio/netbird/management/server/networks/resources/types"
+	"github.com/netbirdio/netbird/management/server/store"
+)
+
+type Manager interface {
+	GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkResource, error)
+	CreateResource(ctx context.Context, accountID string, resource *types.NetworkResource) (*types.NetworkResource, error)
+	GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*types.NetworkResource, error)
+	UpdateResource(ctx context.Context, userID string, resource *types.NetworkResource) (*types.NetworkResource, error)
+	DeleteResource(ctx context.Context, accountID, userID, networkID, resourceID string) error
+}
+
+type managerImpl struct {
+	store store.Store
+}
+
+func NewManager(store store.Store) Manager {
+	return &managerImpl{
+		store: store,
+	}
+}
+
+func (m *managerImpl) GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkResource, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) CreateResource(ctx context.Context, accountID string, resource *types.NetworkResource) (*types.NetworkResource, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*types.NetworkResource, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) UpdateResource(ctx context.Context, userID string, resource *types.NetworkResource) (*types.NetworkResource, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) DeleteResource(ctx context.Context, accountID, userID, networkID, resourceID string) error {
+	return errors.New("not implemented")
+}

management/server/networks/resources/types/resource.go

@@ -1,4 +1,4 @@
-package networks
+package types
 
 import (
 	"errors"
@@ -8,14 +8,16 @@ import (
 	"strings"
 
 	"github.com/rs/xid"
+
+	"github.com/netbirdio/netbird/management/server/http/api"
 )
 
 type NetworkResourceType string
 
 const (
-	host   NetworkResourceType = "Host"
-	subnet NetworkResourceType = "Subnet"
-	domain NetworkResourceType = "Domain"
+	host   NetworkResourceType = "host"
+	subnet NetworkResourceType = "subnet"
+	domain NetworkResourceType = "domain"
 )
 
 func (p NetworkResourceType) String() string {
@@ -49,6 +51,25 @@ func NewNetworkResource(accountID, networkID, name, description, address string)
 	}, nil
 }
 
+func (n *NetworkResource) ToAPIResponse() *api.NetworkResource {
+	return &api.NetworkResource{
+		Id:          n.ID,
+		Name:        n.Name,
+		Description: &n.Description,
+		Type:        api.NetworkResourceType(n.Type.String()),
+		Address:     n.Address,
+	}
+}
+
+func (n *NetworkResource) FromAPIRequest(req *api.NetworkResourceRequest) {
+	n.Name = req.Name
+	n.Description = ""
+	if req.Description != nil {
+		n.Description = *req.Description
+	}
+	n.Address = req.Address
+}
+
 func (n *NetworkResource) Copy() *NetworkResource {
 	return &NetworkResource{
 		ID:          n.ID,

management/server/networks/resources/types/resource_test.go

@@ -1,4 +1,4 @@
-package networks
+package types
 
 import (
 	"testing"

management/server/networks/routers/manager.go

@@ -0,0 +1,47 @@
+package routers
+
+import (
+	"context"
+	"errors"
+
+	"github.com/netbirdio/netbird/management/server/networks/routers/types"
+	"github.com/netbirdio/netbird/management/server/store"
+)
+
+type Manager interface {
+	GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkRouter, error)
+	CreateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error)
+	GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*types.NetworkRouter, error)
+	UpdateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error)
+	DeleteRouter(ctx context.Context, accountID, userID, networkID, routerID string) error
+}
+
+type managerImpl struct {
+	store store.Store
+}
+
+func NewManager(store store.Store) Manager {
+	return &managerImpl{
+		store: store,
+	}
+}
+
+func (m *managerImpl) GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkRouter, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) CreateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*types.NetworkRouter, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) UpdateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (m *managerImpl) DeleteRouter(ctx context.Context, accountID, userID, networkID, routerID string) error {
+	return errors.New("not implemented")
+}

management/server/networks/routers/types/router.go

@@ -1,9 +1,11 @@
-package networks
+package types
 
 import (
 	"errors"
 
 	"github.com/rs/xid"
+
+	"github.com/netbirdio/netbird/management/server/http/api"
 )
 
 type NetworkRouter struct {
@@ -32,6 +34,23 @@ func NewNetworkRouter(accountID string, networkID string, peer string, peerGroup
 	}, nil
 }
 
+func (n *NetworkRouter) ToAPIResponse() *api.NetworkRouter {
+	return &api.NetworkRouter{
+		Id:         n.ID,
+		Peer:       &n.Peer,
+		PeerGroups: &n.PeerGroups,
+		Masquerade: n.Masquerade,
+		Metric:     n.Metric,
+	}
+}
+
+func (n *NetworkRouter) FromAPIRequest(req *api.NetworkRouterRequest) {
+	n.Peer = *req.Peer
+	n.PeerGroups = *req.PeerGroups
+	n.Masquerade = req.Masquerade
+	n.Metric = req.Metric
+}
+
 func (n *NetworkRouter) Copy() *NetworkRouter {
 	return &NetworkRouter{
 		ID:         n.ID,

management/server/networks/routers/types/router_test.go

@@ -1,4 +1,4 @@
-package networks
+package types
 
 import "testing"
 

management/server/networks/types/network.go

@@ -1,6 +1,10 @@
-package networks
+package types
 
-import "github.com/rs/xid"
+import (
+	"github.com/rs/xid"
+
+	"github.com/netbirdio/netbird/management/server/http/api"
+)
 
 type Network struct {
 	ID          string `gorm:"index"`
@@ -18,6 +22,19 @@ func NewNetwork(accountId, name, description string) *Network {
 	}
 }
 
+func (n *Network) ToAPIResponse() *api.Network {
+	return &api.Network{
+		Id:          n.ID,
+		Name:        n.Name,
+		Description: &n.Description,
+	}
+}
+
+func (n *Network) FromAPIRequest(req *api.NetworkRequest) {
+	n.Name = req.Name
+	n.Description = *req.Description
+}
+
 // Copy returns a copy of a posture checks.
 func (n *Network) Copy() *Network {
 	return &Network{