Adjust to new api

Signed-off-by: Serguei Bezverkhi <[email protected]>

Author: sbezverk

pkg/dbclient/mock/dbmock.go

@@ -19,9 +19,7 @@ var (
 type dbMock struct {
 	mu       sync.Mutex
 	qoe      map[int32]*pbapi.Qoe
-	vpnRD2AS map[pbapi.RouteDistinguisherTwoOctetAS][]uint32
-	vpnRD4AS map[pbapi.RouteDistinguisherFourOctetAS][]uint32
-	vpnRDIP  map[pbapi.RouteDistinguisherIPAddress][]uint32
+	vpnRD2AS map[uint32][]uint32
 }
 
 // GetQoE is required method by DB interface, it takes requested QoE and searches through

pkg/gateway/server.go

@@ -6,10 +6,10 @@ import (
 	"time"
 
 	pbapi "github.com/cisco-ie/jalapeno-go-gateway/pkg/apis"
+	"github.com/cisco-ie/jalapeno-go-gateway/pkg/dbclient"
 	"github.com/golang/glog"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/peer"
-	"github.com/cisco-ie/jalapeno-go-gateway/pkg/dbclient"
 )
 
 var (
@@ -26,7 +26,7 @@ type Gateway interface {
 type gateway struct {
 	gSrv *grpc.Server
 	conn net.Listener
-	dbc dbclient.DBClient
+	dbc  dbclient.DBClient
 }
 
 func (g *gateway) Start() {
@@ -65,9 +65,9 @@ func NewGateway(conn net.Listener, dbc dbclient.DBClient) Gateway {
 	gSrv := gateway{
 		conn: conn,
 		gSrv: grpc.NewServer([]grpc.ServerOption{}...),
-		dbc: dbc,
+		dbc:  dbc,
 	}
-	pbapi.RegisterGatawayServicesServer(gSrv.gSrv, &gSrv)
+	pbapi.RegisterGatewayServiceServer(gSrv.gSrv, &gSrv)
 
 	return &gSrv
 
@@ -87,4 +87,3 @@ func (g *gateway) processQoERequest(ctx context.Context, reqQoEs *pbapi.RequestQ
 		return nil, ctx.Err()
 	}
 }
-

pkg/gateway/server_test.go

@@ -129,7 +129,7 @@ func TestClientRequestQoE(t *testing.T) {
 			t.Fatalf("failed to dial bufnet with error: %v", err)
 		}
 		defer conn.Close()
-		client := pbapi.NewGatawayServicesClient(conn)
+		client := pbapi.NewGatewayServiceClient(conn)
 		resp, err := client.QoE(ctx, &pbapi.RequestQoE{Qoes: tt.qoeRequest})
 		if err != nil {
 			t.Fatalf("QoE request failed with error: %v", err)