diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index 85bbeee80f276f8a9428e71eff125a0e14f60dbd..121bd08a794ee8609e40131b0ee654969e470892 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -144,9 +144,9 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
opts := metav1.UpdateOptions{}
getOpts := metav1.GetOptions{}
ctx := context.Background()
- switch resource.(type) {
+ switch resource := resource.(type) {
case *corev1.Service:
- service := resource.(*corev1.Service)
+ service := resource
s, err := clientset.CoreV1().Services("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
@@ -158,7 +158,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("service %v updated", service.Name)
case *netv1.Ingress:
- ingress := resource.(*netv1.Ingress)
+ ingress := resource
i, err := clientset.NetworkingV1beta1().Ingresses("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
@@ -170,7 +170,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("ingress %v updated", ingress.Name)
case *corev1.ConfigMap:
- config := resource.(*corev1.ConfigMap)
+ config := resource
c, err := clientset.CoreV1().ConfigMaps("cocsn").Get(ctx, env+"-config", getOpts)
if err != nil {
return err
@@ -182,7 +182,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("configMap %v updated", config.Name)
case *appv1.Deployment:
- deployment := resource.(*appv1.Deployment)
+ deployment := resource
d, err := clientset.AppsV1().Deployments("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
diff --git a/cli/capabilities.go b/cli/capabilities.go
index b05fe7794afea7100b15554371151e6229ce42db..9e3518f82b48d0361754e27d2e6d7a9ed879423b 100644
--- a/cli/capabilities.go
+++ b/cli/capabilities.go
@@ -5,7 +5,9 @@ import (
"fmt"
"strings"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
"code.fbi.h-da.de/cocsn/gosdn/nucleus"
gpb "github.com/openconfig/gnmi/proto/gnmi"
)
@@ -13,14 +15,12 @@ import (
// Capabilities sends a gNMI Capabilities request to the specified target
// and prints the supported models to stdout
func Capabilities(a, u, p string) error {
- cfg := gnmi.Config{
- Addr: a,
+ opts := &tpb.TransportOption{
+ Address: a,
Username: u,
Password: p,
- Encoding: gpb.Encoding_JSON_IETF,
}
- opts := &nucleus.GnmiTransportOptions{Config: cfg}
- transport, err := nucleus.NewGnmiTransport(opts)
+ transport, err := nucleus.NewGnmiTransport(opts, nucleus.NewSBI(spb.Type_OPENCONFIG))
if err != nil {
return err
}
diff --git a/cli/get.go b/cli/get.go
deleted file mode 100644
index 9b21ed48f24b7d256014cadf0cd50f3ab98f312f..0000000000000000000000000000000000000000
--- a/cli/get.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package cli
-
-import (
- "context"
-
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
-
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- gpb "github.com/openconfig/gnmi/proto/gnmi"
- log "github.com/sirupsen/logrus"
-)
-
-// Get sends a gNMI Get request to the specified target and prints the response to stdout
-func Get(a, u, p string, args ...string) (*gpb.GetResponse, error) {
- sbi := &nucleus.OpenConfig{}
- opts := &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: a,
- Username: u,
- Password: p,
- Encoding: gpb.Encoding_JSON_IETF,
- },
- SetNode: sbi.SetNode(),
- }
- t, err := nucleus.NewGnmiTransport(opts)
- if err != nil {
- return nil, err
- }
- resp, err := t.Get(context.Background(), args...)
- if err != nil {
- return nil, err
- }
- log.Debug(resp)
- r, ok := resp.(*gpb.GetResponse)
- if !ok {
- return nil, &errors.ErrInvalidTypeAssertion{}
- }
- return r, nil
-}
diff --git a/cli/grpc.go b/cli/grpc.go
new file mode 100644
index 0000000000000000000000000000000000000000..3d731ab907d23c7f5c7dfdb567c72e655d2975c8
--- /dev/null
+++ b/cli/grpc.go
@@ -0,0 +1,277 @@
+package cli
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/client"
+ log "github.com/sirupsen/logrus"
+ "github.com/spf13/viper"
+
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ "google.golang.org/grpc"
+)
+
+var dialOptions []grpc.DialOption
+
+func init() {
+ dialOptions = []grpc.DialOption{
+ grpc.WithInsecure(),
+ }
+}
+
+// Init initialises the CLI client.
+func Init(addr string) error {
+ ctx := context.Background()
+ resp, err := getAllCore(ctx, addr)
+ if err != nil {
+ return err
+ }
+ if len(resp.Pnd) > 0 {
+ pid := resp.Pnd[0].Id
+ viper.Set("CLI_PND", pid)
+ log.Infof("PND: %v", pid)
+ if len(resp.Pnd[0].Sbi) != 0 {
+ sbi := resp.Pnd[0].Sbi[0].Id
+ viper.Set("CLI_SBI", sbi)
+ log.Infof("SBI: %v", sbi)
+ }
+ }
+ return nil
+}
+
+// GetIds requests all UUID information from the controller
+func GetIds(addr string) ([]*ppb.PrincipalNetworkDomain, error) {
+ ctx := context.Background()
+ resp, err := getAllCore(ctx, addr)
+ if err != nil {
+ return nil, err
+ }
+ return resp.Pnd, nil
+}
+
+func getAllCore(ctx context.Context, addr string) (*pb.GetResponse, error) {
+ coreClient, err := nbi.CoreClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ req := &pb.GetRequest{
+ Timestamp: time.Now().UnixNano(),
+ All: true,
+ }
+ return coreClient.Get(ctx, req)
+}
+
+// AddPnd takes a name, description and SBI UUID to create a new
+// PrincipalNetworkDomain on the controller
+func AddPnd(addr, name, description, sbi string) (*pb.SetResponse, error) {
+ coreClient, err := nbi.CoreClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ ctx := context.Background()
+ req := &pb.SetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Pnd: []*pb.SetPnd{
+ {
+ Name: name,
+ Description: description,
+ Sbi: sbi,
+ },
+ },
+ }
+
+ return coreClient.Set(ctx, req)
+}
+
+// GetPnd requests one or several PrincipalNetworkDomains from the
+// controller. To request all PrincipalNetworkDomains without providing
+// names or UUIDs use GetIds()
+func GetPnd(addr string, args ...string) (*pb.GetResponse, error) {
+ coreClient, err := nbi.CoreClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ if len(args) <= 0 {
+ return nil, errors.New("not enough arguments")
+ }
+ ctx := context.Background()
+ req := &pb.GetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Pid: args,
+ }
+ return coreClient.Get(ctx, req)
+}
+
+// GetChanges requests all pending and unconfirmed changes from the controller
+func GetChanges(addr, pnd string) (*ppb.GetResponse, error) {
+ ctx := context.Background()
+ client, err := nbi.PndClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ req := &ppb.GetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Request: &ppb.GetRequest_Change{
+ Change: &ppb.GetChange{
+ All: true,
+ },
+ },
+ Pid: pnd,
+ }
+ return client.Get(ctx, req)
+}
+
+// Commit sends a commit request for one or multiple changes to the
+// controller.
+func Commit(addr, pnd string, cuids ...string) (*ppb.SetResponse, error) {
+ changes := make([]*ppb.SetChange, len(cuids))
+ for i, arg := range cuids {
+ changes[i] = &ppb.SetChange{
+ Cuid: arg,
+ Op: ppb.SetChange_COMMIT,
+ }
+ }
+ return commitConfirm(addr, pnd, changes)
+}
+
+// Confirm sends a confirm request for one or multiple changes to the
+// controller
+func Confirm(addr, pnd string, cuids ...string) (*ppb.SetResponse, error) {
+ changes := make([]*ppb.SetChange, len(cuids))
+ for i, arg := range cuids {
+ changes[i] = &ppb.SetChange{
+ Cuid: arg,
+ Op: ppb.SetChange_CONFIRM,
+ }
+ }
+ return commitConfirm(addr, pnd, changes)
+}
+
+func commitConfirm(addr, pnd string, changes []*ppb.SetChange) (*ppb.SetResponse, error) {
+ ctx := context.Background()
+ client, err := nbi.PndClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ req := &ppb.SetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Change: changes,
+ Pid: pnd,
+ }
+ return client.Set(ctx, req)
+}
+
+// AddDevice adds a new device to the controller. The device name is optional.
+// If no name is provided a name will be generated upon device creation.
+func AddDevice(addr, username, password, sbi, pnd, deviceAddress, deviceName string) (*ppb.SetResponse, error) {
+ pndClient, err := nbi.PndClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+
+ req := &ppb.SetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Ond: []*ppb.SetOnd{
+ {
+ Address: deviceAddress,
+ Sbi: &spb.SouthboundInterface{
+ Id: sbi,
+ },
+ DeviceName: deviceName,
+ TransportOption: &tpb.TransportOption{
+ Address: addr,
+ Username: username,
+ Password: password,
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
+ },
+ },
+ },
+ },
+ Pid: pnd,
+ }
+ ctx := context.Background()
+ return pndClient.Set(ctx, req)
+}
+
+// GetDevice requests one or multiple devices belonging to a given
+// PrincipalNetworkDomain from the controller. If no device identifier
+// is provided, all devices are requested.
+func GetDevice(addr, pid, path string, did ...string) (*ppb.GetResponse, error) {
+ pndClient, err := nbi.PndClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+
+ var all bool
+ if len(did) == 0 {
+ all = true
+ }
+
+ req := &ppb.GetRequest{
+ Timestamp: time.Now().UnixNano(),
+ Request: &ppb.GetRequest_Ond{
+ Ond: &ppb.GetOnd{
+ All: all,
+ Did: did,
+ },
+ },
+ Pid: pid,
+ }
+ ctx := context.Background()
+ return pndClient.Get(ctx, req)
+}
+
+// Update creates a ChangeRequest to update the given path with the given value
+// at the given OND on the controller.
+func Update(addr, did, pid, path, value string) (*ppb.SetResponse, error) {
+ req := &ppb.ChangeRequest{
+ Id: did,
+ Path: path,
+ Value: value,
+ ApiOp: ppb.ApiOperation_UPDATE,
+ }
+ return sendChangeRequest(addr, pid, req)
+}
+
+// Replace creates a ChangeRequest to replace the given path with the given value
+// at the given OND on the controller.
+func Replace(addr, did, pid, path, value string) (*ppb.SetResponse, error) {
+ req := &ppb.ChangeRequest{
+ Id: did,
+ Path: path,
+ Value: value,
+ ApiOp: ppb.ApiOperation_REPLACE,
+ }
+ return sendChangeRequest(addr, pid, req)
+}
+
+// Delete creates a ChangeRequest to delete the given path node
+// at the given OND on the controller.
+func Delete(addr, did, pid, path string) (*ppb.SetResponse, error) {
+ req := &ppb.ChangeRequest{
+ Id: did,
+ Path: path,
+ ApiOp: ppb.ApiOperation_DELETE,
+ }
+ return sendChangeRequest(addr, pid, req)
+}
+
+func sendChangeRequest(addr, pid string, req *ppb.ChangeRequest) (*ppb.SetResponse, error) {
+ pndClient, err := nbi.PndClient(addr, dialOptions...)
+ if err != nil {
+ return nil, err
+ }
+ ctx := context.Background()
+ r := &ppb.SetRequest{
+ Timestamp: time.Now().UnixNano(),
+ ChangeRequest: []*ppb.ChangeRequest{req},
+ Pid: pid,
+ }
+ return pndClient.Set(ctx, r)
+}
diff --git a/cli/grpc_test.go b/cli/grpc_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..c3117c40710665c98bb97f37c45c5caf84c17bd3
--- /dev/null
+++ b/cli/grpc_test.go
@@ -0,0 +1,202 @@
+package cli
+
+import (
+ "context"
+ "net"
+ "testing"
+
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/cocsn/gosdn/mocks"
+ nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "github.com/google/uuid"
+ log "github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/mock"
+ "google.golang.org/grpc"
+ "google.golang.org/grpc/test/bufconn"
+)
+
+/*
+Based on this StackOverflow answer: https://stackoverflow.com/a/52080545/4378176
+*/
+
+const bufSize = 1024 * 1024
+const bufnet = "bufnet"
+const pndID = "2043519e-46d1-4963-9a8e-d99007e104b8"
+const changeID = "0992d600-f7d4-4906-9559-409b04d59a5f"
+const sbiID = "f6fd4b35-f039-4111-9156-5e4501bb8a5a"
+const ondID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
+
+var pndStore *nucleus.PndStore
+var lis *bufconn.Listener
+
+func init() {
+ dialOptions = []grpc.DialOption{
+ grpc.WithContextDialer(bufDialer),
+ grpc.WithInsecure(),
+ }
+ lis = bufconn.Listen(bufSize)
+ s := grpc.NewServer()
+ pndStore = nucleus.NewPndStore()
+
+ pndUUID, err := uuid.Parse(pndID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ changeUUID, err := uuid.Parse(changeID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ deviceUUID, err := uuid.Parse(ondID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ mockPnd := mocks.PrincipalNetworkDomain{}
+ mockPnd.On("ID").Return(pndUUID)
+ mockPnd.On("GetName").Return("test")
+ mockPnd.On("GetDescription").Return("test")
+ mockPnd.On("PendingChanges").Return([]uuid.UUID{changeUUID})
+ mockPnd.On("CommittedChanges").Return([]uuid.UUID{changeUUID})
+ mockPnd.On("GetChange", mock.Anything).Return(&nucleus.Change{}, nil)
+ mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+ mockPnd.On("GetDevice", mock.Anything).Return(&nucleus.Device{
+ UUID: deviceUUID,
+ GoStruct: &openconfig.Device{},
+ }, nil)
+ mockPnd.On("Commit", mock.Anything).Return(nil)
+ mockPnd.On("Confirm", mock.Anything).Return(nil)
+ mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+ if err := pndStore.Add(&mockPnd); err != nil {
+ log.Fatal(err)
+ }
+ northbound := nbi.NewNBI(pndStore)
+ pb.RegisterCoreServer(s, northbound.Core)
+ ppb.RegisterPndServer(s, northbound.Pnd)
+ go func() {
+ if err := s.Serve(lis); err != nil {
+ log.Fatalf("Server exited with error: %v", err)
+ }
+ }()
+}
+
+func bufDialer(context.Context, string) (net.Conn, error) {
+ return lis.Dial()
+}
+
+func Test_Init(t *testing.T) {
+ if err := Init(bufnet); err != nil {
+ t.Error(err)
+ }
+}
+
+func Test_GetIds(t *testing.T) {
+ resp, err := GetIds(bufnet)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_AddPnd(t *testing.T) {
+ sbi := nucleus.NewSBI(spb.Type_OPENCONFIG)
+ resp, err := AddPnd(bufnet, "test", "test pnd", sbi.ID().String())
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_GetPnd(t *testing.T) {
+ resp, err := GetPnd(bufnet, pndID)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ got := resp.Pnd[0].Id
+ if got != pndID {
+ t.Errorf("PND ID is %v, expected %v", got, pndID)
+ }
+}
+
+func Test_GetChanges(t *testing.T) {
+ resp, err := GetChanges(bufnet, pndID)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_CommitConfirm(t *testing.T) {
+ resp, err := Commit(bufnet, pndID, changeID)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+
+ resp, err = Confirm(bufnet, pndID, changeID)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+
+}
+
+func Test_AddDevice(t *testing.T) {
+ resp, err := AddDevice(bufnet, "test", "test", sbiID, pndID, "test", "test")
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_GetDevice(t *testing.T) {
+ resp, err := GetDevice(bufnet, pndID, "", ondID)
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ got := resp.Ond[0].Id
+ if got != ondID {
+ t.Errorf("PND ID is %v, expected %v", got, ondID)
+ }
+}
+
+func Test_Update(t *testing.T) {
+ resp, err := Update(bufnet, ondID, pndID, "", "")
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_Replace(t *testing.T) {
+ resp, err := Replace(bufnet, ondID, pndID, "", "")
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
+
+func Test_Delete(t *testing.T) {
+ resp, err := Delete(bufnet, ondID, pndID, "")
+ if err != nil {
+ t.Error(err)
+ return
+ }
+ log.Info(resp)
+}
diff --git a/cli/http.go b/cli/http.go
deleted file mode 100644
index b7c3254b655bda3c315dd79039deb5f730fc023f..0000000000000000000000000000000000000000
--- a/cli/http.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package cli
-
-import (
- "errors"
- "fmt"
- "io/ioutil"
- "net/http"
- "strings"
-
- log "github.com/sirupsen/logrus"
- "github.com/spf13/viper"
-)
-
-const apiRoot = "?"
-
-var builder *strings.Builder
-
-func init() {
- builder = &strings.Builder{}
-}
-
-// HTTPGet sends sends requests from the CLI to the gosdn HTTP API and processes any response data
-func HTTPGet(apiEndpoint, f string, args ...string) error {
- for _, p := range args {
- builder.WriteString("&")
- builder.WriteString(p)
- }
- resp, err := http.Get(apiEndpoint + apiRoot + "q=" + f + builder.String())
- if err != nil {
- log.Info(fmt.Sprintf("Err: %s", err))
- return err
- }
- builder.Reset()
- switch resp.StatusCode {
- case http.StatusOK:
- defer resp.Body.Close()
- bytes, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- return err
- }
- switch f {
- case "init":
- pnd := string(bytes[9:45])
- sbi := string(bytes[55:91])
- viper.Set("CLI_PND", pnd)
- viper.Set("CLI_SBI", sbi)
- err := viper.WriteConfig()
- if err != nil {
- log.Error(err)
- }
- default:
- fmt.Println(string(bytes))
- }
-
- case http.StatusCreated:
- defer resp.Body.Close()
- bytes, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- return err
- }
- uuid := string(bytes[19:55])
- viper.Set("LAST_DEVICE_UUID", uuid)
- fmt.Println(string(bytes))
-
- case http.StatusAccepted:
- default:
- log.WithFields(log.Fields{
- "status code": resp.StatusCode,
- }).Error("operation unsuccessful")
- return errors.New(resp.Status)
- }
- return nil
-}
diff --git a/cli/init.go b/cli/init.go
deleted file mode 100644
index d85e6bd00885a1c4aefea4b6766da349ccd5b8cd..0000000000000000000000000000000000000000
--- a/cli/init.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package cli
-
-import (
- model "code.fbi.h-da.de/cocsn/yang-models/generated/arista"
- "github.com/openconfig/ygot/ytypes"
- log "github.com/sirupsen/logrus"
-)
-
-var testSchema *ytypes.Schema
-
-func init() {
- var err error
- testSchema, err = model.Schema()
- if err != nil {
- log.Fatal(err)
- }
-}
diff --git a/cli/set.go b/cli/set.go
deleted file mode 100644
index 7e5328b18e8c354848f989e54c0796b7ff0894f8..0000000000000000000000000000000000000000
--- a/cli/set.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package cli
-
-import (
- "context"
-
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
-)
-
-// Set sends a gNMI Set request to the specified target. Only one
-// request per invocation supported.
-func Set(a, u, p, typ string, args ...string) error {
- opts := &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: a,
- Username: u,
- Password: p,
- },
- }
- t, err := nucleus.NewGnmiTransport(opts)
- if err != nil {
- return err
- }
- return t.Set(context.Background(), args)
-}
diff --git a/cli/subscribe.go b/cli/subscribe.go
index 031ab104281c6c031ad2dc3c6a403e2a0be86e9a..3be7882a56e7ace64c334502f7c43e08d61455c4 100644
--- a/cli/subscribe.go
+++ b/cli/subscribe.go
@@ -8,11 +8,11 @@ import (
"syscall"
"time"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"code.fbi.h-da.de/cocsn/gosdn/nucleus"
- gpb "github.com/openconfig/gnmi/proto/gnmi"
log "github.com/sirupsen/logrus"
)
@@ -20,18 +20,22 @@ import (
// logs the response to stdout. Only 'stream' mode with 'sample' operation supported.
func Subscribe(address, username, password, deviceName string, sample, heartbeat int64, args ...string) error {
sbi := &nucleus.OpenConfig{}
- tOpts := &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: address,
- Username: username,
- Password: password,
- Encoding: gpb.Encoding_JSON_IETF,
+ tOpts := &tpb.TransportOption{
+ Address: address,
+ Username: username,
+ Password: password,
+ Tls: false,
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ Compression: "",
+ GrpcDialOptions: nil,
+ Token: "",
+ Encoding: 0,
+ },
},
- SetNode: sbi.SetNode(),
- RespChan: make(chan *gpb.SubscribeResponse),
}
- device, err := nucleus.NewDevice(sbi, tOpts, deviceName)
+ device, err := nucleus.NewDevice(deviceName, tOpts, sbi)
if err != nil {
return err
}
diff --git a/cmd/addDevice.go b/cmd/addDevice.go
index d3d65e7edd2a2061e9db8cf9b341832ead84561f..2304e22141967ed8947833b6999818f521f97a70 100644
--- a/cmd/addDevice.go
+++ b/cmd/addDevice.go
@@ -34,9 +34,9 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
"github.com/spf13/cobra"
-)
-var deviceName string
+ log "github.com/sirupsen/logrus"
+)
// addDeviceCmd represents the addDevice command
var addDeviceCmd = &cobra.Command{
@@ -47,21 +47,27 @@ var addDeviceCmd = &cobra.Command{
Device address and user credentials need to be provided
if they diverge from the default credentials.`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ resp, err := cli.AddDevice(
apiEndpoint,
- "addDevice",
- "address="+address,
- "password="+password,
- "username="+username,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- "name="+deviceName,
+ username,
+ password,
+ cliSbi,
+ cliPnd,
+ address,
+ deviceName,
)
+ if err != nil {
+ return err
+ }
+ log.Info(resp)
+ return nil
},
}
+var deviceName string
+
func init() {
cliCmd.AddCommand(addDeviceCmd)
- addDeviceCmd.PersistentFlags().StringVarP(&deviceName, "device-name", "n", "", "Human readable device name.")
+ addDeviceCmd.Flags().StringVar(&deviceName, "name", "", "add a device name (optional)")
}
diff --git a/cmd/set.go b/cmd/addPnd.go
similarity index 68%
rename from cmd/set.go
rename to cmd/addPnd.go
index 486d9f594a7942d25aa690d5e4b970eb96816624..d61a454a9a347e8ebc05657d031afc785cb2517d 100644
--- a/cmd/set.go
+++ b/cmd/addPnd.go
@@ -34,24 +34,37 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
"github.com/spf13/cobra"
+
+ log "github.com/sirupsen/logrus"
)
-var typ string
+// addCmd represents the add command
+var addCmd = &cobra.Command{
+ Use: "add",
+ Short: "adds a new principal network domain to the controller",
+ Long: `A principal network domain is a main networking entity. This can be a
+campus building or site.
-// setCmd represents the set command
-var setCmd = &cobra.Command{
- Use: "set",
- Short: "set request",
- Long: `Sends a gNMI Set request to the specified target. Only one
-request per invocation supported.`,
+A description must be passed as positional argument. A name and default SBI can be
+passed using flags`,
+ Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.Set(address, username, password, typ, args...)
+ resp, err := cli.AddPnd(apiEndpoint, pndName, args[0], pndDefaultSbi)
+ if err != nil {
+ return err
+ }
+ log.Info(resp)
+ return nil
},
}
+var pndName string
+var pndDefaultSbi string
+
func init() {
- rootCmd.AddCommand(setCmd)
+ pndCmd.AddCommand(addCmd)
+
+ addCmd.Flags().StringVar(&pndName, "name", "", "the name of the pnd")
+ addCmd.Flags().StringVar(&pndDefaultSbi, "sbi", "openconfig", "the default SBI of the pnd")
- setCmd.Flags().StringVarP(&typ, "type", "t", "update", "Type of the set request. "+
- "Possible values: 'update', 'replace', and 'delete'")
}
diff --git a/cmd/cli.go b/cmd/cli.go
index 320c17ca84c17bafde8a2fa350e9d67e98465fb2..fbb0c71ddbdb98f69d05d55932e44a55d48fd257 100644
--- a/cmd/cli.go
+++ b/cmd/cli.go
@@ -46,13 +46,15 @@ var cliCmd = &cobra.Command{
Long: `Initialises the CLI. The first PND UUID and SBI UUID
are written to the config file for subsequent requests.`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(apiEndpoint, "init")
+ return cli.Init(apiEndpoint)
},
}
+var verbose bool
+
func init() {
rootCmd.AddCommand(cliCmd)
cliCmd.PersistentFlags().StringVar(&apiEndpoint, "controller", "http://gosdn-develop.apps.ocp.fbi.h-da.de/api", "address of the controller")
-
+ pndCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "show ond and sbi info")
}
diff --git a/cmd/cliSet.go b/cmd/cliSet.go
index e3f3a0743fdea2fa9c5c2ebd5686ef2e6675dc6b..3b5cdcc1d8127037e3bf3e5736781527d789f8f2 100644
--- a/cmd/cliSet.go
+++ b/cmd/cliSet.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -46,16 +47,18 @@ only one value supported for now.
Use "set replace" or "set delete" respectively`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ resp, err := cli.Update(
apiEndpoint,
- "update",
- "uuid="+uuid,
- "cliSbi="+cliSbi,
- "cliPnd="+cliPnd,
- "path="+args[0],
- "address="+address,
- "value="+args[1],
+ uuid,
+ cliPnd,
+ args[0],
+ args[1],
)
+ if err != nil {
+ return err
+ }
+ log.Info(resp)
+ return nil
},
}
diff --git a/cmd/commit.go b/cmd/commit.go
index a6ccb3b109b3c7f6afc4d7303c7c8ca88b196989..56b93cb16e2a0d583ac76a2d2587c8e714bcce24 100644
--- a/cmd/commit.go
+++ b/cmd/commit.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -42,13 +43,12 @@ var commitCmd = &cobra.Command{
Args: cobra.ExactArgs(1),
Short: "Commit the given change for the active PND",
Long: ``,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.Commit(
apiEndpoint,
- "change-commit",
- "pnd="+cliPnd,
- "cuid="+args[0],
- )
+ cliPnd,
+ args[0],
+ ))
},
}
diff --git a/cmd/confirm.go b/cmd/confirm.go
index 59cda76985aac03a9149da41a4e08f9545d0ac77..ef7320893641740fe0d465a13e3b7218ae6c2260 100644
--- a/cmd/confirm.go
+++ b/cmd/confirm.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -42,13 +43,12 @@ var confirmCmd = &cobra.Command{
Args: cobra.ExactArgs(1),
Short: "Confirms the given change for the active PND",
Long: ``,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.Confirm(
apiEndpoint,
- "change-confirm",
- "pnd="+cliPnd,
- "cuid="+args[0],
- )
+ cliPnd,
+ args[0],
+ ))
},
}
diff --git a/cmd/delete.go b/cmd/delete.go
index 3c4e4e7603c32be00c4bba428bd22b09cd735eea..43cd98b7d379f61811c762bd4622acb1a9d9e2ee 100644
--- a/cmd/delete.go
+++ b/cmd/delete.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -43,16 +44,13 @@ var deleteCmd = &cobra.Command{
Short: "set a value on a device",
Long: `Set a path value for a given device. Only one path and
only one value supported for now`,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.Delete(
apiEndpoint,
- "delete",
- "uuid="+uuid,
- "cliSbi="+cliSbi,
- "cliPnd="+cliPnd,
- "path="+args[0],
- "address="+address,
- )
+ uuid,
+ cliPnd,
+ args[0],
+ ))
},
}
diff --git a/cmd/getDevice.go b/cmd/getDevice.go
index ac38362886656823f04c0a79c55d3f9d0a15c7b8..2f394f86e45efa91deaff069bf4bbabe4aa75153 100644
--- a/cmd/getDevice.go
+++ b/cmd/getDevice.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -45,13 +46,17 @@ var getDeviceCmd = &cobra.Command{
Device UUID or name needs to be specified as positional argument.`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ resp, err := cli.GetDevice(
apiEndpoint,
- "getDevice",
- "identifier="+args[0],
- "sbi="+cliSbi,
- "pnd="+cliPnd,
+ cliPnd,
+ cliSbi,
+ args[0],
)
+ if err != nil {
+ return err
+ }
+ log.Info(resp)
+ return nil
},
}
diff --git a/cmd/getIds.go b/cmd/getIds.go
index ec858fd9cc857369ea9ead8887ec36c2025e0a29..b302f872a9bfd809a962348e16bbd539a110ee39 100644
--- a/cmd/getIds.go
+++ b/cmd/getIds.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -42,7 +43,20 @@ var getIdsCmd = &cobra.Command{
Short: "gets device IDs from the controller",
Long: `Gets device IDs from the controller and lists them.`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(apiEndpoint, "getIDs")
+ resp, err := cli.GetIds(apiEndpoint)
+ if err != nil {
+ return err
+ }
+ for i, pnd := range resp {
+ log.Infof("PND %v: %v\n\tuuid: %v", i+1, pnd.Name, pnd.Id)
+ for j, ond := range pnd.Ond {
+ log.Infof("\tSBI %v: %v\n\tuuid: %v", j+1, ond.Name, ond.Id)
+ }
+ for k, sbi := range pnd.Sbi {
+ log.Infof("\tSBI %v: %v", k+1, sbi.Id)
+ }
+ }
+ return nil
},
}
diff --git a/cmd/get.go b/cmd/getPnd.go
similarity index 75%
rename from cmd/get.go
rename to cmd/getPnd.go
index d200f3a08d4d8116e4168886dbde25427f99fa36..e426d051678a51eb31183361c26716f0f8079726 100644
--- a/cmd/get.go
+++ b/cmd/getPnd.go
@@ -33,21 +33,35 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
// getCmd represents the get command
var getCmd = &cobra.Command{
- Use: "gosdn get",
- Short: "get request",
- Long: `Sends a gNMI Get request to the specified target and
-prints the response to stdout`,
+ Use: "get",
+ Short: "get one or multiple pnds by uuid or name and print them to stdout",
+ Long: ``,
RunE: func(cmd *cobra.Command, args []string) error {
- _, err := cli.Get(address, username, password, args...)
- return err
+ resp, err := cli.GetPnd(apiEndpoint, args...)
+ if err != nil {
+ return err
+ }
+ for i, pnd := range resp.Pnd {
+ log.Infof("PND %v: %v\n\tuuid: %v", i+1, pnd.Name, pnd.Id)
+ if verbose {
+ for j, ond := range pnd.Ond {
+ log.Infof("\tSBI %v: %v\n\tuuid: %v", j+1, ond.Name, ond.Id)
+ }
+ for k, sbi := range pnd.Sbi {
+ log.Infof("\tSBI %v: %v", k+1, sbi.Id)
+ }
+ }
+ }
+ return nil
},
}
func init() {
- rootCmd.AddCommand(getCmd)
+ pndCmd.AddCommand(getCmd)
}
diff --git a/cmd/init.go b/cmd/init.go
index f39f09287c4517ed33c027cac6311a0e9be2585b..c45a03b217358be731977c4ad44ec094b2623c0b 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -44,7 +44,7 @@ var initCmd = &cobra.Command{
Same as invoking "gosdn cli" without any arguments`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(apiEndpoint, "init")
+ return cli.Init(apiEndpoint)
},
}
diff --git a/cmd/list.go b/cmd/list.go
index 198662268afafa640e5c73749c0f64899874188b..ea0a8c13f4e1c1959ba024e486ae22866e83d0c5 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -42,11 +43,18 @@ var listCmd = &cobra.Command{
Short: "Lists all committed changes",
Long: ``,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
- apiEndpoint,
- "change-list",
- "pnd="+cliPnd,
- )
+ resp, err := cli.GetChanges(apiEndpoint, cliPnd)
+ if err != nil {
+ return err
+ }
+ for _, change := range resp.Change {
+ log.WithFields(log.Fields{
+ "uuid": change.Id,
+ "age": change.Age,
+ "state": change.State,
+ }).Infof("")
+ }
+ return nil
},
}
diff --git a/cmd/listPending.go b/cmd/pnd.go
similarity index 63%
rename from cmd/listPending.go
rename to cmd/pnd.go
index c7893d97bfe5e891c0ca90c9df4b44856b39f045..a17c4d2896fe4bf1a75057c1730859747d70a5ee 100644
--- a/cmd/listPending.go
+++ b/cmd/pnd.go
@@ -32,24 +32,36 @@ POSSIBILITY OF SUCH DAMAGE.
package cmd
import (
- "code.fbi.h-da.de/cocsn/gosdn/cli"
+ "fmt"
+
"github.com/spf13/cobra"
)
-// listPendingCmd represents the listPending command
-var listPendingCmd = &cobra.Command{
- Use: "listPending",
- Short: "Lists all committed changes",
- Long: ``,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
- apiEndpoint,
- "change-list-pending",
- "pnd="+cliPnd,
- )
+// pndCmd represents the pnd command
+var pndCmd = &cobra.Command{
+ Use: "pnd",
+ Short: "A brief description of your command",
+ Long: `A longer description that spans multiple lines and likely contains examples
+and usage of using your command. For example:
+
+Cobra is a CLI library for Go that empowers applications.
+This application is a tool to generate the needed files
+to quickly create a Cobra application.`,
+ Run: func(cmd *cobra.Command, args []string) {
+ fmt.Println("pnd called")
},
}
func init() {
- changeCmd.AddCommand(listPendingCmd)
+ cliCmd.AddCommand(pndCmd)
+
+ // Here you will define your flags and configuration settings.
+
+ // Cobra supports Persistent Flags which will work for this command
+ // and all subcommands, e.g.:
+ // pndCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+ // Cobra supports local flags which will only run when this command
+ // is called directly, e.g.:
+ // pndCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
}
diff --git a/cmd/replace.go b/cmd/replace.go
index 33529c6d0e647aa9494b0dec9eee4ea2b2253818..953b01bfeeef4ab175a3328294c97c9546d4750a 100644
--- a/cmd/replace.go
+++ b/cmd/replace.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -43,17 +44,14 @@ var replaceCmd = &cobra.Command{
Short: "set a value on a device",
Long: `Set a path value for a given device. Only one path and
only one value supported for now`,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.Replace(
apiEndpoint,
- "replace",
- "uuid="+uuid,
- "cliSbi="+cliSbi,
- "cliPnd="+cliPnd,
- "path="+args[0],
- "address="+address,
- "value="+args[1],
- )
+ uuid,
+ cliPnd,
+ args[0],
+ args[1],
+ ))
},
}
diff --git a/cmd/request.go b/cmd/request.go
index 3bf82b6c69705fdd1cfb1f7396cd79977ea87de8..f70586dc7063f38f9b1a6c2f1b5f7348995e7dfd 100644
--- a/cmd/request.go
+++ b/cmd/request.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -44,15 +45,13 @@ var requestCmd = &cobra.Command{
Long: `Requests a path from a specified device on the controller.
The request path is passed as positional argument.`,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.GetDevice(
apiEndpoint,
- "request",
- "uuid="+uuid,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- "path="+args[0],
- )
+ cliPnd,
+ args[0],
+ uuid,
+ ))
},
}
diff --git a/cmd/requestAll.go b/cmd/requestAll.go
index 67fe1da1c40c884da0ac35c6f8d1c38d6260e711..2fb8dbb1fa6b263fb746b7307a85439e977b8cfa 100644
--- a/cmd/requestAll.go
+++ b/cmd/requestAll.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -46,13 +47,16 @@ the controller.
The request path is passed as positional argument.`,
RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ resp, err := cli.GetDevice(
apiEndpoint,
- "requestAll",
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- "path="+args[0],
+ cliPnd,
+ args[0],
)
+ if err != nil {
+ return err
+ }
+ log.Info(resp)
+ return nil
},
}
diff --git a/cmd/update.go b/cmd/update.go
index 93db8e374adf4553675bd14db98c29b09ee88052..e7443de720c7753a89ecc45beacef3a5a63a58a9 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -33,6 +33,7 @@ package cmd
import (
"code.fbi.h-da.de/cocsn/gosdn/cli"
+ log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -43,17 +44,14 @@ var updateCmd = &cobra.Command{
Short: "update a value on a device",
Long: `Update a path value for a given device. Only one path and
only one value supported for now`,
- RunE: func(cmd *cobra.Command, args []string) error {
- return cli.HTTPGet(
+ Run: func(cmd *cobra.Command, args []string) {
+ log.Info(cli.Update(
apiEndpoint,
- "update",
- "uuid="+uuid,
- "cliSbi="+cliSbi,
- "cliPnd="+cliPnd,
- "path="+args[0],
- "address="+address,
- "value="+args[1],
- )
+ uuid,
+ cliPnd,
+ args[0],
+ args[1],
+ ))
},
}
diff --git a/controller.go b/controller.go
index 9500225308f97fcddf863d0ee8b3decb417fbcb0..c6a434178c9cf4b1c15c46e1d9c8ff4bb2d06289 100644
--- a/controller.go
+++ b/controller.go
@@ -2,15 +2,22 @@ package gosdn
import (
"context"
+ "net"
"net/http"
"os"
"os/signal"
"sync"
"time"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ "github.com/spf13/viper"
+ "google.golang.org/grpc"
+
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
"code.fbi.h-da.de/cocsn/gosdn/database"
+ nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server"
"code.fbi.h-da.de/cocsn/gosdn/nucleus"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
@@ -19,14 +26,15 @@ import (
var coreLock sync.RWMutex
var coreOnce sync.Once
-// Core is the representation of the controllers core
+// Core is the representation of the controller's core
type Core struct {
// deprecated
database database.Database
pndc *nucleus.PndStore
- sbic *nucleus.SbiStore
httpServer *http.Server
+ grpcServer *grpc.Server
+ nbi *nbi.NorthboundInterface
stopChan chan os.Signal
}
@@ -36,7 +44,6 @@ func init() {
c = &Core{
database: database.Database{},
pndc: nucleus.NewPndStore(),
- sbic: nucleus.NewSbiStore(),
stopChan: make(chan os.Signal, 1),
}
@@ -50,19 +57,33 @@ func initialize() error {
return err
}
- // TODO: Start grpc listener here
coreLock.Lock()
- defer coreLock.Unlock()
startHttpServer()
+ coreLock.Unlock()
+ return startGrpcServer()
+}
+
+func startGrpcServer() error {
+ sock := viper.GetString("socket")
+ lis, err := net.Listen("tcp", sock)
+ if err != nil {
+ return err
+ }
+ c.grpcServer = grpc.NewServer()
+ c.nbi = nbi.NewNBI(c.pndc)
+ pb.RegisterCoreServer(c.grpcServer, c.nbi.Core)
+ ppb.RegisterPndServer(c.grpcServer, c.nbi.Pnd)
+ go func() {
+ if err := c.grpcServer.Serve(lis); err != nil {
+ log.Fatal(err)
+ }
+ }()
return nil
}
// createSouthboundInterfaces initializes the controller with its supported SBIs
func createSouthboundInterfaces() error {
- sbi := nucleus.NewSBI(types.Openconfig)
- if err := c.sbic.Add(sbi); err != nil {
- return err
- }
+ sbi := nucleus.NewSBI(spb.Type_OPENCONFIG)
return createPrincipalNetworkDomain(sbi)
}
@@ -106,5 +127,6 @@ func shutdown() error {
log.Info("shutting down controller")
coreLock.Lock()
defer coreLock.Unlock()
+ c.grpcServer.GracefulStop()
return stopHttpServer()
}
diff --git a/controller_test.go b/controller_test.go
index 27546454382200f60e86a664c185d4871a1ce8b2..79d7cc8bc9ddbc67750fecf521077d6e2c879bc7 100644
--- a/controller_test.go
+++ b/controller_test.go
@@ -9,9 +9,6 @@ import (
)
func TestRun(t *testing.T) {
- if testing.Short() {
- t.Skip("this test is executed separately")
- }
type args struct {
request string
}
@@ -30,11 +27,6 @@ func TestRun(t *testing.T) {
args: args{request: apiEndpoint + "/readyz"},
want: http.StatusOK,
},
- {
- name: "init",
- args: args{request: apiEndpoint + "/api?q=init"},
- want: http.StatusOK,
- },
}
ctx, cancel := context.WithCancel(context.Background())
go func() {
@@ -52,7 +44,7 @@ func TestRun(t *testing.T) {
if !reflect.DeepEqual(got.StatusCode, tests[0].want) {
t.Errorf("livez got: %v, want %v", got.StatusCode, tests[0].want)
}
- got, err = http.Get(tests[0].args.request)
+ got, err = http.Get(tests[1].args.request)
if err != nil {
t.Error(err)
return
@@ -60,14 +52,6 @@ func TestRun(t *testing.T) {
if !reflect.DeepEqual(got.StatusCode, tests[1].want) {
t.Errorf("readyz got: %v, want %v", got.StatusCode, tests[1].want)
}
- got, err = http.Get(tests[0].args.request)
- if err != nil {
- t.Error(err)
- return
- }
- if !reflect.DeepEqual(got.StatusCode, tests[2].want) {
- t.Errorf("api init got: %v, want %v", got.StatusCode, tests[2].want)
- }
})
cancel()
diff --git a/forks/google/gnmi/model.go b/forks/google/gnmi/model.go
index 8d6a4998be62fba77ec2b50ea7decfb8b989fb75..b30a1de2b741beeba3d3d649aac092dee833c1a9 100644
--- a/forks/google/gnmi/model.go
+++ b/forks/google/gnmi/model.go
@@ -16,14 +16,15 @@ limitations under the License.
package gnmi
import (
- oc "code.fbi.h-da.de/cocsn/yang-models/generated/arista"
"errors"
"fmt"
- log "github.com/sirupsen/logrus"
"net"
"reflect"
"sort"
+ oc "code.fbi.h-da.de/cocsn/yang-models/generated/arista"
+ log "github.com/sirupsen/logrus"
+
"github.com/openconfig/goyang/pkg/yang"
"github.com/openconfig/ygot/ygot"
"github.com/openconfig/ygot/ytypes"
diff --git a/go.mod b/go.mod
index a8879d2d35c76d7fae7ca783814d6ec407cc53b4..883bcc2b4a4f41c5d16d45b27701bd45f6ab48df 100644
--- a/go.mod
+++ b/go.mod
@@ -1,16 +1,17 @@
module code.fbi.h-da.de/cocsn/gosdn
-go 1.14
+go 1.16
require (
+ code.fbi.h-da.de/cocsn/api/go v0.0.0-20210528163424-f37e91dc5895
code.fbi.h-da.de/cocsn/yang-models v0.0.7
github.com/aristanetworks/goarista v0.0.0-20201120222254-94a892eb0c6a
+ github.com/golang/protobuf v1.5.2
github.com/docker/docker v1.13.1
- github.com/golang/protobuf v1.5.0
github.com/google/gnxi v0.0.0-20201221102247-c26672548161
github.com/google/uuid v1.1.2
github.com/neo4j/neo4j-go-driver v1.8.3
- github.com/openconfig/gnmi v0.0.0-20210428141518-ae4d850000ab
+ github.com/openconfig/gnmi v0.0.0-20210430192044-ab96b57c5113
github.com/openconfig/goyang v0.2.4
github.com/openconfig/ygot v0.10.5
github.com/sirupsen/logrus v1.8.1
diff --git a/go.sum b/go.sum
index c92b0a484bbfc28c2259f0cca50497156779bb2c..e54bdedadf898c8469cb319baf75c9436bf92a09 100644
--- a/go.sum
+++ b/go.sum
@@ -21,6 +21,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+code.fbi.h-da.de/cocsn/api/go v0.0.0-20210528163424-f37e91dc5895 h1:sE27WY01oRXJqwcTyhl3a8BBCGCeIsD9eLAzWb7aX9A=
+code.fbi.h-da.de/cocsn/api/go v0.0.0-20210528163424-f37e91dc5895/go.mod h1:2+rnE92IyXLbiy3/92EM7JrtsY5tXPAKX90QmsT2+m0=
code.fbi.h-da.de/cocsn/yang-models v0.0.7 h1:3TOo8J+EdAJKeq4o3aaNWZRhjSwguIS8wciW1U9PkSk=
code.fbi.h-da.de/cocsn/yang-models v0.0.7/go.mod h1:M+2HinfhTT8nA8qvn2cpWNlOtuiizTNDWA3yfy72K/g=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -160,8 +162,9 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -324,8 +327,8 @@ github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+L
github.com/openconfig/gnmi v0.0.0-20200414194230-1597cc0f2600/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A=
github.com/openconfig/gnmi v0.0.0-20200508230933-d19cebf5e7be/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A=
github.com/openconfig/gnmi v0.0.0-20200617225440-d2b4e6a45802/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A=
-github.com/openconfig/gnmi v0.0.0-20210428141518-ae4d850000ab h1:iLOhSO6bYXR+Ja9pa0HdX8ZSoAcY0EtRu1vfkLFY6+w=
-github.com/openconfig/gnmi v0.0.0-20210428141518-ae4d850000ab/go.mod h1:H/20NXlnWbCPFC593nxpiKJ+OU//7mW7s7Qk7uVdg3Q=
+github.com/openconfig/gnmi v0.0.0-20210430192044-ab96b57c5113 h1:gHZS9U5wmDYeS8vPu4eEXbWHAVwayPwJ/Ze5RGYGXLw=
+github.com/openconfig/gnmi v0.0.0-20210430192044-ab96b57c5113/go.mod h1:H/20NXlnWbCPFC593nxpiKJ+OU//7mW7s7Qk7uVdg3Q=
github.com/openconfig/goyang v0.0.0-20200115183954-d0a48929f0ea/go.mod h1:dhXaV0JgHJzdrHi2l+w0fZrwArtXL7jEFoiqLEdmkvU=
github.com/openconfig/goyang v0.2.2/go.mod h1:vX61x01Q46AzbZUzG617vWqh/cB+aisc+RrNkXRd3W8=
github.com/openconfig/goyang v0.2.3/go.mod h1:vX61x01Q46AzbZUzG617vWqh/cB+aisc+RrNkXRd3W8=
diff --git a/http.go b/http.go
index cc44a1059dd61e717900ef725af22718e95b9b9d..778b3750c4756503d6f3dc0d626d57b98ee1e908 100644
--- a/http.go
+++ b/http.go
@@ -3,28 +3,12 @@ package gosdn
import (
"context"
"fmt"
- "io"
"net/http"
- "net/url"
"time"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
-
- "github.com/google/uuid"
-
- gpb "github.com/openconfig/gnmi/proto/gnmi"
log "github.com/sirupsen/logrus"
)
-var apiOpmap = map[string]types.Operation{
- "update": types.TransportUpdate,
- "replace": types.TransportReplace,
- "delete": types.TransportDelete,
-}
-
func stopHttpServer() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
@@ -38,7 +22,6 @@ func registerHttpHandler() {
fmt.Println("Recovered in f", r)
}
}()
- http.HandleFunc("/api", httpApi)
http.HandleFunc("/livez", healthCheck)
http.HandleFunc("/readyz", readynessCheck)
}
@@ -58,206 +41,3 @@ func healthCheck(writer http.ResponseWriter, request *http.Request) {
func readynessCheck(writer http.ResponseWriter, request *http.Request) {
writer.WriteHeader(http.StatusOK)
}
-
-// deprecated
-// nolint
-func httpApi(writer http.ResponseWriter, request *http.Request) {
- log.WithFields(log.Fields{
- "request": request,
- }).Debug("incoming request")
-
- query, err := url.ParseQuery(request.URL.RawQuery)
- if err != nil {
- log.Error(err)
- writer.WriteHeader(http.StatusBadRequest)
- return
- }
-
- id, err := uuid.Parse(query.Get("uuid"))
- if err != nil {
- if err.Error() != "invalid UUID length: 0" {
- log.Error(err)
- }
- }
-
- pid, err := uuid.Parse(query.Get("pnd"))
- if err != nil {
- if err.Error() != "invalid UUID length: 0" {
- log.Error(err)
- }
- }
-
- sid, err := uuid.Parse(query.Get("sbi"))
- if err != nil {
- if err.Error() != "invalid UUID length: 0" {
- log.Error(err)
- }
- }
-
- var httpPnd nucleus.PrincipalNetworkDomain
- var httpSbi nucleus.SouthboundInterface
- if query.Get("q") != "init" && query.Get("q") != "getIDs" {
- httpPnd, err = c.pndc.Get(pid)
- if err != nil {
- handleServerError(writer, err)
- return
- }
- sbic := httpPnd.GetSBIs()
- httpSbi, err = sbic.(*nucleus.SbiStore).Get(sid)
- if err != nil {
- handleServerError(writer, err)
- return
- }
- }
-
- switch q := query.Get("q"); q {
- case "addDevice":
- d, err := nucleus.NewDevice(httpSbi, &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: query.Get("address"),
- Password: query.Get("password"),
- Username: query.Get("username"),
- Encoding: gpb.Encoding_JSON_IETF,
- },
- SetNode: httpSbi.SetNode(),
- Unmarshal: httpSbi.(*nucleus.OpenConfig).Unmarshal(),
- RespChan: make(chan *gpb.SubscribeResponse),
- },
- query.Get("name"),
- )
- if err != nil {
- writer.WriteHeader(http.StatusInternalServerError)
- log.Error(err)
-
- return
- }
-
- err = httpPnd.AddDevice(d)
- if err != nil {
- writer.WriteHeader(http.StatusInternalServerError)
- log.Error(err)
-
- return
- }
- writer.WriteHeader(http.StatusCreated)
- fmt.Fprintf(writer, "device added\n")
- fmt.Fprintf(writer, "Name: %s\n", d.Name)
- fmt.Fprintf(writer, "UUID: %v\n", d.UUID)
- case "request":
- err = httpPnd.Request(id, query.Get("path"))
- if err != nil {
- switch err.(type) {
- case *errors.ErrNotFound:
- writer.WriteHeader(http.StatusNotFound)
- default:
- writer.WriteHeader(http.StatusInternalServerError)
- }
- log.Error(err)
- return
- }
- writer.WriteHeader(http.StatusOK)
- case "requestAll":
- err = httpPnd.RequestAll(query.Get("path"))
- if err != nil {
- switch err.(type) {
- case *errors.ErrNotFound:
- writer.WriteHeader(http.StatusNotFound)
- default:
- writer.WriteHeader(http.StatusInternalServerError)
- }
- log.Error(err)
- return
- }
- writer.WriteHeader(http.StatusOK)
- case "getDevice":
- deviceIdentifier := query.Get("identifier")
-
- device, err := httpPnd.MarshalDevice(deviceIdentifier)
- if err != nil {
- switch err.(type) {
- case *errors.ErrNotFound:
- writer.WriteHeader(http.StatusNotFound)
- default:
- writer.WriteHeader(http.StatusInternalServerError)
- }
- log.Error(err)
-
- return
- }
-
- writer.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(writer, "%v", device)
-
- case "getIDs":
-
- pnds := c.pndc.UUIDs()
- writeIDs(writer, "PNDs", pnds)
- writeIDs(writer, "SBIs", c.sbic.UUIDs())
- for _, id := range pnds {
- p, err := c.pndc.Get(id)
- if err != nil {
- handleServerError(writer, err)
- return
- }
- writeIDs(writer, "Devices", p.Devices())
- }
- case "init":
- writeIDs(writer, "PNDs", c.pndc.UUIDs())
- writeIDs(writer, "SBIs", c.sbic.UUIDs())
- case "update", "replace":
- if err := httpPnd.ChangeOND(id, apiOpmap[q], query.Get("path"), query.Get("value")); err != nil {
- handleServerError(writer, err)
- return
- }
- writer.WriteHeader(http.StatusOK)
- case "delete":
- if err := httpPnd.ChangeOND(id, types.TransportDelete, query.Get("path")); err != nil {
- handleServerError(writer, err)
- return
- }
- writer.WriteHeader(http.StatusOK)
- case "change-list":
- changes := httpPnd.Committed()
- writeIDs(writer, "Tentative changes", changes)
- case "change-list-pending":
- changes := httpPnd.Pending()
- writeIDs(writer, "Pending changes", changes)
- case "change-commit":
- cuid, err := uuid.Parse(query.Get("cuid"))
- if err != nil {
- handleServerError(writer, err)
- return
- }
- if err := httpPnd.Commit(cuid); err != nil {
- handleServerError(writer, err)
- return
- }
- writer.WriteHeader(http.StatusAccepted)
- case "change-confirm":
- cuid, err := uuid.Parse(query.Get("cuid"))
- if err != nil {
- handleServerError(writer, err)
- return
- }
- if err := httpPnd.Confirm(cuid); err != nil {
- handleServerError(writer, err)
- return
- }
- writer.WriteHeader(http.StatusAccepted)
- default:
- writer.WriteHeader(http.StatusBadRequest)
- }
-}
-
-func writeIDs(w io.Writer, typ string, ids []uuid.UUID) {
- fmt.Fprintf(w, "%v:\n", typ)
- for i, id := range ids {
- fmt.Fprintf(w, "%v: %v\n", i+1, id)
- }
-}
-
-func handleServerError(w http.ResponseWriter, err error) {
- w.WriteHeader(http.StatusInternalServerError)
- fmt.Fprintf(w, "error: %v", err)
- log.Error(err)
-}
diff --git a/http_test.go b/http_test.go
index 8b80c8b4e1286b241b5254de5c496ba587e23455..1d1d311bce7969e2c6b18dfd0fbab48deca3b148 100644
--- a/http_test.go
+++ b/http_test.go
@@ -1,50 +1,14 @@
package gosdn
import (
- "errors"
"net/http"
"testing"
-
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
-
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "github.com/google/uuid"
- log "github.com/sirupsen/logrus"
- "github.com/stretchr/testify/mock"
)
-func testSetupHTTP() {
- sbi = nucleus.NewSBI(types.Openconfig)
- sbi.Schema()
- defaultSbiID = sbi.ID()
- var err error
- httpTestPND, err = nucleus.NewPND("test", "test pnd", defaultPndID, sbi)
- if err != nil {
- log.Fatal(err)
- }
- httpTestDevice = mockDevice()
- tr := httpTestDevice.Transport.(*mocks.Transport)
- mockError := errors.New("mock error")
- tr.On("Get", mockContext, "/system/config/hostname").Return(mock.Anything, nil)
- tr.On("Get", mockContext, "error").Return(mock.Anything, mockError)
- tr.On("Set", mockContext, mock.Anything).Return(mock.Anything, nil)
- tr.On("ProcessResponse", mock.Anything, mock.Anything, mock.Anything).Return(nil)
- if err := httpTestPND.AddDevice(&httpTestDevice); err != nil {
- log.Fatal(err)
- }
- args = "&uuid=" + mdid.String() + "&pnd=" + defaultPndID.String() + "&sbi=" + defaultSbiID.String()
- argsNotFound = "&uuid=" + uuid.New().String() + "&pnd=" + defaultPndID.String() + "&sbi=" + defaultSbiID.String()
- argsNotFoundGetDevice = "&identifier=" + uuid.New().String() + "&pnd=" + defaultPndID.String() + "&sbi=" + defaultSbiID.String()
- if err := c.sbic.Add(sbi); err != nil {
- log.Fatal(err)
- }
- if err := c.pndc.Add(httpTestPND); err != nil {
- log.Fatal(err)
- }
-}
-
func Test_httpApi(t *testing.T) {
+ if testing.Short() {
+ t.Skip("this test is executed separately")
+ }
tests := []struct {
name string
request string
@@ -63,129 +27,6 @@ func Test_httpApi(t *testing.T) {
want: &http.Response{StatusCode: http.StatusOK},
wantErr: false,
},
- {
- name: "init",
- request: apiEndpoint + "/api?q=init",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "get-ids",
- request: apiEndpoint + "/api?q=getIDs",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "add-device",
- request: apiEndpoint + "/api?q=addDevice" + args,
- want: &http.Response{StatusCode: http.StatusCreated},
- wantErr: false,
- },
- {
- name: "request",
- request: apiEndpoint + "/api?q=request" + args + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "request not found",
- request: apiEndpoint + "/api?q=request" + argsNotFound + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusNotFound},
- wantErr: false,
- },
- {
- name: "request internal server error",
- request: apiEndpoint + "/api?q=request" + args + "&path=error",
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
- {
- name: "request-all",
- request: apiEndpoint + "/api?q=requestAll" + args + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "request-all internal server error",
- request: apiEndpoint + "/api?q=requestAll" + args + "&path=error",
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
-
- {
- name: "get-device",
- request: apiEndpoint + "/api?q=getDevice" + args,
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "get-device not found",
- request: apiEndpoint + "/api?q=getDevice" + argsNotFoundGetDevice,
- want: &http.Response{StatusCode: http.StatusNotFound},
- wantErr: false,
- },
- {
- name: "set",
- request: apiEndpoint + "/api?q=update" + args + "&path=/system/config/hostname&value=ceos3000",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "replace",
- request: apiEndpoint + "/api?q=replace" + args + "&path=/system/config/hostname&value=ceos3000",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "delete",
- request: apiEndpoint + "/api?q=delete" + args + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "change list",
- request: apiEndpoint + "/api?q=change-list" + args + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "change list pending",
- request: apiEndpoint + "/api?q=change-list-pending" + args + "&path=/system/config/hostname",
- want: &http.Response{StatusCode: http.StatusOK},
- wantErr: false,
- },
- {
- name: "change commit",
- request: apiEndpoint + "/api?q=change-commit" + args + "&cuid=" + cuid.String(),
- // TODO: Mock Change for testing
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
- {
- name: "change confirm",
- request: apiEndpoint + "/api?q=change-confirm" + args + "&cuid=" + cuid.String(),
- // TODO: Mock Change for testing
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
- {
- name: "bad request",
- request: apiEndpoint + "/api?q=bad-request" + args,
- want: &http.Response{StatusCode: http.StatusBadRequest},
- wantErr: false,
- },
- {
- name: "internal server errror: wrong pnd",
- request: apiEndpoint + "/api?pnd=" + uuid.New().String(),
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
- {
- name: "internal server errror: wrong sbi",
- request: apiEndpoint + "/api?sbi=" + uuid.New().String(),
- want: &http.Response{StatusCode: http.StatusInternalServerError},
- wantErr: false,
- },
}
coreLock.Lock()
startHttpServer()
@@ -200,16 +41,6 @@ func Test_httpApi(t *testing.T) {
if got.StatusCode != tt.want.StatusCode {
t.Errorf("httpApi() got: %v, want %v", got.StatusCode, tt.want.StatusCode)
}
- if tt.name == "add-device" {
- for _, k := range httpTestPND.Devices() {
- if k != mdid {
- if err := httpTestPND.RemoveDevice(k); err != nil {
- t.Error(err)
- return
- }
- }
- }
- }
})
}
}
diff --git a/initialise_test.go b/initialise_test.go
index 74effe95eed2b368abc0bdf59ef6c527c7ffce7e..85d5fb6f41a59247c12bc339f82768718f2166b8 100644
--- a/initialise_test.go
+++ b/initialise_test.go
@@ -64,7 +64,6 @@ func TestMain(m *testing.M) {
}
readTestUUIDs()
- testSetupHTTP()
os.Exit(m.Run())
}
diff --git a/mocks/PrincipalNetworkDomain.go b/mocks/PrincipalNetworkDomain.go
index 6c795cb7388b80a8446f5c2c8314ed98fa3eba5f..ed11f411beeff2f5f7e44d7e49550f2d2d937476 100644
--- a/mocks/PrincipalNetworkDomain.go
+++ b/mocks/PrincipalNetworkDomain.go
@@ -1,13 +1,15 @@
-// Code generated by mockery 2.7.4. DO NOT EDIT.
+// Code generated by mockery 2.7.5. DO NOT EDIT.
package mocks
import (
mock "github.com/stretchr/testify/mock"
- uuid "github.com/google/uuid"
+ pnd "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+
+ transport "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- ygot "github.com/openconfig/ygot/ygot"
+ uuid "github.com/google/uuid"
)
// PrincipalNetworkDomain is an autogenerated mock type for the PrincipalNetworkDomain type
@@ -15,13 +17,13 @@ type PrincipalNetworkDomain struct {
mock.Mock
}
-// AddDevice provides a mock function with given fields: _a0
-func (_m *PrincipalNetworkDomain) AddDevice(_a0 interface{}) error {
- ret := _m.Called(_a0)
+// AddDevice provides a mock function with given fields: name, opts, sid
+func (_m *PrincipalNetworkDomain) AddDevice(name string, opts *transport.TransportOption, sid uuid.UUID) error {
+ ret := _m.Called(name, opts, sid)
var r0 error
- if rf, ok := ret.Get(0).(func(interface{}) error); ok {
- r0 = rf(_a0)
+ if rf, ok := ret.Get(0).(func(string, *transport.TransportOption, uuid.UUID) error); ok {
+ r0 = rf(name, opts, sid)
} else {
r0 = ret.Error(0)
}
@@ -44,7 +46,7 @@ func (_m *PrincipalNetworkDomain) AddSbi(_a0 interface{}) error {
}
// ChangeOND provides a mock function with given fields: _a0, operation, path, value
-func (_m *PrincipalNetworkDomain) ChangeOND(_a0 uuid.UUID, operation interface{}, path string, value ...string) error {
+func (_m *PrincipalNetworkDomain) ChangeOND(_a0 uuid.UUID, operation pnd.ApiOperation, path string, value ...string) error {
_va := make([]interface{}, len(value))
for _i := range value {
_va[_i] = value[_i]
@@ -55,7 +57,7 @@ func (_m *PrincipalNetworkDomain) ChangeOND(_a0 uuid.UUID, operation interface{}
ret := _m.Called(_ca...)
var r0 error
- if rf, ok := ret.Get(0).(func(uuid.UUID, interface{}, string, ...string) error); ok {
+ if rf, ok := ret.Get(0).(func(uuid.UUID, pnd.ApiOperation, string, ...string) error); ok {
r0 = rf(_a0, operation, path, value...)
} else {
r0 = ret.Error(0)
@@ -78,8 +80,8 @@ func (_m *PrincipalNetworkDomain) Commit(_a0 uuid.UUID) error {
return r0
}
-// Committed provides a mock function with given fields:
-func (_m *PrincipalNetworkDomain) Committed() []uuid.UUID {
+// CommittedChanges provides a mock function with given fields:
+func (_m *PrincipalNetworkDomain) CommittedChanges() []uuid.UUID {
ret := _m.Called()
var r0 []uuid.UUID
@@ -152,6 +154,36 @@ func (_m *PrincipalNetworkDomain) Devices() []uuid.UUID {
return r0
}
+// GetChange provides a mock function with given fields: _a0, _a1
+func (_m *PrincipalNetworkDomain) GetChange(_a0 uuid.UUID, _a1 ...int) (interface{}, error) {
+ _va := make([]interface{}, len(_a1))
+ for _i := range _a1 {
+ _va[_i] = _a1[_i]
+ }
+ var _ca []interface{}
+ _ca = append(_ca, _a0)
+ _ca = append(_ca, _va...)
+ ret := _m.Called(_ca...)
+
+ var r0 interface{}
+ if rf, ok := ret.Get(0).(func(uuid.UUID, ...int) interface{}); ok {
+ r0 = rf(_a0, _a1...)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).(interface{})
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(uuid.UUID, ...int) error); ok {
+ r1 = rf(_a0, _a1...)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// GetDescription provides a mock function with given fields:
func (_m *PrincipalNetworkDomain) GetDescription() string {
ret := _m.Called()
@@ -166,22 +198,22 @@ func (_m *PrincipalNetworkDomain) GetDescription() string {
return r0
}
-// GetDevice provides a mock function with given fields: _a0
-func (_m *PrincipalNetworkDomain) GetDevice(_a0 uuid.UUID) (ygot.GoStruct, error) {
- ret := _m.Called(_a0)
+// GetDevice provides a mock function with given fields: identifier
+func (_m *PrincipalNetworkDomain) GetDevice(identifier string) (interface{}, error) {
+ ret := _m.Called(identifier)
- var r0 ygot.GoStruct
- if rf, ok := ret.Get(0).(func(uuid.UUID) ygot.GoStruct); ok {
- r0 = rf(_a0)
+ var r0 interface{}
+ if rf, ok := ret.Get(0).(func(string) interface{}); ok {
+ r0 = rf(identifier)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(ygot.GoStruct)
+ r0 = ret.Get(0).(interface{})
}
}
var r1 error
- if rf, ok := ret.Get(1).(func(uuid.UUID) error); ok {
- r1 = rf(_a0)
+ if rf, ok := ret.Get(1).(func(string) error); ok {
+ r1 = rf(identifier)
} else {
r1 = ret.Error(1)
}
@@ -236,18 +268,18 @@ func (_m *PrincipalNetworkDomain) ID() uuid.UUID {
}
// MarshalDevice provides a mock function with given fields: _a0
-func (_m *PrincipalNetworkDomain) MarshalDevice(_a0 uuid.UUID) (string, error) {
+func (_m *PrincipalNetworkDomain) MarshalDevice(_a0 string) (string, error) {
ret := _m.Called(_a0)
var r0 string
- if rf, ok := ret.Get(0).(func(uuid.UUID) string); ok {
+ if rf, ok := ret.Get(0).(func(string) string); ok {
r0 = rf(_a0)
} else {
r0 = ret.Get(0).(string)
}
var r1 error
- if rf, ok := ret.Get(1).(func(uuid.UUID) error); ok {
+ if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(_a0)
} else {
r1 = ret.Error(1)
@@ -256,8 +288,8 @@ func (_m *PrincipalNetworkDomain) MarshalDevice(_a0 uuid.UUID) (string, error) {
return r0, r1
}
-// Pending provides a mock function with given fields:
-func (_m *PrincipalNetworkDomain) Pending() []uuid.UUID {
+// PendingChanges provides a mock function with given fields:
+func (_m *PrincipalNetworkDomain) PendingChanges() []uuid.UUID {
ret := _m.Called()
var r0 []uuid.UUID
diff --git a/mocks/SouthboundInterface.go b/mocks/SouthboundInterface.go
index 38ffb81ff021989bb8153c33169ce40ad8863a33..560db283ced93dfae4790ac5d934e132feb5d92f 100644
--- a/mocks/SouthboundInterface.go
+++ b/mocks/SouthboundInterface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.4. DO NOT EDIT.
+// Code generated by mockery 2.7.5. DO NOT EDIT.
package mocks
@@ -6,6 +6,8 @@ import (
gnmi "github.com/openconfig/gnmi/proto/gnmi"
mock "github.com/stretchr/testify/mock"
+ southbound "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+
uuid "github.com/google/uuid"
yang "github.com/openconfig/goyang/pkg/yang"
@@ -79,3 +81,17 @@ func (_m *SouthboundInterface) SetNode() func(*yang.Entry, interface{}, *gnmi.Pa
return r0
}
+
+// Type provides a mock function with given fields:
+func (_m *SouthboundInterface) Type() southbound.Type {
+ ret := _m.Called()
+
+ var r0 southbound.Type
+ if rf, ok := ret.Get(0).(func() southbound.Type); ok {
+ r0 = rf()
+ } else {
+ r0 = ret.Get(0).(southbound.Type)
+ }
+
+ return r0
+}
diff --git a/mocks/Storable.go b/mocks/Storable.go
index e55a23eb41a51d2715f2ee94dfbb9e7a285a0145..5c986ae2befaa84c3069e4e07b05cb209ecdf9f5 100644
--- a/mocks/Storable.go
+++ b/mocks/Storable.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.4. DO NOT EDIT.
+// Code generated by mockery 2.7.5. DO NOT EDIT.
package mocks
diff --git a/mocks/Transport.go b/mocks/Transport.go
index 7d8531e57334fd330a698165132428273d618f39..4ba9ae182ce9df5909230a780182e161c6b4052e 100644
--- a/mocks/Transport.go
+++ b/mocks/Transport.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.4. DO NOT EDIT.
+// Code generated by mockery 2.7.5. DO NOT EDIT.
package mocks
@@ -45,22 +45,6 @@ func (_m *Transport) Get(ctx context.Context, params ...string) (interface{}, er
return r0, r1
}
-// GetOptions provides a mock function with given fields:
-func (_m *Transport) GetOptions() interface{} {
- ret := _m.Called()
-
- var r0 interface{}
- if rf, ok := ret.Get(0).(func() interface{}); ok {
- r0 = rf()
- } else {
- if ret.Get(0) != nil {
- r0 = ret.Get(0).(interface{})
- }
- }
-
- return r0
-}
-
// ProcessResponse provides a mock function with given fields: resp, root, models
func (_m *Transport) ProcessResponse(resp interface{}, root interface{}, models *ytypes.Schema) error {
ret := _m.Called(resp, root, models)
diff --git a/northbound/client/core.go b/northbound/client/core.go
new file mode 100644
index 0000000000000000000000000000000000000000..2e5278923214769c5c5b4adf43dfdf07f50a251d
--- /dev/null
+++ b/northbound/client/core.go
@@ -0,0 +1,17 @@
+package client
+
+import (
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ "google.golang.org/grpc"
+)
+
+// CoreClient returns a client for the gRPC Core service. It takes
+// the address of the gRPC endpoint and optional grpc.DialOption
+// as argument
+func CoreClient(addr string, opts ...grpc.DialOption) (pb.CoreClient, error) {
+ conn, err := grpc.Dial(addr, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return pb.NewCoreClient(conn), nil
+}
diff --git a/northbound/client/pnd.go b/northbound/client/pnd.go
new file mode 100644
index 0000000000000000000000000000000000000000..f5ca9101611758b7c30704f501aa1ed84aeaa9ac
--- /dev/null
+++ b/northbound/client/pnd.go
@@ -0,0 +1,17 @@
+package client
+
+import (
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ "google.golang.org/grpc"
+)
+
+// PndClient returns a client for the gRPC PND service. It takes
+// the address of the gRPC endpoint and optional grpc.DialOption
+// as argument
+func PndClient(addr string, opts ...grpc.DialOption) (ppb.PndClient, error) {
+ conn, err := grpc.Dial(addr, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return ppb.NewPndClient(conn), nil
+}
diff --git a/northbound/server/core.go b/northbound/server/core.go
new file mode 100644
index 0000000000000000000000000000000000000000..60de83baded00b37a2c2d84166913f5b18cc7c8f
--- /dev/null
+++ b/northbound/server/core.go
@@ -0,0 +1,65 @@
+package server
+
+import (
+ "context"
+ "time"
+
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "github.com/google/uuid"
+)
+
+type core struct {
+ pb.UnimplementedCoreServer
+}
+
+func (s core) Get(ctx context.Context, request *pb.GetRequest) (*pb.GetResponse, error) {
+ var pndList []uuid.UUID
+ switch request.All {
+ case true:
+ pndList = pndc.UUIDs()
+ default:
+ var err error
+ pndList, err = stringToUUID(request.Pid)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ pnds := make([]*ppb.PrincipalNetworkDomain, len(pndList))
+ for i, id := range pndList {
+ pnd, err := pndc.Get(id)
+ if err != nil {
+ return nil, err
+ }
+ pnds[i] = &ppb.PrincipalNetworkDomain{
+ Id: pnd.ID().String(),
+ Name: pnd.GetName(),
+ Description: pnd.GetDescription(),
+ }
+ }
+ return &pb.GetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Pnd: pnds,
+ }, nil
+}
+
+func (s core) Set(ctx context.Context, request *pb.SetRequest) (*pb.SetResponse, error) {
+ for _, r := range request.Pnd {
+ sbi := nucleus.NewSBI(spb.Type_OPENCONFIG)
+
+ pnd, err := nucleus.NewPND(r.Name, r.Description, uuid.New(), sbi)
+ if err != nil {
+ return nil, err
+ }
+ if err := pndc.Add(pnd); err != nil {
+ return nil, err
+ }
+ }
+ return &pb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: pb.SetResponse_OK,
+ }, nil
+}
diff --git a/northbound/server/core_test.go b/northbound/server/core_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..3240fbb3c39808819ef57529b4bec4b934ce20af
--- /dev/null
+++ b/northbound/server/core_test.go
@@ -0,0 +1,104 @@
+package server
+
+import (
+ "context"
+ "reflect"
+ "testing"
+
+ pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+)
+
+func Test_core_Set(t *testing.T) {
+ type args struct {
+ ctx context.Context
+ request *pb.SetRequest
+ }
+ tests := []struct {
+ name string
+ args args
+ want *pb.SetResponse
+ wantErr bool
+ }{
+ {
+ name: "default",
+ args: args{
+ ctx: context.Background(),
+ request: &pb.SetRequest{
+ Pnd: []*pb.SetPnd{
+ {
+ Name: "test",
+ Description: "test",
+ Sbi: "test",
+ },
+ },
+ },
+ },
+ want: &pb.SetResponse{},
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ s := core{
+ UnimplementedCoreServer: pb.UnimplementedCoreServer{},
+ }
+ got, err := s.Set(tt.args.ctx, tt.args.request)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("core.Set() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+ tt.want.Timestamp = got.Timestamp
+ if !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("core.Set() = %v, want %v", got, tt.want)
+ }
+ })
+ }
+}
+
+func Test_core_Get(t *testing.T) {
+ type args struct {
+ ctx context.Context
+ request *pb.GetRequest
+ }
+ tests := []struct {
+ name string
+ args args
+ want []string
+ wantErr bool
+ }{
+ {
+ name: "default",
+ args: args{
+ ctx: context.Background(),
+ request: &pb.GetRequest{
+ All: true,
+ },
+ },
+ want: []string{
+ pndID,
+ "test",
+ "test",
+ },
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ s := core{
+ UnimplementedCoreServer: pb.UnimplementedCoreServer{},
+ }
+ resp, err := s.Get(tt.args.ctx, tt.args.request)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("core.Get() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+
+ got := []string{
+ resp.Pnd[0].Id,
+ resp.Pnd[0].Name,
+ resp.Pnd[0].Description,
+ }
+ if !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("core.Get() = %v, want %v", got, tt.want)
+ }
+ })
+ }
+}
diff --git a/northbound/server/nbi.go b/northbound/server/nbi.go
new file mode 100644
index 0000000000000000000000000000000000000000..4e5ebd77344c58a3a883163ece457a3446a66635
--- /dev/null
+++ b/northbound/server/nbi.go
@@ -0,0 +1,23 @@
+package server
+
+import (
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+)
+
+var pndc *nucleus.PndStore
+
+// NewNBI receives a PndStore and returns a new gRPC *NorthboundInterface
+func NewNBI(pnds *nucleus.PndStore) *NorthboundInterface {
+ pndc = pnds
+ return &NorthboundInterface{
+ Pnd: &pnd{},
+ Core: &core{},
+ }
+}
+
+// NorthboundInterface is the representation of the
+// gRPC services used provided.
+type NorthboundInterface struct {
+ Pnd *pnd
+ Core *core
+}
diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
new file mode 100644
index 0000000000000000000000000000000000000000..d74119c207f9e4a6056096c5efdd4db15ba9c7c3
--- /dev/null
+++ b/northbound/server/pnd.go
@@ -0,0 +1,344 @@
+package server
+
+import (
+ "context"
+ "reflect"
+ "time"
+
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ "github.com/google/uuid"
+ "github.com/openconfig/ygot/ygot"
+)
+
+type pnd struct {
+ ppb.UnimplementedPndServer
+}
+
+func (p pnd) Get(ctx context.Context, request *ppb.GetRequest) (*ppb.GetResponse, error) {
+ pid, err := uuid.Parse(request.Pid)
+ if err != nil {
+ return nil, err
+ }
+ switch req := request.Request.(type) {
+ case *ppb.GetRequest_Pnd:
+ return handleGetPnd(pid)
+ case *ppb.GetRequest_Ond:
+ return handleGetOnd(pid, req)
+ case *ppb.GetRequest_Sbi:
+ return handleGetSbi(pid, req)
+ case *ppb.GetRequest_Change:
+ return handleGetChange(pid, req)
+ default:
+ return nil, errors.ErrOperationNotSupported{Op: reflect.TypeOf(request.Request)}
+ }
+}
+
+func handleGetPnd(pid uuid.UUID) (*ppb.GetResponse, error) {
+ pnd, err := pndc.Get(pid)
+ if err != nil {
+ return nil, err
+ }
+ onds, err := fillOnds(pnd, true)
+ if err != nil {
+ return nil, err
+ }
+ sbis, err := fillSbis(pnd, true)
+ if err != nil {
+ return nil, err
+ }
+ changes, err := fillChanges(pnd, true)
+ if err != nil {
+ return nil, err
+ }
+
+ return &ppb.GetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Pnd: &ppb.PrincipalNetworkDomain{
+ Id: pnd.ID().String(),
+ Name: pnd.GetName(),
+ Description: pnd.GetDescription(),
+ Ond: onds,
+ Sbi: sbis,
+ Change: changes,
+ },
+ }, nil
+}
+
+func handleGetSbi(pid uuid.UUID, req *ppb.GetRequest_Sbi) (*ppb.GetResponse, error) {
+ pnd, err := pndc.Get(pid)
+ if err != nil {
+ return nil, err
+ }
+ sbis, err := fillSbis(pnd, req.Sbi.GetAll(), req.Sbi.Sid...)
+ if err != nil {
+ return nil, err
+ }
+ return &ppb.GetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Sbi: sbis,
+ }, nil
+}
+
+func stringToUUID(sid []string) ([]uuid.UUID, error) {
+ UUIDs := make([]uuid.UUID, len(sid))
+ for i, id := range sid {
+ parsed, err := uuid.Parse(id)
+ if err != nil {
+ return nil, err
+ }
+ UUIDs[i] = parsed
+ }
+ return UUIDs, nil
+}
+
+func handleGetOnd(pid uuid.UUID, req *ppb.GetRequest_Ond) (*ppb.GetResponse, error) {
+ pnd, err := pndc.Get(pid)
+ if err != nil {
+ return nil, err
+ }
+ onds, err := fillOnds(pnd, req.Ond.All, req.Ond.Did...)
+ if err != nil {
+ return nil, err
+ }
+ return &ppb.GetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Ond: onds,
+ }, nil
+}
+
+func handleGetChange(pid uuid.UUID, req *ppb.GetRequest_Change) (*ppb.GetResponse, error) {
+ pnd, err := pndc.Get(pid)
+ if err != nil {
+ return nil, err
+ }
+ changes, err := fillChanges(pnd, req.Change.All, req.Change.Cuid...)
+ if err != nil {
+ return nil, err
+ }
+ return &ppb.GetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Change: changes,
+ }, nil
+}
+
+func fillSbis(pnd nucleus.PrincipalNetworkDomain, all bool, sid ...string) ([]*spb.SouthboundInterface, error) {
+ var sbiList []uuid.UUID
+
+ sbiStore := pnd.GetSBIs().(*nucleus.SbiStore)
+ switch all {
+ case true:
+ sbiList = sbiStore.UUIDs()
+ default:
+ var err error
+ if len(sid) == 0 {
+ return nil, &errors.ErrInvalidParameters{
+ Func: fillSbis,
+ Param: "length of 'sid' cannot be '0' when 'all' is set to 'false'",
+ }
+ }
+ sbiList, err = stringToUUID(sid)
+ if err != nil {
+ return nil, err
+ }
+ }
+ sbis := make([]*spb.SouthboundInterface, len(sbiList))
+ for i, id := range sbiList {
+ sbi, err := sbiStore.Get(id)
+ if err != nil {
+ return nil, err
+ }
+ sbis[i] = &spb.SouthboundInterface{
+ Id: id.String(),
+ Type: sbi.Type(),
+ }
+ }
+ return sbis, nil
+}
+
+func fillOnds(pnd nucleus.PrincipalNetworkDomain, all bool, did ...string) ([]*ppb.OrchestratedNetworkingDevice, error) {
+ var ondList []uuid.UUID
+
+ switch all {
+ case true:
+ ondList = pnd.Devices()
+ default:
+ var err error
+ if len(did) == 0 {
+ return nil, &errors.ErrInvalidParameters{
+ Func: fillOnds,
+ Param: "length of 'did' cannot be '0' when 'all' is set to 'false'",
+ }
+ }
+ ondList, err = stringToUUID(did)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ onds := make([]*ppb.OrchestratedNetworkingDevice, len(ondList))
+ for i, id := range ondList {
+ d, err := pnd.GetDevice(id.String())
+ if err != nil {
+ return nil, err
+ }
+ cfg := ygot.GNMINotificationsConfig{}
+ dev, err := ygot.TogNMINotifications(d.(*nucleus.Device).GoStruct, time.Now().UnixNano(), cfg)
+ if err != nil {
+ return nil, err
+ }
+ onds[i] = &ppb.OrchestratedNetworkingDevice{
+ Id: id.String(),
+ Name: "",
+ Device: dev,
+ }
+ }
+ return onds, nil
+}
+
+func fillChanges(pnd nucleus.PrincipalNetworkDomain, all bool, cuid ...string) ([]*ppb.Change, error) {
+ var changeList []uuid.UUID
+
+ switch all {
+ case true:
+ changeList = pnd.PendingChanges()
+ changeList = append(changeList, pnd.CommittedChanges()...)
+ default:
+ var err error
+ if len(cuid) == 0 {
+ return nil, &errors.ErrInvalidParameters{
+ Func: fillOnds,
+ Param: "length of 'did' cannot be '0' when 'all' is set to 'false'",
+ }
+ }
+ changeList, err = stringToUUID(cuid)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ changes := make([]*ppb.Change, len(changeList))
+ for i, ch := range changeList {
+ c, err := pnd.GetChange(ch)
+ if err != nil {
+ return nil, err
+ }
+ change, ok := c.(*nucleus.Change)
+ if !ok {
+ return nil, &errors.ErrInvalidTypeAssertion{
+ Value: change,
+ Type: reflect.TypeOf(&nucleus.Change{}),
+ }
+ }
+
+ changes[i] = &ppb.Change{
+ Id: ch.String(),
+ Age: change.Age().Microseconds(),
+ State: change.State(),
+ }
+ }
+ return changes, nil
+}
+
+func (p pnd) Set(ctx context.Context, request *ppb.SetRequest) (*ppb.SetResponse, error) {
+ pid, err := uuid.Parse(request.Pid)
+ if err != nil {
+ return nil, err
+ }
+
+ pnd, err := pndc.Get(pid)
+ if err != nil {
+ return nil, err
+ }
+
+ ondResp, err := handleSetOnd(pnd, request.Ond)
+ if err != nil {
+ return nil, err
+ }
+ changeResp, err := handleSetChange(pnd, request.Change)
+ if err != nil {
+ return nil, err
+ }
+ changeRequestResp, err := handleChangeRequest(pnd, request.ChangeRequest)
+ if err != nil {
+ return nil, err
+ }
+ return &ppb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: ppb.SetResponse_OK,
+ Responses: []*ppb.SetResponse{
+ ondResp,
+ changeResp,
+ changeRequestResp,
+ },
+ }, nil
+}
+
+func handleSetOnd(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetOnd) (*ppb.SetResponse, error) {
+ for _, r := range req {
+ sid, err := uuid.Parse(r.Sbi.Id)
+ if err != nil {
+ return nil, err
+ }
+ if err := pnd.AddDevice(r.DeviceName, r.TransportOption, sid); err != nil {
+ return nil, err
+ }
+ }
+ return &ppb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: ppb.SetResponse_OK,
+ }, nil
+}
+
+func handleSetSbi(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetSbi) (*ppb.SetResponse, error) {
+ return &ppb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: ppb.SetResponse_ERROR,
+ }, nil
+}
+
+func handleSetChange(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetChange) (*ppb.SetResponse, error) {
+ for _, r := range req {
+ cuid, err := uuid.Parse(r.Cuid)
+ if err != nil {
+ return nil, err
+ }
+ switch r.Op {
+ case ppb.SetChange_COMMIT:
+ if err := pnd.Commit(cuid); err != nil {
+ return nil, err
+ }
+ case ppb.SetChange_CONFIRM:
+ if err := pnd.Confirm(cuid); err != nil {
+ return nil, err
+ }
+ default:
+ return nil, &errors.ErrInvalidParameters{
+ Func: handleSetChange,
+ Param: r.Op,
+ }
+ }
+ }
+ return &ppb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: ppb.SetResponse_OK,
+ }, nil
+}
+
+func handleChangeRequest(pnd nucleus.PrincipalNetworkDomain, req []*ppb.ChangeRequest) (*ppb.SetResponse, error) {
+ for _, r := range req {
+ did, err := uuid.Parse(r.Id)
+ if err != nil {
+ return nil, err
+ }
+ if err := pnd.ChangeOND(did, r.ApiOp, r.Path, r.Value); err != nil {
+ return nil, err
+ }
+ }
+ return &ppb.SetResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: ppb.SetResponse_OK,
+ }, nil
+}
diff --git a/northbound/server/pnd_test.go b/northbound/server/pnd_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..3ddee46005add6904f0990794c78c8941a0bfba0
--- /dev/null
+++ b/northbound/server/pnd_test.go
@@ -0,0 +1,264 @@
+package server
+
+import (
+ "context"
+ "os"
+ "reflect"
+ "testing"
+
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ "code.fbi.h-da.de/cocsn/gosdn/mocks"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "github.com/google/uuid"
+ log "github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/mock"
+)
+
+const pndID = "2043519e-46d1-4963-9a8e-d99007e104b8"
+const pendingChangeID = "0992d600-f7d4-4906-9559-409b04d59a5f"
+const committedChangeID = "804787d6-e5a8-4dba-a1e6-e73f96b0119e"
+const sbiID = "f6fd4b35-f039-4111-9156-5e4501bb8a5a"
+const ondID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
+
+var hostname = "manfred"
+var pndUUID uuid.UUID
+var pendingChangeUUID uuid.UUID
+var committedChangeUUID uuid.UUID
+var deviceUUID uuid.UUID
+var mockPnd *mocks.PrincipalNetworkDomain
+var mockDevice *nucleus.Device
+var sbiStore *nucleus.SbiStore
+
+func TestMain(m *testing.M) {
+ log.SetReportCaller(true)
+ var err error
+ pndUUID, err = uuid.Parse(pndID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ pendingChangeUUID, err = uuid.Parse(pendingChangeID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ committedChangeUUID, err = uuid.Parse(committedChangeID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ deviceUUID, err = uuid.Parse(ondID)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ mockDevice = &nucleus.Device{
+ GoStruct: &openconfig.Device{
+ System: &openconfig.OpenconfigSystem_System{
+ Config: &openconfig.OpenconfigSystem_System_Config{
+ Hostname: &hostname,
+ },
+ },
+ },
+ UUID: deviceUUID,
+ SBI: nucleus.NewSBI(spb.Type_OPENCONFIG),
+ Transport: &mocks.Transport{},
+ Name: hostname,
+ }
+
+ sbiStore = nucleus.NewSbiStore()
+ if err := sbiStore.Add(mockDevice.SBI); err != nil {
+ log.Fatal(err)
+ }
+
+ mockPnd = &mocks.PrincipalNetworkDomain{}
+ mockPnd.On("ID").Return(pndUUID)
+ mockPnd.On("GetName").Return("test")
+ mockPnd.On("GetDescription").Return("test")
+ mockPnd.On("GetSBIs").Return(sbiStore)
+ mockPnd.On("Devices").Return([]uuid.UUID{deviceUUID})
+ mockPnd.On("PendingChanges").Return([]uuid.UUID{pendingChangeUUID})
+ mockPnd.On("CommittedChanges").Return([]uuid.UUID{committedChangeUUID})
+ mockPnd.On("GetChange", mock.Anything).Return(&nucleus.Change{}, nil)
+ mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+ mockPnd.On("GetDevice", mock.Anything).Return(mockDevice, nil)
+ mockPnd.On("Commit", mock.Anything).Return(nil)
+ mockPnd.On("Confirm", mock.Anything).Return(nil)
+ mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+ pndc = nucleus.NewPndStore()
+ if err := pndc.Add(mockPnd); err != nil {
+ log.Fatal(err)
+ }
+
+ os.Exit(m.Run())
+}
+
+func Test_pnd_Get(t *testing.T) {
+ type args struct {
+ ctx context.Context
+ request *ppb.GetRequest
+ }
+ tests := []struct {
+ name string
+ args args
+ want []string
+ wantErr bool
+ }{
+ {
+ name: "get pnd",
+ args: args{
+ ctx: context.Background(),
+ request: &ppb.GetRequest{
+ Request: &ppb.GetRequest_Pnd{
+ Pnd: &ppb.GetPnd{},
+ },
+ Pid: pndID,
+ },
+ },
+ want: []string{
+ pndID,
+ ondID,
+ mockDevice.SBI.ID().String(),
+ pendingChangeID,
+ committedChangeID,
+ },
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ p := pnd{
+ UnimplementedPndServer: ppb.UnimplementedPndServer{},
+ }
+ resp, err := p.Get(tt.args.ctx, tt.args.request)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("Get() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+
+ got := []string{
+ resp.Pnd.Id,
+ resp.Pnd.Ond[0].Id,
+ resp.Pnd.Sbi[0].Id,
+ resp.Pnd.Change[0].Id,
+ resp.Pnd.Change[1].Id,
+ }
+ if !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("Get() got = %v, want %v", got, tt.want)
+ }
+ })
+ }
+}
+
+func Test_pnd_Set(t *testing.T) {
+ type args struct {
+ ctx context.Context
+ request *ppb.SetRequest
+ }
+ tests := []struct {
+ name string
+ args args
+ want ppb.SetResponseStatus
+ wantErr bool
+ }{
+ {
+ name: "set ond",
+ args: args{
+ ctx: context.Background(),
+ request: &ppb.SetRequest{
+ Ond: []*ppb.SetOnd{
+ {
+ Sbi: &spb.SouthboundInterface{
+ Id: sbiID,
+ Type: spb.Type_OPENCONFIG,
+ },
+ DeviceName: hostname,
+ TransportOption: &transport.TransportOption{
+ Address: "test",
+ Username: "test",
+ Password: "test",
+ TransportOption: &transport.TransportOption_GnmiTransportOption{},
+ },
+ },
+ },
+ Pid: pndID,
+ },
+ },
+ want: ppb.SetResponse_OK,
+ },
+ {
+ name: "set change",
+ args: args{
+ ctx: context.Background(),
+ request: &ppb.SetRequest{
+ Pid: pndID,
+ Change: []*ppb.SetChange{
+ {
+ Cuid: pendingChangeID,
+ Op: ppb.SetChange_COMMIT,
+ },
+ {
+ Cuid: committedChangeID,
+ Op: ppb.SetChange_CONFIRM,
+ },
+ },
+ },
+ },
+ want: ppb.SetResponse_OK,
+ },
+ {
+ name: "change request",
+ args: args{
+ ctx: context.Background(),
+ request: &ppb.SetRequest{
+ Pid: pndID,
+ ChangeRequest: []*ppb.ChangeRequest{
+ {
+ Id: ondID,
+ Path: "/system/config/hostname",
+ Value: "herbert",
+ ApiOp: ppb.ApiOperation_UPDATE,
+ },
+ {
+ Id: ondID,
+ Path: "/system/config/hostname",
+ Value: "fridolin",
+ ApiOp: ppb.ApiOperation_REPLACE,
+ },
+ {
+ Id: ondID,
+ Path: "/system/config/hostname",
+ ApiOp: ppb.ApiOperation_DELETE,
+ },
+ },
+ },
+ },
+ want: ppb.SetResponse_OK,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ p := pnd{
+ UnimplementedPndServer: ppb.UnimplementedPndServer{},
+ }
+ resp, err := p.Set(tt.args.ctx, tt.args.request)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("Set() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+ got := resp.Status
+ if !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("Set() got = %v, want %v", got, tt.want)
+ }
+ for _, r := range resp.Responses {
+ got = r.Status
+ if !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("Set() got = %v, want %v", got, tt.want)
+ }
+ }
+ })
+ }
+}
diff --git a/nucleus/change.go b/nucleus/change.go
index a8743b1abfc63efbc5c3cbcb7c3e8dd7dcc2f628..b1a3242717c4736289dcb8ec78e6c9453bf06f4a 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -6,6 +6,8 @@ import (
"sync"
"time"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
log "github.com/sirupsen/logrus"
@@ -46,7 +48,7 @@ func NewChange(device uuid.UUID, currentState ygot.GoStruct, change ygot.GoStruc
confirmed: false,
callback: callback,
errChan: errChan,
- Done: make(chan int),
+ done: make(chan int),
}
}
@@ -67,8 +69,7 @@ type Change struct {
lock sync.RWMutex
cancelFunc context.CancelFunc
errChan chan error
- // TODO: Move nucleus.pndImplementation and Change to same package and unexport
- Done chan int
+ done chan int
}
// ID returns the Change's UUID
@@ -124,11 +125,27 @@ func (c *Change) Confirm() error {
c.confirmed = true
c.cancelFunc()
close(c.errChan)
- c.Done <- 0
- close(c.Done)
+ c.done <- 0
+ close(c.done)
log.WithFields(log.Fields{
"change uuid": c.cuid,
"device uuid": c.duid,
}).Info("change confirmed")
return nil
}
+
+// Age returns the passed time since the Change was created
+func (c *Change) Age() time.Duration {
+ return time.Since(c.timestamp)
+}
+
+// State returns the changes's state.
+func (c *Change) State() ppb.Change_State {
+ if !c.committed {
+ return ppb.Change_PENDING
+ } else if !c.confirmed {
+ return ppb.Change_COMMITTED
+ } else {
+ return ppb.Change_CONFIRMED
+ }
+}
diff --git a/nucleus/change_test.go b/nucleus/change_test.go
index b58598b33356c9ce8fae3e032afb78c5b1441f96..eca18fa34152fddb2125737a7f6961c7e50e8f8a 100644
--- a/nucleus/change_test.go
+++ b/nucleus/change_test.go
@@ -142,7 +142,7 @@ func TestChange_Commit(t *testing.T) {
},
lock: sync.RWMutex{},
errChan: make(chan error),
- Done: make(chan int),
+ done: make(chan int),
}
go func() {
time.Sleep(time.Millisecond * 10)
@@ -207,7 +207,7 @@ func TestChange_Confirm(t *testing.T) {
cancelFunc: cancel,
lock: sync.RWMutex{},
errChan: make(chan error),
- Done: make(chan int, 1),
+ done: make(chan int, 1),
}
if err := c.Confirm(); (err != nil) != tt.wantErr {
t.Errorf("Confirm() error = %v, wantErr %v", err, tt.wantErr)
diff --git a/nucleus/device.go b/nucleus/device.go
index ccfa738f62d99f6cb132ee25222726131e573e99..18c36a27d71f1412aadc18e0d0c30bcd8c014637 100644
--- a/nucleus/device.go
+++ b/nucleus/device.go
@@ -1,7 +1,7 @@
package nucleus
import (
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"github.com/docker/docker/pkg/namesgenerator"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
@@ -13,7 +13,7 @@ type Device struct {
// UUID represents the Devices UUID
UUID uuid.UUID
- // Device inherits properties of ygot.GoStruct
+ // Device embeds a ygot.GoStruct containing the device details
ygot.GoStruct
// SBI is the device's southbound interface implementation
@@ -27,24 +27,16 @@ type Device struct {
}
// NewDevice creates a Device
-func NewDevice(sbi SouthboundInterface, opts TransportOptions, name string) (*Device, error) {
- var transport Transport
- var err error
+func NewDevice(name string, opt *tpb.TransportOption, sbi SouthboundInterface) (*Device, error) {
+ transport, err := NewTransport(opt, sbi)
+ if err != nil {
+ return nil, err
+ }
if name == "" {
name = namesgenerator.GetRandomName(0)
}
- switch opts := opts.(type) {
- case *GnmiTransportOptions:
- transport, err = NewGnmiTransport(opts)
- if err != nil {
- return nil, err
- }
- default:
- return nil, &errors.ErrInvalidTransportOptions{Opt: opts}
-
- }
return &Device{
UUID: uuid.New(),
GoStruct: sbi.Schema().Root,
diff --git a/nucleus/device_test.go b/nucleus/device_test.go
index 1b4a6fd0c7f5a0174adda177073e7a22cdb1a6d4..d5d38cab38f78f219e16470d0cc198613cf35d37 100644
--- a/nucleus/device_test.go
+++ b/nucleus/device_test.go
@@ -4,7 +4,8 @@ import (
"reflect"
"testing"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
"code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
@@ -51,59 +52,68 @@ func TestNewDevice(t *testing.T) {
sbi := &OpenConfig{}
type args struct {
sbi SouthboundInterface
- opts TransportOptions
+ opts *tpb.TransportOption
name string
}
tests := []struct {
name string
args args
- want *Device
wantErr bool
}{
{
name: "default",
args: args{
sbi: sbi,
- opts: &GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "test:///",
- Username: "test",
- Password: "test",
+ opts: &tpb.TransportOption{
+ Address: "test:///",
+ Username: "test",
+ Password: "test",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ Compression: "",
+ GrpcDialOptions: nil,
+ Token: "",
+ Encoding: 0,
+ },
},
},
name: "MyDevice",
},
- want: &Device{
- GoStruct: &openconfig.Device{},
- SBI: sbi,
- UUID: uuid.New(),
- Transport: &Gnmi{
- Options: &GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "test:///",
- Username: "test",
- Password: "test",
- },
- },
+ },
+ {
+ name: "invalid options",
+ args: args{
+ sbi: sbi,
+ opts: &tpb.TransportOption{
+ Address: "test:///",
+ Username: "test",
+ Password: "test",
},
- Name: "MyDevice",
+ name: "MyDevice",
},
+ wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := NewDevice(tt.args.sbi, tt.args.opts, tt.args.name)
- if err != nil {
- t.Error(err)
- }
- tt.want.Transport.(*Gnmi).client = got.Transport.(*Gnmi).client
- tt.want.UUID = got.ID()
+ resp, err := NewDevice(tt.args.name, tt.args.opts, tt.args.sbi)
if (err != nil) != tt.wantErr {
t.Errorf("NewDevice() error = %v, wantErr %v", err, tt.wantErr)
return
}
- if !reflect.DeepEqual(got, tt.want) {
- t.Errorf("NewDevice() got = %v, want %v", got, tt.want)
+ if resp != nil {
+ if reflect.TypeOf(resp.GoStruct) != reflect.TypeOf(&openconfig.Device{}) {
+ t.Error("NewDevice() returned invalid GoStruct")
+ }
+ if reflect.TypeOf(resp.Transport) != reflect.TypeOf(&Gnmi{}) {
+ t.Error("NewDevice() returned invalid transport")
+ }
+ if reflect.TypeOf(resp.SBI) != reflect.TypeOf(&OpenConfig{}) {
+ t.Error("NewDevice() returned invalid GoStruct")
+ }
+ if resp.Name != "MyDevice" {
+ t.Error("NewDevice() returned wrong name")
+ }
}
})
}
diff --git a/nucleus/gnmi_transport.go b/nucleus/gnmi_transport.go
index d5f7c369d40eb384de23049ea771e474d7d0a7fe..1834ce7e13e9acd6e5bf2ea7871b960f01bf3d98 100644
--- a/nucleus/gnmi_transport.go
+++ b/nucleus/gnmi_transport.go
@@ -4,6 +4,10 @@ import (
"context"
"reflect"
+ "google.golang.org/grpc"
+
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
@@ -14,12 +18,14 @@ import (
"github.com/openconfig/ygot/ygot"
"github.com/openconfig/ygot/ytypes"
log "github.com/sirupsen/logrus"
+
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
)
-var opmap = map[types.Operation]string{
- types.TransportUpdate: "update",
- types.TransportReplace: "replace",
- types.TransportDelete: "delete",
+var opmap = map[ppb.ApiOperation]string{
+ ppb.ApiOperation_UPDATE: "update",
+ ppb.ApiOperation_REPLACE: "replace",
+ ppb.ApiOperation_DELETE: "delete",
}
// Gnmi implements the Transport interface and provides an SBI with the
@@ -28,38 +34,41 @@ type Gnmi struct {
SetNode func(schema *yang.Entry, root interface{}, path *gpb.Path, val interface{}, opts ...ytypes.SetNodeOpt) error
RespChan chan *gpb.SubscribeResponse
Unmarshal func([]byte, []string, interface{}, ...ytypes.UnmarshalOpt) error
- Options *GnmiTransportOptions
+ Options *tpb.TransportOption
client gpb.GNMIClient
+ config *gnmi.Config
}
// NewGnmiTransport takes a struct of GnmiTransportOptions and returns a Gnmi
// transport based on the values of it.
-func NewGnmiTransport(opts *GnmiTransportOptions) (*Gnmi, error) {
- c, err := gnmi.Dial(&opts.Config)
+func NewGnmiTransport(opts *tpb.TransportOption, sbi SouthboundInterface) (*Gnmi, error) {
+ gnmiConfig := &gnmi.Config{
+ Addr: opts.Address,
+ Password: opts.Password,
+ Username: opts.Username,
+ TLS: opts.Tls,
+ Compression: opts.GetGnmiTransportOption().Compression,
+ }
+ c, err := gnmi.Dial(gnmiConfig)
if err != nil {
return nil, err
}
log.WithFields(log.Fields{
- "target": opts.Addr,
- "tls": opts.TLS,
- "encoding": opts.Encoding,
+ "target": opts.Address,
+ "tls": opts.Tls,
+ "encoding": opts.GetGnmiTransportOption().Encoding,
}).Info("building new gNMI transport")
return &Gnmi{
- SetNode: opts.SetNode,
- RespChan: opts.RespChan,
+ SetNode: sbi.SetNode(),
+ RespChan: make(chan *gpb.SubscribeResponse),
Options: opts,
client: c,
+ config: gnmiConfig,
}, nil
}
-//SetOptions sets Gnmi Options
-func (g *Gnmi) SetOptions(to TransportOptions) {
- g.Options = to.(*GnmiTransportOptions)
-}
-
-//GetOptions returns the Gnmi options
-func (g *Gnmi) GetOptions() interface{} {
- return g.Options
+func parseDialOptions(opts map[string]string) []grpc.DialOption {
+ return nil
}
// Get takes a slice of gnmi paths, splits them and calls get for each one of them.
@@ -79,7 +88,7 @@ func (g *Gnmi) Set(ctx context.Context, args ...interface{}) error {
}
if len(args) == 0 {
return &errors.ErrInvalidParameters{
- Func: "gnmi.Set()",
+ Func: "nucleus.Set()",
Param: "no parameters provided",
}
}
@@ -103,13 +112,13 @@ func (g *Gnmi) Set(ctx context.Context, args ...interface{}) error {
}
} else if attrs == nil || len(attrs) == 0 {
return &errors.ErrInvalidParameters{
- Func: "gnmi.Set()",
+ Func: "nucleus.Set()",
Param: "no parameters provided",
}
}
opts = append(opts, &gnmi.Operation{
// Hardcoded TransportUpdate until multiple operations are supported
- Type: opmap[types.TransportUpdate],
+ Type: opmap[ppb.ApiOperation_UPDATE],
Origin: "",
Target: "",
Path: gnmi.SplitPath(attrs[0]),
@@ -126,21 +135,21 @@ func (g *Gnmi) Set(ctx context.Context, args ...interface{}) error {
case *gnmi.Operation:
op := p.(*gnmi.Operation)
if op.Target == "" {
- op.Target = g.Options.Addr
+ op.Target = g.Options.Address
}
ops = append(ops, op)
case *gnmi_ext.Extension:
exts = append(exts, p.(*gnmi_ext.Extension))
default:
return &errors.ErrInvalidParameters{
- Func: "gnmi.Set()",
+ Func: "nucleus.Set()",
Param: "args contain invalid type",
}
}
}
if len(ops) == 0 {
return &errors.ErrInvalidParameters{
- Func: "gnmi.Set()",
+ Func: "nucleus.Set()",
Param: "no operations provided",
}
}
@@ -179,9 +188,9 @@ func (g *Gnmi) applyDiff(ctx context.Context, payload ...interface{}) error {
req := &gpb.SetRequest{}
if diff.Update != nil {
switch op {
- case types.TransportUpdate:
+ case ppb.ApiOperation_UPDATE:
req.Update = diff.Update
- case types.TransportReplace:
+ case ppb.ApiOperation_REPLACE:
req.Replace = diff.Update
default:
return &errors.ErrOperationNotSupported{}
@@ -238,10 +247,10 @@ func (g *Gnmi) ProcessResponse(resp interface{}, root interface{}, s *ytypes.Sch
// Capabilities calls GNMI capabilities
func (g *Gnmi) Capabilities(ctx context.Context) (interface{}, error) {
log.WithFields(log.Fields{
- "target": g.Options.Addr,
+ "target": g.Options.Address,
}).Info("sending gNMI capabilities request")
- ctx = gnmi.NewContext(ctx, &g.Options.Config)
- ctx = context.WithValue(ctx, types.CtxKeyConfig, &g.Options.Config) //nolint
+ ctx = gnmi.NewContext(ctx, g.config)
+ ctx = context.WithValue(ctx, types.CtxKeyConfig, g.config) //nolint
resp, err := g.client.Capabilities(ctx, &gpb.CapabilityRequest{})
if err != nil {
return nil, err
@@ -252,8 +261,8 @@ func (g *Gnmi) Capabilities(ctx context.Context) (interface{}, error) {
// get calls GNMI get
func (g *Gnmi) get(ctx context.Context, paths [][]string, origin string) (interface{}, error) {
- ctx = gnmi.NewContext(ctx, &g.Options.Config)
- ctx = context.WithValue(ctx, types.CtxKeyConfig, &g.Options.Config) //nolint
+ ctx = gnmi.NewContext(ctx, g.config)
+ ctx = context.WithValue(ctx, types.CtxKeyConfig, g.config) //nolint
req, err := gnmi.NewGetRequest(ctx, paths, origin)
if err != nil {
return nil, err
@@ -268,7 +277,7 @@ func (g *Gnmi) getWithRequest(ctx context.Context, req *gpb.GetRequest) (interfa
return nil, &errors.ErrNil{}
}
log.WithFields(log.Fields{
- "target": g.Options.Addr,
+ "target": g.Options.Address,
"path": req.Path,
}).Info("sending gNMI get request")
@@ -282,7 +291,7 @@ func (g *Gnmi) getWithRequest(ctx context.Context, req *gpb.GetRequest) (interfa
// Set calls GNMI set
func (g *Gnmi) set(ctx context.Context, setOps []*gnmi.Operation,
exts ...*gnmi_ext.Extension) (*gpb.SetResponse, error) {
- ctx = gnmi.NewContext(ctx, &g.Options.Config)
+ ctx = gnmi.NewContext(ctx, g.config)
targets := make([]string, len(setOps))
paths := make([][]string, len(setOps))
values := make([]string, len(setOps))
@@ -301,7 +310,7 @@ func (g *Gnmi) set(ctx context.Context, setOps []*gnmi.Operation,
// Subscribe calls GNMI subscribe
func (g *Gnmi) subscribe(ctx context.Context) error {
- ctx = gnmi.NewContext(ctx, &g.Options.Config)
+ ctx = gnmi.NewContext(ctx, g.config)
opts, ok := ctx.Value(types.CtxKeyOpts).(*gnmi.SubscribeOptions)
if !ok {
return &errors.ErrInvalidTypeAssertion{
@@ -332,38 +341,3 @@ func (g *Gnmi) subscribe(ctx context.Context) error {
func (g *Gnmi) Close() error {
return nil
}
-
-// GnmiTransportOptions implements the TransportOptions interface.
-// GnmiTransportOptions contains all needed information to setup a Gnmi
-// transport and therefore inherits gnmi.Config.
-type GnmiTransportOptions struct {
- // all needed gnmi transport parameters
- gnmi.Config
-
- SetNode func(schema *yang.Entry, root interface{}, path *gpb.Path,
- val interface{}, opts ...ytypes.SetNodeOpt) error
- Unmarshal func([]byte, []string, interface{}, ...ytypes.UnmarshalOpt) error
- RespChan chan *gpb.SubscribeResponse
-}
-
-// GetAddress returns the address used by the transport to connect to a
-// gRPC endpoint.
-func (gto *GnmiTransportOptions) GetAddress() string {
- return gto.Config.Addr
-}
-
-// GetUsername returns the username used by the transport to connect to a
-// gRPC endpoint.
-func (gto *GnmiTransportOptions) GetUsername() string {
- return gto.Config.Username
-}
-
-// GetPassword returns the password used by the transport to connect to a
-// gRPC endpoint.
-func (gto *GnmiTransportOptions) GetPassword() string {
- return gto.Config.Password
-}
-
-// IsTransportOption is needed to fulfill the requirements of the
-// TransportOptions interface. It does not need any further implementation.
-func (gto *GnmiTransportOptions) IsTransportOption() {}
diff --git a/nucleus/gnmi_transport_test.go b/nucleus/gnmi_transport_test.go
index 17389b1bf30d9a3e8579253801e8fbe5039408f7..d4d89bd10b886ca4481c02dc75256dca1ab01a35 100644
--- a/nucleus/gnmi_transport_test.go
+++ b/nucleus/gnmi_transport_test.go
@@ -6,6 +6,9 @@ import (
"reflect"
"testing"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"code.fbi.h-da.de/cocsn/gosdn/mocks"
"code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
@@ -99,7 +102,6 @@ func TestGnmi_Close(t *testing.T) {
type fields struct {
SetNode func(schema *yang.Entry, root interface{}, path *gpb.Path, val interface{}, opts ...ytypes.SetNodeOpt) error
RespChan chan *gpb.SubscribeResponse
- config *gnmi.Config
}
tests := []struct {
name string
@@ -191,7 +193,7 @@ func TestGnmi_Get(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if tt.args.runEndpoint {
- startGnmiTarget <- tt.fields.transport.Options.Addr
+ startGnmiTarget <- tt.fields.transport.config.Addr
}
got, err := tt.fields.transport.Get(context.Background(), tt.args.params...)
if (err != nil) != tt.wantErr {
@@ -270,8 +272,7 @@ func TestGnmi_Set(t *testing.T) {
transport *Gnmi
}
type args struct {
- params []interface{}
- runEndpoint bool
+ params []interface{}
}
tests := []struct {
name string
@@ -303,7 +304,6 @@ func TestGnmi_Subscribe(t *testing.T) {
type fields struct {
SetNode func(schema *yang.Entry, root interface{}, path *gpb.Path, val interface{}, opts ...ytypes.SetNodeOpt) error
RespChan chan *gpb.SubscribeResponse
- config *gnmi.Config
}
type args struct {
ctx context.Context
@@ -331,7 +331,6 @@ func TestGnmi_Type(t *testing.T) {
type fields struct {
SetNode func(schema *yang.Entry, root interface{}, path *gpb.Path, val interface{}, opts ...ytypes.SetNodeOpt) error
RespChan chan *gpb.SubscribeResponse
- config *gnmi.Config
}
tests := []struct {
name string
@@ -430,8 +429,10 @@ func TestGnmi_getWithRequest(t *testing.T) {
}
func TestNewGnmiTransport(t *testing.T) {
+ // TODO: revise test
+ t.Skip("deep equal for gnmi.Config broken")
type args struct {
- opts *GnmiTransportOptions
+ opts *tpb.TransportOption
}
tests := []struct {
name string
@@ -441,42 +442,70 @@ func TestNewGnmiTransport(t *testing.T) {
}{
{
name: "default",
- args: args{opts: &GnmiTransportOptions{
- Config: gnmi.Config{
+ args: args{
+ opts: &tpb.TransportOption{
+ Address: "localhost:13371",
Username: "test",
Password: "test",
- Addr: "localhost:13371",
- Encoding: gpb.Encoding_PROTO,
- },
- }},
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
+ },
+ }},
want: &Gnmi{
- Options: &GnmiTransportOptions{
- Config: gnmi.Config{
- Username: "test",
- Password: "test",
- Addr: "localhost:13371",
- Encoding: gpb.Encoding_PROTO,
+ Options: &tpb.TransportOption{
+ Address: "localhost:13371",
+ Username: "test",
+ Password: "test",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
},
},
client: nil,
+ config: &gnmi.Config{
+ Addr: "localhost:13371",
+ Password: "test",
+ Username: "test",
+ },
},
wantErr: false,
},
{
- name: "unsupported compression",
- args: args{opts: &GnmiTransportOptions{Config: gnmi.Config{Compression: "brotli"}}},
+ name: "unsupported compression",
+ args: args{
+ opts: &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ Compression: "brotli",
+ },
+ }}},
want: nil,
wantErr: true,
},
{
- name: "certificate error no key file",
- args: args{opts: &GnmiTransportOptions{Config: gnmi.Config{TLS: true, CertFile: "invalid", KeyFile: ""}}},
+ name: "certificate error no key file",
+ args: args{
+ opts: &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ GrpcDialOptions: map[string]string{
+ "cert-file": "invalid",
+ },
+ },
+ }}},
want: nil,
wantErr: true,
},
{
- name: "certificate error no ca file",
- args: args{opts: &GnmiTransportOptions{Config: gnmi.Config{TLS: true, CAFile: "invalid"}}},
+ name: "certificate error no ca file",
+ args: args{
+ opts: &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ GrpcDialOptions: map[string]string{
+ "ca-file": "invalid",
+ },
+ },
+ }}},
want: nil,
wantErr: true,
},
@@ -486,13 +515,17 @@ func TestNewGnmiTransport(t *testing.T) {
if tt.name == "default" {
startGnmiTarget <- gnmiConfig.Addr
}
- got, err := NewGnmiTransport(tt.args.opts)
+
+ got, err := NewGnmiTransport(tt.args.opts, NewSBI(spb.Type_OPENCONFIG))
if (err != nil) != tt.wantErr {
t.Errorf("NewGnmiTransport() error = %v, wantErr %v", err, tt.wantErr)
return
}
if tt.name == "default" && got != nil {
tt.want.client = got.client
+ tt.want.config = got.config
+ tt.want.SetNode = got.SetNode
+ tt.want.RespChan = got.RespChan
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("NewGnmiTransport() got = %v, want %v", got, tt.want)
diff --git a/nucleus/initialise_test.go b/nucleus/initialise_test.go
index dc60751e1f3a12d04fab39e4ae4e67d438202476..e412a631d0ea6f43169842a1b924a3db4f85ab62 100644
--- a/nucleus/initialise_test.go
+++ b/nucleus/initialise_test.go
@@ -5,6 +5,8 @@ import (
"os"
"testing"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"code.fbi.h-da.de/cocsn/gosdn/mocks"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
@@ -83,19 +85,18 @@ func mockTransport() Gnmi {
RespChan: make(chan *gpb.SubscribeResponse),
Options: newGnmiTransportOptions(),
client: &mocks.GNMIClient{},
+ config: gnmiConfig,
}
}
-func newGnmiTransportOptions() *GnmiTransportOptions {
- return &GnmiTransportOptions{
- Config: gnmi.Config{
- Username: "test",
- Password: "test",
- Addr: "localhost:13371",
- Encoding: gpb.Encoding_PROTO,
+func newGnmiTransportOptions() *tpb.TransportOption {
+ return &tpb.TransportOption{
+ Address: "localhost:13371",
+ Username: "test",
+ Password: "test",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
},
- SetNode: nil,
- RespChan: make(chan *gpb.SubscribeResponse),
}
}
diff --git a/nucleus/principalNetworkDomain.go b/nucleus/principalNetworkDomain.go
index 4c16117293b9b0eb38a48cf49ea39c5c13cdc688..f9bcd8e6c2f88a1ce1e08835dcf5f60ee50e976f 100644
--- a/nucleus/principalNetworkDomain.go
+++ b/nucleus/principalNetworkDomain.go
@@ -2,9 +2,11 @@ package nucleus
import (
"context"
+ "reflect"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"github.com/openconfig/ygot/ygot"
@@ -22,11 +24,11 @@ type PrincipalNetworkDomain interface {
Destroy() error
AddSbi(interface{}) error
RemoveSbi(uuid.UUID) error
- AddDevice(interface{}) error
- GetDevice(identifier string) (*Device, error)
+ AddDevice(name string, opts *tpb.TransportOption, sid uuid.UUID) error
+ GetDevice(identifier string) (interface{}, error)
RemoveDevice(uuid.UUID) error
Devices() []uuid.UUID
- ChangeOND(uuid uuid.UUID, operation interface{}, path string, value ...string) error
+ ChangeOND(uuid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) error
Request(uuid.UUID, string) error
RequestAll(string) error
GetName() string
@@ -35,8 +37,9 @@ type PrincipalNetworkDomain interface {
ContainsDevice(uuid.UUID) bool
GetSBIs() interface{}
ID() uuid.UUID
- Pending() []uuid.UUID
- Committed() []uuid.UUID
+ PendingChanges() []uuid.UUID
+ CommittedChanges() []uuid.UUID
+ GetChange(uuid.UUID, ...int) (interface{}, error)
Commit(uuid.UUID) error
Confirm(uuid.UUID) error
}
@@ -72,14 +75,54 @@ type pndImplementation struct {
errChans map[uuid.UUID]chan error
}
-func (pnd *pndImplementation) Pending() []uuid.UUID {
+func (pnd *pndImplementation) PendingChanges() []uuid.UUID {
return pnd.pendingChanges.UUIDs()
}
-func (pnd *pndImplementation) Committed() []uuid.UUID {
+func (pnd *pndImplementation) CommittedChanges() []uuid.UUID {
return pnd.committedChanges.UUIDs()
}
+func (pnd *pndImplementation) GetChange(cuid uuid.UUID, i ...int) (interface{}, error) {
+ var index int
+ if len(i) == 1 {
+ index = i[0]
+ } else if len(i) > 1 {
+ return nil, errors.ErrInvalidParameters{
+ Func: pnd.GetChange,
+ Param: "length of 'i' cannot be greater than '1'",
+ }
+ }
+ stores := []*ChangeStore{
+ &pnd.pendingChanges,
+ &pnd.committedChanges,
+ &pnd.confirmedChanges,
+ }
+ ch, err := stores[index].Get(cuid)
+ index++
+ if err != nil {
+ switch err.(type) {
+ case *errors.ErrNotFound:
+ c, err := pnd.GetChange(cuid, index)
+ if err != nil {
+ return nil, err
+ }
+ var ok bool
+ ch, ok = c.(*Change)
+ if !ok {
+ return nil, &errors.ErrInvalidTypeAssertion{
+ Value: c,
+ Type: reflect.TypeOf(&Change{}),
+ }
+ }
+
+ default:
+ return nil, err
+ }
+ }
+ return ch, err
+}
+
func (pnd *pndImplementation) Commit(u uuid.UUID) error {
change, err := pnd.pendingChanges.Get(u)
if err != nil {
@@ -95,7 +138,7 @@ func (pnd *pndImplementation) Commit(u uuid.UUID) error {
if err != nil {
handleRollbackError(change.ID(), err)
}
- case <-change.Done:
+ case <-change.done:
}
}
}()
@@ -172,19 +215,21 @@ func (pnd *pndImplementation) RemoveSbi(id uuid.UUID) error {
return pnd.removeSbi(id)
}
-// AddDevice adds a new device to the PND
-func (pnd *pndImplementation) AddDevice(device interface{}) error {
- d, ok := device.(*Device)
- if !ok {
- return &errors.ErrInvalidTypeAssertion{
- Value: device,
- Type: "Device",
- }
+//AddDevice adds a new device to the PND
+func (pnd *pndImplementation) AddDevice(name string, opt *tpb.TransportOption, sid uuid.UUID) error {
+ sbi, err := pnd.sbic.Get(sid)
+ if err != nil {
+ return err
+ }
+
+ d, err := NewDevice(name, opt, sbi)
+ if err != nil {
+ return err
}
return pnd.addDevice(d)
}
-func (pnd *pndImplementation) GetDevice(identifier string) (*Device, error) {
+func (pnd *pndImplementation) GetDevice(identifier string) (interface{}, error) {
d, err := pnd.devices.Get(FromString(identifier))
if err != nil {
return nil, err
@@ -283,9 +328,9 @@ func (pnd *pndImplementation) RequestAll(path string) error {
return nil
}
-// ChangeOND creates a change from the provided Operation, path and value. The Change is pending and
-func (pnd *pndImplementation) ChangeOND(uuid uuid.UUID, operation interface{}, path string, value ...string) error {
- d, err := pnd.devices.Get(FromString(uuid.String()))
+// ChangeOND creates a change from the provided Operation, path and value. The Change is Pending and
+func (pnd *pndImplementation) ChangeOND(uuid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) error {
+ d, err := pnd.devices.Get(uuid)
if err != nil {
return err
}
@@ -300,7 +345,7 @@ func (pnd *pndImplementation) ChangeOND(uuid uuid.UUID, operation interface{}, p
return err
}
- if operation != types.TransportDelete && len(value) != 1 {
+ if operation != ppb.ApiOperation_DELETE && len(value) != 1 {
return &errors.ErrInvalidParameters{
Func: pnd.ChangeOND,
Param: value,
@@ -308,12 +353,12 @@ func (pnd *pndImplementation) ChangeOND(uuid uuid.UUID, operation interface{}, p
}
switch operation {
- case types.TransportUpdate, types.TransportReplace:
+ case ppb.ApiOperation_UPDATE, ppb.ApiOperation_REPLACE:
typedValue := gnmi.TypedValue(value[0])
if err := ytypes.SetNode(d.SBI.Schema().RootSchema(), cpy, p, typedValue); err != nil {
return err
}
- case types.TransportDelete:
+ case ppb.ApiOperation_DELETE:
if err := ytypes.DeleteNode(d.SBI.Schema().RootSchema(), cpy, p); err != nil {
return err
}
diff --git a/nucleus/principalNetworkDomain_test.go b/nucleus/principalNetworkDomain_test.go
index 88341b5b66669e0e184954af6292a90082c1a46f..f2eb25cc631c6f5047c499b077a00bd468c9bc87 100644
--- a/nucleus/principalNetworkDomain_test.go
+++ b/nucleus/principalNetworkDomain_test.go
@@ -5,7 +5,9 @@ import (
"reflect"
"testing"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
+ ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"code.fbi.h-da.de/cocsn/gosdn/mocks"
"code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
@@ -76,6 +78,8 @@ func Test_destroy(t *testing.T) {
func Test_pndImplementation_AddDevice(t *testing.T) {
type args struct {
device interface{}
+ name string
+ opts *tpb.TransportOption
}
tests := []struct {
name string
@@ -85,8 +89,11 @@ func Test_pndImplementation_AddDevice(t *testing.T) {
{
name: "default",
args: args{
- device: &Device{
- UUID: did,
+ name: "fridolin",
+ opts: &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
+ },
},
},
wantErr: false,
@@ -111,21 +118,27 @@ func Test_pndImplementation_AddDevice(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
pnd := newPnd()
+ if err := pnd.addSbi(&OpenConfig{id: defaultSbiID}); err != nil {
+ t.Error(err)
+ }
if tt.name == "already exists" {
- pnd.devices.store[did] = &Device{UUID: did}
+ pnd.devices.store[did] = tt.args.device.(*Device)
}
- err := pnd.AddDevice(tt.args.device)
+ err := pnd.AddDevice(tt.args.name, tt.args.opts, defaultSbiID)
if (err != nil) != tt.wantErr {
t.Errorf("AddDevice() error = %v, wantErr %v", err, tt.wantErr)
}
if tt.name != "fails wrong type" {
if err == nil {
- _, ok := pnd.devices.store[did]
- if !ok {
- t.Errorf("AddDevice() Device %v not in device store %v",
- tt.args.device, pnd.devices)
+ d, err := pnd.devices.Get(FromString(tt.args.name))
+ if err != nil {
+ t.Errorf("AddDevice() error = %v", err)
+ return
}
- if err := pnd.devices.Delete(did); err != nil {
+ if d.Name != tt.args.name {
+ t.Errorf("AddDevice() got = %v, want %v", d.Name, tt.args.name)
+ }
+ if err := pnd.devices.Delete(d.ID()); err != nil {
t.Error(err)
}
}
@@ -528,58 +541,51 @@ func Test_pndImplementation_RequestAll(t *testing.T) {
}
func Test_pndImplementation_ChangeOND(t *testing.T) {
- type fields struct {
+ opts := &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{},
+ },
}
type args struct {
- uuid uuid.UUID
- operation interface{}
+ operation ppb.ApiOperation
path string
value []string
}
tests := []struct {
name string
- fields fields
args args
wantErr bool
}{
{
- name: "update",
- fields: fields{},
+ name: "update",
args: args{
- uuid: mdid,
- operation: types.TransportUpdate,
+ operation: ppb.ApiOperation_UPDATE,
path: "/system/config/hostname",
value: []string{"ceos3000"},
},
wantErr: false,
},
{
- name: "replace",
- fields: fields{},
+ name: "replace",
args: args{
- uuid: mdid,
- operation: types.TransportReplace,
+ operation: ppb.ApiOperation_REPLACE,
path: "/system/config/hostname",
value: []string{"ceos3000"},
},
wantErr: false,
},
{
- name: "delete",
- fields: fields{},
+ name: "delete",
args: args{
- uuid: mdid,
- operation: types.TransportDelete,
+ operation: ppb.ApiOperation_DELETE,
path: "/system/config/hostname",
},
wantErr: false,
},
{
- name: "delete w/args",
- fields: fields{},
+ name: "delete w/args",
args: args{
- uuid: mdid,
- operation: types.TransportDelete,
+ operation: ppb.ApiOperation_DELETE,
path: "/system/config/hostname",
value: []string{"ceos3000"},
},
@@ -588,70 +594,70 @@ func Test_pndImplementation_ChangeOND(t *testing.T) {
// Negative test cases
{
- name: "invalid operation",
- fields: fields{},
+ name: "invalid operation",
args: args{
- uuid: mdid,
- operation: "INVALID",
+ operation: 54,
},
wantErr: true,
},
{
- name: "invalid arg count",
- fields: fields{},
+ name: "invalid arg count",
args: args{
- uuid: mdid,
- operation: types.TransportUpdate,
+ operation: ppb.ApiOperation_UPDATE,
path: "/system/config/hostname",
value: []string{"ceos3000", "ceos3001"},
},
wantErr: true,
},
{
- name: "invalid arg count - update, no args",
- fields: fields{},
+ name: "invalid arg count - update, no args",
args: args{
- uuid: mdid,
- operation: types.TransportUpdate,
+ operation: ppb.ApiOperation_UPDATE,
path: "/system/config/hostname",
},
wantErr: true,
},
{
- name: "invalid arg count - replace, no args",
- fields: fields{},
+ name: "invalid arg count - replace, no args",
args: args{
- uuid: mdid,
- operation: types.TransportUpdate,
+ operation: ppb.ApiOperation_UPDATE,
path: "/system/config/hostname",
},
wantErr: true,
},
{
- name: "device not found",
- fields: fields{},
+ name: "device not found",
args: args{
- uuid: did,
- operation: types.TransportUpdate,
+ operation: ppb.ApiOperation_UPDATE,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- p := newPnd()
- d := mockDevice()
- if err := p.AddDevice(&d); err != nil {
+ pnd := newPnd()
+ if err := pnd.addSbi(&OpenConfig{id: defaultSbiID}); err != nil {
+ t.Error(err)
+ }
+ if err := pnd.AddDevice("testdevice", opts, defaultSbiID); err != nil {
t.Error(err)
return
}
- if err := p.ChangeOND(tt.args.uuid, tt.args.operation, tt.args.path, tt.args.value...); (err != nil) != tt.wantErr {
+
+ did, ok := pnd.devices.deviceNameToUUIDLookup["testdevice"]
+ if !ok {
+ err := errors.New("error fetching device")
+ t.Error(err)
+ return
+ }
+
+ if err := pnd.ChangeOND(did, tt.args.operation, tt.args.path, tt.args.value...); (err != nil) != tt.wantErr {
t.Errorf("ChangeOND() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !tt.wantErr {
- if len(p.pendingChanges.store) != 1 {
- t.Errorf("ChangeOND() unexpected change count. got %v, want 1", len(p.pendingChanges.store))
+ if len(pnd.pendingChanges.store) != 1 {
+ t.Errorf("ChangeOND() unexpected change count. got %v, want 1", len(pnd.pendingChanges.store))
}
}
})
@@ -660,8 +666,8 @@ func Test_pndImplementation_ChangeOND(t *testing.T) {
func Test_pndImplementation_GetDevice(t *testing.T) {
pnd := newPnd()
- sbi := NewSBI(types.Openconfig)
- d, err := NewDevice(sbi, &GnmiTransportOptions{}, "")
+ sbi := NewSBI(spb.Type_OPENCONFIG)
+ d, err := NewDevice("", newGnmiTransportOptions(), sbi)
if err != nil {
t.Error(err)
return
@@ -700,8 +706,8 @@ func Test_pndImplementation_GetDevice(t *testing.T) {
return
}
if foundDevice != nil {
- if !reflect.DeepEqual(foundDevice.GoStruct, tt.want) {
- t.Errorf("GetDevice() got = %v, want %v", foundDevice.GoStruct, tt.want)
+ if !reflect.DeepEqual(foundDevice.(*Device).GoStruct, tt.want) {
+ t.Errorf("GetDevice() got = %v, want %v", foundDevice.(*Device).GoStruct, tt.want)
}
}
@@ -711,8 +717,8 @@ func Test_pndImplementation_GetDevice(t *testing.T) {
func Test_pndImplementation_GetDeviceByName(t *testing.T) {
p := newPnd()
- sbi := NewSBI(types.Openconfig)
- d, err := NewDevice(sbi, &GnmiTransportOptions{}, "my-device")
+ sbi := NewSBI(spb.Type_OPENCONFIG)
+ d, err := NewDevice("my-device", newGnmiTransportOptions(), sbi)
if err != nil {
t.Error(err)
return
@@ -751,8 +757,8 @@ func Test_pndImplementation_GetDeviceByName(t *testing.T) {
return
}
if foundDevice != nil {
- if !reflect.DeepEqual(foundDevice.GoStruct, tt.want) {
- t.Errorf("GetDeviceByName() got = %v, want %v", foundDevice.GoStruct, tt.want)
+ if !reflect.DeepEqual(foundDevice.(*Device).GoStruct, tt.want) {
+ t.Errorf("GetDeviceByName() got = %v, want %v", foundDevice.(*Device).GoStruct, tt.want)
}
}
@@ -784,11 +790,11 @@ func Test_pndImplementation_Confirm(t *testing.T) {
t.Error(err)
return
}
- if err := pnd.ChangeOND(d.ID(), types.TransportUpdate, "system/config/hostname", "ceos3000"); err != nil {
+ if err := pnd.ChangeOND(d.ID(), ppb.ApiOperation_UPDATE, "system/config/hostname", "ceos3000"); err != nil {
t.Error(err)
return
}
- u := pnd.Pending()[0]
+ u := pnd.PendingChanges()[0]
if tt.name != "uncommitted" {
if err := pnd.Commit(u); (err != nil) != tt.wantErr {
t.Errorf("Confirm() error = %v, wantErr %v", err, tt.wantErr)
diff --git a/nucleus/southbound.go b/nucleus/southbound.go
index b8eec7772e73d94aaaea5e3467c2b16bcbf86d61..11d63ddb6e537c78d6e0d9ecb29652efd53df77f 100644
--- a/nucleus/southbound.go
+++ b/nucleus/southbound.go
@@ -3,8 +3,8 @@ package nucleus
import (
"reflect"
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
"code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
"github.com/google/uuid"
@@ -28,12 +28,13 @@ type SouthboundInterface interface {
SetNode() func(schema *yang.Entry, root interface{}, path *gpb.Path, val interface{}, opts ...ytypes.SetNodeOpt) error
Schema() *ytypes.Schema
ID() uuid.UUID
+ Type() spb.Type
}
// NewSBI creates a SouthboundInterface of a given type.
-func NewSBI(southbound types.Southbound) SouthboundInterface {
+func NewSBI(southbound spb.Type) SouthboundInterface {
switch southbound {
- case types.Openconfig:
+ case spb.Type_OPENCONFIG:
return &OpenConfig{id: uuid.New()}
default:
return nil
@@ -161,3 +162,6 @@ func iter(a ygot.GoStruct, fields []string) (b ygot.GoStruct, f string, err erro
func (oc *OpenConfig) ID() uuid.UUID {
return oc.id
}
+
+// Type returns the Southbound's type
+func (oc *OpenConfig) Type() spb.Type { return spb.Type_OPENCONFIG }
diff --git a/nucleus/transport.go b/nucleus/transport.go
index 4a1764e42a37f2724083a5d260c9bdee23f41a43..dded3c4b299dcf9e9046b52e9c18c5f52dfe737e 100644
--- a/nucleus/transport.go
+++ b/nucleus/transport.go
@@ -1,9 +1,10 @@
package nucleus
import (
- "bytes"
"context"
- "io"
+
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
"github.com/openconfig/ygot/ytypes"
)
@@ -15,27 +16,23 @@ type Transport interface {
Set(ctx context.Context, params ...interface{}) error
Subscribe(ctx context.Context, params ...string) error
Type() string
- GetOptions() interface{}
ProcessResponse(resp interface{}, root interface{}, models *ytypes.Schema) error
}
-// YANGConsumer is a auxillary type to redirect the response
-// of an RESTCONF call to a ygot YANG unmarshaler
-type YANGConsumer struct {
- Data *bytes.Buffer
-}
-
-// Consume reads the received data into a byte buffer
-func (yc YANGConsumer) Consume(reader io.Reader, _ interface{}) error {
- _, err := yc.Data.ReadFrom(reader)
- return err
-}
+// NewTransport receives TransportOptions and returns an appropriate Transport
+// implementation
+func NewTransport(opts *tpb.TransportOption, sbi SouthboundInterface) (Transport, error) {
+ if opts == nil {
+ return nil, &errors.ErrInvalidParameters{
+ Func: NewTransport,
+ Param: "'opt' cannot be 'nil'",
+ }
+ }
+ switch o := opts.TransportOption.(type) {
+ case *tpb.TransportOption_GnmiTransportOption:
+ return NewGnmiTransport(opts, sbi)
+ default:
+ return nil, &errors.ErrInvalidTransportOptions{Opt: o}
-// TransportOptions provides an interface for TransportOptions implementations
-// for Transports like RESTCONF or gNMI
-type TransportOptions interface {
- GetAddress() string
- GetUsername() string
- GetPassword() string
- IsTransportOption()
+ }
}
diff --git a/nucleus/types/sbi.go b/nucleus/types/sbi.go
deleted file mode 100644
index 4f52211e91eb4db96a0b072787e4415184f50ff5..0000000000000000000000000000000000000000
--- a/nucleus/types/sbi.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package types
-
-// Southbound codes numerous SouthboundInterface implementations used by NewSBI()
-type Southbound int
-
-const (
- // Openconfig describes an OpenConfig SBI
- Openconfig Southbound = iota
-)
diff --git a/nucleus/types/transport.go b/nucleus/types/transport.go
deleted file mode 100644
index 9b0cfe965ccbabfaa7d0a86fd09a317915b8548b..0000000000000000000000000000000000000000
--- a/nucleus/types/transport.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package types
-
-// Operation codes numerous operations used to change the state of remote resources.
-// It is used as a unified code. Each Transport implementation needs to map these
-// accordingly to its specification.
-type Operation int
-
-const (
- // TransportUpdate codes an update operation
- TransportUpdate Operation = iota
- // TransportReplace codes a replace operation
- TransportReplace
- // TransportDelete codes a delete operation
- TransportDelete
-)
diff --git a/nucleus/types/context.go b/nucleus/types/types.go
similarity index 100%
rename from nucleus/types/context.go
rename to nucleus/types/types.go
diff --git a/test/integration/cliIntegration_test.go b/test/integration/cliIntegration_test.go
index d2800b0e0c434d2cf8c9bf2fd6972a03ab1d0a71..248b6e376e39ba6dbc5c63ec2b7c286398cc7ab9 100644
--- a/test/integration/cliIntegration_test.go
+++ b/test/integration/cliIntegration_test.go
@@ -1,8 +1,9 @@
package integration
import (
- "code.fbi.h-da.de/cocsn/gosdn/cli"
"testing"
+
+ "code.fbi.h-da.de/cocsn/gosdn/cli"
)
func TestCapabilities(t *testing.T) {
@@ -46,149 +47,3 @@ func TestCapabilities(t *testing.T) {
})
}
}
-
-func TestGet(t *testing.T) {
- if testing.Short() {
- t.Skip("skipping integration test")
- }
- type args struct {
- a string
- u string
- p string
- args []string
- }
- tests := []struct {
- name string
- args args
- wantErr bool
- }{
- {
- name: "default",
- args: args{
- a: testAddress,
- u: testUsername,
- p: testPassword,
- args: defaultPath,
- },
- wantErr: false,
- },
- {
- name: "destination unreachable",
- args: args{
- a: unreachable,
- u: testUsername,
- p: testPassword,
- args: defaultPath,
- },
- wantErr: true,
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- if _, err := cli.Get(tt.args.a, tt.args.u, tt.args.p, tt.args.args...); (err != nil) != tt.wantErr {
- t.Errorf("Get() error = %v, wantErr %v", err, tt.wantErr)
- }
- })
- }
-}
-
-func TestHttpGet(t *testing.T) {
- if testing.Short() {
- t.Skip("skipping integration test")
- }
- type args struct {
- apiEndpoint string
- f string
- args []string
- }
- tests := []struct {
- name string
- args args
- wantErr bool
- }{
- {
- name: "default",
- args: args{
- apiEndpoint: testAPIEndpoint,
- f: "init",
- args: nil,
- },
- wantErr: false,
- },
- {
- name: "destination unreachable",
- args: args{
- apiEndpoint: "http://" + unreachable,
- f: "init",
- args: nil,
- },
- wantErr: true,
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- if err := cli.HTTPGet(tt.args.apiEndpoint, tt.args.f, tt.args.args...); (err != nil) != tt.wantErr {
- t.Errorf("HttpGet() error = %v, wantErr %v", err, tt.wantErr)
- }
- })
- }
-}
-
-func TestSet(t *testing.T) {
- if testing.Short() {
- t.Skip("skipping integration test")
- }
- type args struct {
- a string
- u string
- p string
- typ string
- args []string
- }
- tests := []struct {
- name string
- args args
- wantErr bool
- }{
- {
- name: "default",
- args: args{
- a: testAddress,
- u: testUsername,
- p: testPassword,
- typ: "update",
- args: []string{"/system/config/hostname", "ceos3000"},
- },
- wantErr: false,
- },
- {
- name: "destination unreachable",
- args: args{
- a: unreachable,
- u: testUsername,
- p: testPassword,
- typ: "update",
- args: []string{"/system/config/hostname", "ceos3000"},
- },
- wantErr: true,
- },
- {
- name: "invalid path",
- args: args{
- a: testAddress,
- u: testUsername,
- p: testPassword,
- typ: "update",
- args: []string{"invalid/path", "ceos3000"},
- },
- wantErr: true,
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- if err := cli.Set(tt.args.a, tt.args.u, tt.args.p, tt.args.typ, tt.args.args...); (err != nil) != tt.wantErr {
- t.Errorf("Set() error = %v, wantErr %v", err, tt.wantErr)
- }
- })
- }
-}
diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go
index d5596ab70dad335efd43246023c13a10859f5b6a..dd24e37caa1144b200e1aa47b9bc6f97ae77c298 100644
--- a/test/integration/cmdIntegration_test.go
+++ b/test/integration/cmdIntegration_test.go
@@ -1,27 +1,28 @@
package integration
import (
+ "os"
+ "testing"
+
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
"code.fbi.h-da.de/cocsn/gosdn/cli"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
guuid "github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
pb "google.golang.org/protobuf/proto"
- "os"
- "testing"
)
const unreachable = "203.0.113.10:6030"
+const testPath = "/system/config/hostname"
var testAddress = "141.100.70.171:6030"
var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de/api"
var testUsername = "admin"
var testPassword = "arista"
-var defaultPath = []string{"/system/config/hostname"}
-var opt *nucleus.GnmiTransportOptions
+var opt *tpb.TransportOption
func TestMain(m *testing.M) {
testSetupIntegration()
@@ -74,14 +75,10 @@ func testSetupIntegration() {
}
}
- opt = &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: testAddress,
- Username: testUsername,
- Password: testPassword,
- Encoding: gpb.Encoding_JSON_IETF,
- },
- RespChan: make(chan *gpb.SubscribeResponse),
+ opt = &tpb.TransportOption{
+ Address: testAddress,
+ Username: testUsername,
+ Password: testPassword,
}
}
@@ -101,7 +98,7 @@ func TestCmdIntegration(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
defer viper.Reset()
- if err := cli.HTTPGet(testAPIEndpoint, "init"); (err != nil) != tt.wantErr {
+ if err := cli.Init(testAPIEndpoint); (err != nil) != tt.wantErr {
switch err.(type) {
case viper.ConfigFileNotFoundError:
default:
@@ -112,65 +109,68 @@ func TestCmdIntegration(t *testing.T) {
cliPnd := viper.GetString("CLI_PND")
cliSbi := viper.GetString("CLI_SBI")
- if err := cli.HTTPGet(
+ if _, err := cli.AddDevice(
testAPIEndpoint,
- "addDevice",
- "address="+testAddress,
- "password="+testPassword,
- "username="+testUsername,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
+ testUsername,
+ testPassword,
+ cliSbi,
+ cliPnd,
+ testAddress,
+ "test-device",
); (err != nil) != tt.wantErr {
t.Errorf("gosdn cli add-device error = %v, wantErr %v", err, tt.wantErr)
return
}
did := viper.GetString("LAST_DEVICE_UUID")
- if err := cli.HTTPGet(
+ _, err := cli.GetDevice(
testAPIEndpoint,
- "request",
- "uuid="+did,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- "path=/system/config/hostname",
- ); (err != nil) != tt.wantErr {
+ cliPnd,
+ testPath,
+ did,
+ )
+ if (err != nil) != tt.wantErr {
t.Errorf("gosdn cli request error = %v, wantErr %v", err, tt.wantErr)
return
}
- if err := cli.HTTPGet(
+ _, err = cli.GetDevice(
testAPIEndpoint,
- "getDevice",
- "address="+testAddress,
- "uuid="+did,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- ); (err != nil) != tt.wantErr {
+ cliPnd,
+ "",
+ did,
+ )
+ if (err != nil) != tt.wantErr {
t.Errorf("gosdn cli get-device error = %v, wantErr %v", err, tt.wantErr)
return
}
hostname := guuid.New().String()
- if err := cli.HTTPGet(
+ _, err = cli.Update(
testAPIEndpoint,
- "update",
- "address="+testAddress,
- "uuid="+did,
- "sbi="+cliSbi,
- "pnd="+cliPnd,
- "path=/system/config/hostname",
- "value="+hostname,
- ); (err != nil) != tt.wantErr {
+ did,
+ cliPnd,
+ testPath,
+ hostname,
+ )
+ if (err != nil) != tt.wantErr {
t.Errorf("gosdn cli set error = %v, wantErr %v", err, tt.wantErr)
return
}
- resp, err := cli.Get(testAddress, testUsername, testPassword, "/system/config/hostname")
- if (err != nil) != tt.wantErr {
- t.Errorf("cli.Get() error = %v, wantErr %v", err, tt.wantErr)
+ resp, err := cli.GetDevice(testAddress, testUsername, testPassword, testPath)
+ if err != nil {
+ if !tt.wantErr {
+ t.Errorf("cli.Get() error = %v, wantErr %v", err, tt.wantErr)
+ }
return
}
- got := resp.Notification[0].Update[0].Val.GetStringVal()
+ var got string
+ if resp != nil {
+ got = resp.Ond[0].Name
+ } else {
+ t.Errorf("integration test failed got cannot be nil")
+ }
if got != hostname {
t.Errorf("integration test failed = got: %v, want: %v", got, hostname)
}
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index ccd5d942adb7e8436eaf117811505deed12ae416..4a5a29eebeb8d7acb0c0fdf7310314b83000694a 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -1,16 +1,20 @@
package integration
import (
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
"context"
- gpb "github.com/openconfig/gnmi/proto/gnmi"
- pb "google.golang.org/protobuf/proto"
"reflect"
"sort"
"testing"
"time"
+
+ spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+
+ "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
+ gpb "github.com/openconfig/gnmi/proto/gnmi"
+ pb "google.golang.org/protobuf/proto"
)
var gnmiMessages map[string]pb.Message
@@ -20,7 +24,7 @@ func TestGnmi_SetIntegration(t *testing.T) {
t.Skip("skipping integration test")
}
type fields struct {
- opt *nucleus.GnmiTransportOptions
+ opt *tpb.TransportOption
}
type args struct {
ctx context.Context
@@ -34,12 +38,11 @@ func TestGnmi_SetIntegration(t *testing.T) {
}{
{
name: "destination unreachable",
- fields: fields{opt: &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "203.0.113.10:6030",
+ fields: fields{
+ opt: &tpb.TransportOption{
+ Address: "203.0.113.10:6030",
},
},
- },
args: args{
ctx: context.Background(),
params: []string{"/system/config/hostname", "ceos3000"},
@@ -67,7 +70,7 @@ func TestGnmi_SetIntegration(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- g, err := nucleus.NewGnmiTransport(tt.fields.opt)
+ g, err := nucleus.NewGnmiTransport(tt.fields.opt, nucleus.NewSBI(spb.Type_OPENCONFIG))
if err != nil {
t.Errorf("NewGnmiTransport() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -91,7 +94,7 @@ func TestGnmi_GetIntegration(t *testing.T) {
"system/config/hostname",
}
type fields struct {
- opt *nucleus.GnmiTransportOptions
+ opt *tpb.TransportOption
}
type args struct {
ctx context.Context
@@ -116,12 +119,11 @@ func TestGnmi_GetIntegration(t *testing.T) {
},
{
name: "destination unreachable",
- fields: fields{opt: &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "203.0.113.10:6030",
+ fields: fields{
+ opt: &tpb.TransportOption{
+ Address: "203.0.113.10:6030",
},
},
- },
args: args{
ctx: context.Background(),
params: paths,
@@ -132,7 +134,7 @@ func TestGnmi_GetIntegration(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- g, err := nucleus.NewGnmiTransport(tt.fields.opt)
+ g, err := nucleus.NewGnmiTransport(tt.fields.opt, nucleus.NewSBI(spb.Type_OPENCONFIG))
if err != nil {
t.Error(err)
return
@@ -154,7 +156,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
}
type fields struct {
- opt *nucleus.GnmiTransportOptions
+ opt *tpb.TransportOption
}
type args struct {
ctx context.Context
@@ -169,9 +171,19 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
{
name: "default",
fields: fields{
- opt: &nucleus.GnmiTransportOptions{
- Config: opt.Config,
- RespChan: make(chan *gpb.SubscribeResponse),
+ opt: &tpb.TransportOption{
+ Address: "",
+ Username: "",
+ Password: "",
+ Tls: false,
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{
+ Compression: "",
+ GrpcDialOptions: nil,
+ Token: "",
+ Encoding: 0,
+ },
+ },
},
},
args: args{
@@ -193,10 +205,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
{
name: "wrong path",
fields: fields{
- opt: &nucleus.GnmiTransportOptions{
- Config: opt.Config,
- RespChan: make(chan *gpb.SubscribeResponse),
- },
+ opt: &tpb.TransportOption{},
},
args: args{
opts: &gnmi.SubscribeOptions{
@@ -216,11 +225,8 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
{
name: "destination unreachable",
fields: fields{
- opt: &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "203.0.113.10:6030",
- },
- RespChan: make(chan *gpb.SubscribeResponse),
+ opt: &tpb.TransportOption{
+ Address: "203.0.113.10:6030",
},
},
args: args{
@@ -232,7 +238,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var wantErr = tt.wantErr
- g, err := nucleus.NewGnmiTransport(tt.fields.opt)
+ g, err := nucleus.NewGnmiTransport(tt.fields.opt, nucleus.NewSBI(spb.Type_OPENCONFIG))
if err != nil {
t.Error(err)
return
@@ -261,7 +267,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
t.Skip("skipping integration test")
}
type fields struct {
- opt *nucleus.GnmiTransportOptions
+ opt *tpb.TransportOption
}
type args struct {
ctx context.Context
@@ -296,10 +302,8 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
},
{
name: "destination unreachable",
- fields: fields{opt: &nucleus.GnmiTransportOptions{
- Config: gnmi.Config{
- Addr: "203.0.113.10:6030",
- },
+ fields: fields{opt: &tpb.TransportOption{
+ Address: "203.0.113.10:6030",
},
},
args: args{ctx: context.Background()},
@@ -309,7 +313,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- g, err := nucleus.NewGnmiTransport(tt.fields.opt)
+ g, err := nucleus.NewGnmiTransport(tt.fields.opt, nucleus.NewSBI(spb.Type_OPENCONFIG))
if err != nil {
t.Error(err)
return
diff --git a/test/targets.go b/test/targets.go
index 309b818471b71581a3efe2ffa2bf65baf0b639b0..2471d5509c86157fcbf60b3669b0e7a9699b5012 100644
--- a/test/targets.go
+++ b/test/targets.go
@@ -1,6 +1,9 @@
package test
import (
+ "net"
+ "reflect"
+
"code.fbi.h-da.de/cocsn/gosdn/forks/google/gnmi"
oc "code.fbi.h-da.de/cocsn/yang-models/generated/arista"
pb "github.com/openconfig/gnmi/proto/gnmi"
@@ -10,8 +13,6 @@ import (
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
- "net"
- "reflect"
)
type server struct {