adjust venv-manager to changes in rtdt_auth

applications/venv-manager/main.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	reg "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/registration"
+	rtdt_auth "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/rtdt-auth"
 	venvmanager "code.fbi.h-da.de/danet/gosdn/applications/venv-manager/venv-manager"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -40,7 +40,9 @@ func main() {
 	flag.Parse()
 
 	conn, err := grpc.NewClient(dialConnectionURL, dialOption, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(100*1024*1024)))
-	sessionTok, err := reg.Login(conn, dialConnectionURL, "admin", "TestPassword")
+	//sessionTok, err := reg.Login(conn, dialConnectionURL, "admin", "TestPassword")
+	auth := rtdt_auth.NewRtdtAuth("admin", "172.100.0.5:55055", "TestPassword", conn)
+	sessionTok := auth.GetSessionToken()
 	if err != nil {
 		fmt.Println("Encountered error while trying to log into controller")
 	}

applications/venv-manager/venv-manager/venv-manager.go

@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
-    reg "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/registration"
 	configMgmtPb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/configurationmanagement"
 	mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
 	ppb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/pnd"
 	topologyPb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/topology"
+	rtdt_auth "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/rtdt-auth"
 	"code.fbi.h-da.de/danet/gosdn/applications/venv-manager/containerlab"
 	link "code.fbi.h-da.de/danet/gosdn/applications/venv-manager/links"
 	"code.fbi.h-da.de/danet/gosdn/applications/venv-manager/node"
@@ -37,7 +37,7 @@ type VenvManager struct {
 	containerRegistryURL string
 	pndID                string
 	pndName              string
-    sessionTok           string
+	sessionTok           string
 }
 
 // NewVenvManager creates a new VenvManager to use.
@@ -48,7 +48,7 @@ func NewVenvManager(dialConnectionURL string, dialOption grpc.DialOption, topolo
 	v.topologyFilepath = topologyFilepath
 	v.sdnConfigFilepath = sdnConfigFilepath
 	v.containerRegistryURL = containerRegistryURL
-    v.sessionTok = sessionTok
+	v.sessionTok = sessionTok
 	return v
 }
 
@@ -217,12 +217,13 @@ func (v *VenvManager) CreateTopologyFile() error {
 
 func (v *VenvManager) getTopologyData() (*topologyPb.GetTopologyResponse, error) {
 	conn, err := v.createConnection()
+	auth := rtdt_auth.NewRtdtAuth("admin", "172.100.0.5:55055", "TestPassword", conn)
 	if err != nil {
 		return nil, err
 	}
 	defer v.closeConnection(conn)
 
-	ctx := reg.CreateContextWithAuthorization(v.sessionTok)
+	ctx := auth.CreateContextWithAuthorization()
 
 	pndService := ppb.NewPndServiceClient(conn)
 	pndRes, err := pndService.GetPndList(ctx, &ppb.GetPndListRequest{Timestamp: getTimestamp()})