Implement WCM AWS TGW connector NSE config options and composite endpoint stub and add stub unit-tests as well

cmd/vl3-nse/aws_tgw_connect.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"context"
+
+	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/sirupsen/logrus"
+
+	"github.com/cisco-app-networking/nsm-nse/pkg/nseconfig"
+	"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
+	"github.com/networkservicemesh/networkservicemesh/controlplane/api/networkservice"
+	"github.com/networkservicemesh/networkservicemesh/sdk/endpoint"
+)
+
+type AwsTgwConnector struct {
+	TransitGatewayID 	string
+	TransitGatewayName 	string
+}
+
+func newAwsTgwConnector(ate *nseconfig.AwsTgwEndpoint) *AwsTgwConnector {
+	logrus.Infof("newAwsTgwConnector()")
+
+	if ate != nil {
+		newAwsTgwConnector := &AwsTgwConnector{
+			TransitGatewayID:   ate.TransitGatewayID,
+			TransitGatewayName: ate.TransitGatewayName,
+		}
+
+		logrus.Infof("newAwsTgwConnector returning object: %v", newAwsTgwConnector)
+		return newAwsTgwConnector
+	}
+
+	logrus.Errorf("newAwsTgwConnector(): got nil AwsTgwEndpoint, returning nil")
+
+	return nil
+}
+
+func (atc *AwsTgwConnector) Close(ctx context.Context, conn *connection.Connection) (*empty.Empty, error) {
+
+	logrus.Infof("AWS TGW Connector Close()")
+
+	if endpoint.Next(ctx) != nil {
+		return endpoint.Next(ctx).Close(ctx, conn)
+	}
+	return &empty.Empty{}, nil
+}
+
+func (atc *AwsTgwConnector) Request(ctx context.Context,
+	request *networkservice.NetworkServiceRequest) (*connection.Connection, error) {
+
+	logrus.Infof("AWS TGW Connector Request()")
+
+	if endpoint.Next(ctx) != nil {
+		return endpoint.Next(ctx).Request(ctx, request)
+	}
+
+	return nil, nil
+}

cmd/vl3-nse/aws_tgw_connect_test.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/cisco-app-networking/nsm-nse/pkg/nseconfig"
+	"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
+	"github.com/networkservicemesh/networkservicemesh/controlplane/api/networkservice"
+)
+
+const (
+	TransitGatewayID   = "1"
+	TransitGatewayName = "test"
+)
+
+func TestNewAwsTgwConnector(t *testing.T) {
+
+	ate := nseconfig.AwsTgwEndpoint{
+		TransitGatewayID:   TransitGatewayID,
+		TransitGatewayName: TransitGatewayName,
+	}
+
+	expected := &AwsTgwConnector{
+		TransitGatewayID:   TransitGatewayID,
+		TransitGatewayName: TransitGatewayName,
+	}
+
+	got := newAwsTgwConnector(&ate)
+
+	assert.Equal(t, expected, got)
+}
+
+func TestNewAwsTgwConnectorNil(t *testing.T) {
+
+	got := newAwsTgwConnector(nil)
+
+	assert.Nil(t, got)
+}
+
+func TestAwsTgwConnector_Request(t *testing.T) {
+	atc := AwsTgwConnector{}
+	ctx := context.Background()
+	request := &networkservice.NetworkServiceRequest{}
+
+	_, err := atc.Request(ctx, request)
+
+	assert.Nil(t, err)
+}
+
+func TestAwsTgwConnector_Close(t *testing.T) {
+	atc := AwsTgwConnector{}
+	ctx := context.Background()
+	conn := &connection.Connection{}
+
+	_, err := atc.Close(ctx, conn)
+
+	assert.Nil(t, err)
+}

cmd/vl3-nse/nse.go

@@ -82,6 +82,11 @@ func (e vL3CompositeEndpoint) AddCompositeEndpoints(nsConfig *common.NSConfigura
 			}, ucnfEndpoint.VL3.IPAM.DefaultPrefixPool, ucnfEndpoint.VL3.IPAM.ServerAddress, ucnfEndpoint.NseControl.ConnectivityDomain),
 	}
 
+	if ucnfEndpoint.AwsTgwEndpoint != nil {
+		awsTgwEndpoint := newAwsTgwConnector(ucnfEndpoint.AwsTgwEndpoint)
+		compositeEndpoints = append(compositeEndpoints, awsTgwEndpoint)
+	}
+
 	return &compositeEndpoints
 }
 

cmd/vl3-nse/nse_test.go

@@ -0,0 +1,78 @@
+package main
+
+import (
+	"fmt"
+	"github.com/cisco-app-networking/nsm-nse/pkg/nseconfig"
+	"github.com/cisco-app-networking/nsm-nse/pkg/universal-cnf/config"
+	"github.com/networkservicemesh/networkservicemesh/sdk/common"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+
+func TestAddCompositeEndpoints(t *testing.T) {
+	vce := vL3CompositeEndpoint{}
+	nsConfig := &common.NSConfiguration{
+		IPAddress: "10.0.0.1",
+	}
+
+	ucnfEndpoint := &nseconfig.Endpoint{
+		VL3: nseconfig.VL3{
+			IPAM: nseconfig.IPAM{
+				DefaultPrefixPool: "192.168.0.0/24",
+				ServerAddress: "192.168.0.1",
+			},
+		},
+		NseControl: &nseconfig.NseControl{},
+		AwsTgwEndpoint: nil,
+	}
+
+	newVL3ConnectComposite = func(configuration *common.NSConfiguration, vL3NetCidr string, backend config.UniversalCNFBackend, remoteIpList []string, getNseName fnGetNseName, defaultCdPrefix, nseControlAddr, connDomain string) *vL3ConnectComposite {
+		return nil
+	}
+
+	got := vce.AddCompositeEndpoints(nsConfig, ucnfEndpoint)
+
+	assert.NotNil(t, got)
+	assert.Equal(t, 1, len(*got))
+
+	compositeEndpoints := *got
+	typeofEndpoint := fmt.Sprintf("%T", compositeEndpoints[0])
+	assert.NotEqual(t, "*main.AwsTgwConnector", typeofEndpoint)
+}
+
+func TestAddCompositeEndpointsAws(t *testing.T) {
+	vce := vL3CompositeEndpoint{}
+	nsConfig := &common.NSConfiguration{
+		IPAddress: "10.0.0.1",
+	}
+
+	ucnfEndpoint := &nseconfig.Endpoint{
+		VL3: nseconfig.VL3{
+			IPAM: nseconfig.IPAM{
+				DefaultPrefixPool: "192.168.0.0/24",
+				ServerAddress: "192.168.0.1",
+			},
+		},
+		NseControl: &nseconfig.NseControl{},
+		AwsTgwEndpoint: &nseconfig.AwsTgwEndpoint{
+			TransitGatewayID: "1",
+			TransitGatewayName: "test",
+		},
+	}
+
+	newVL3ConnectComposite = func(configuration *common.NSConfiguration, vL3NetCidr string, backend config.UniversalCNFBackend, remoteIpList []string, getNseName fnGetNseName, defaultCdPrefix, nseControlAddr, connDomain string) *vL3ConnectComposite {
+		return nil
+	}
+
+	got := vce.AddCompositeEndpoints(nsConfig, ucnfEndpoint)
+
+	assert.NotNil(t, got)
+	assert.Equal(t, len(*got), 2)
+
+	compositeEndpoints := *got
+	awsTgwEndpoint := compositeEndpoints[1]
+	typeOfEndpoint := fmt.Sprintf("%T", awsTgwEndpoint)
+
+	assert.Equal(t, "*main.AwsTgwConnector", typeOfEndpoint )
+}

cmd/vl3-nse/service_registry.go

@@ -108,7 +108,7 @@ func (s *serviceRegistry) RegisterWorkload(ctx context.Context, workloadLabels m
 	logrus.Infof("Sending workload register request: %v", serviceWorkload)
 	_, err = s.registryClient.RegisterWorkload(ctx, serviceWorkload)
 	if err != nil {
-		logrus.Errorf("service registration not successful: %w", err)
+		logrus.Errorf("service registration not successful: %v", err)
 		return err
 	}
 
@@ -148,7 +148,7 @@ func (s *serviceRegistry) RemoveWorkload(ctx context.Context, workloadLabels map
 	logrus.Infof("Sending workload remove request: %v", serviceWorkload)
 	_, err = s.registryClient.RemoveWorkload(ctx, serviceWorkload)
 	if err != nil {
-		logrus.Errorf("service removal not successful: %w", err)
+		logrus.Errorf("service removal not successful: %v", err)
 		return err
 	}