moved transport options to proto

nucleus/gnmi_transport.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"reflect"
 
-	ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
 	"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"

nucleus/gnmi_transport_test.go

 package nucleus
 
 import (
+	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 	"context"
 	"errors"
 	"reflect"
@@ -482,6 +483,37 @@ func TestNewGnmiTransport(t *testing.T) {
 							Compression: "brotli",
 						},
 					}}},
+<<<<<<< HEAD
+=======
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			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: &tpb.TransportOption{
+					TransportOption: &tpb.TransportOption_GnmiTransportOption{
+						GnmiTransportOption: &tpb.GnmiTransportOption{
+							GrpcDialOptions: map[string]string{
+								"ca-file":"invalid",
+							},
+						},
+					}}},
+>>>>>>> 55fb68b4 (moved transport options to proto)
 			want:    nil,
 			wantErr: true,
 		},
@@ -491,7 +523,11 @@ func TestNewGnmiTransport(t *testing.T) {
 			if tt.name == "default" {
 				startGnmiTarget <- gnmiConfig.Addr
 			}
+<<<<<<< HEAD
 			got, err := NewGnmiTransport(tt.args.opts, NewSBI(spb.Type_OPENCONFIG))
+=======
+			got, err := NewGnmiTransport(tt.args.opts, &OpenConfig{})
+>>>>>>> 55fb68b4 (moved transport options to proto)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("NewGnmiTransport() error = %v, wantErr %v", err, tt.wantErr)
 				return

nucleus/initialise_test.go

@@ -7,6 +7,8 @@ import (
 
 	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 
+	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"

nucleus/transport.go

 package nucleus
 
 import (
+<<<<<<< HEAD
 	"context"
 
 	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 	"code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+=======
+	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+	"code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+	"context"
+>>>>>>> 55fb68b4 (moved transport options to proto)
 
 	"github.com/openconfig/ygot/ytypes"
 )
@@ -22,12 +28,15 @@ type Transport interface {
 // NewTransport receives TransportOptions and returns an appropriate Transport
 // implementation
 func NewTransport(opts *tpb.TransportOption, sbi SouthboundInterface) (Transport, error) {
+<<<<<<< HEAD
 	if opts == nil {
 		return nil, &errors.ErrInvalidParameters{
 			Func:  NewTransport,
 			Param: "'opt' cannot be 'nil'",
 		}
 	}
+=======
+>>>>>>> 55fb68b4 (moved transport options to proto)
 	switch o := opts.TransportOption.(type) {
 	case *tpb.TransportOption_GnmiTransportOption:
 		return NewGnmiTransport(opts, sbi)