From d1f6bfbebe5d568d05052d9c73699a608b3de313 Mon Sep 17 00:00:00 2001
From: "S.H." <sebastian.heiss94@proton.me>
Date: Fri, 14 Mar 2025 12:22:43 +0100
Subject: [PATCH] Minor changes to output

---
 applications/rtdt-manager/gosdnutil/gosdnutil.go       | 2 +-
 applications/rtdt-manager/rtdt-manager/rtdt-manager.go | 2 +-
 applications/rtdt-manager/venv/venv.go                 | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/applications/rtdt-manager/gosdnutil/gosdnutil.go b/applications/rtdt-manager/gosdnutil/gosdnutil.go
index 571eefefc..f659c98e5 100644
--- a/applications/rtdt-manager/gosdnutil/gosdnutil.go
+++ b/applications/rtdt-manager/gosdnutil/gosdnutil.go
@@ -25,7 +25,7 @@ func FetchPnd(conn *grpc.ClientConn, auth *rtdt_auth.RtdtAuth) (*pnd.PrincipalNe
 		return nil, fmt.Errorf("Failed to retrieve PND information:\npndresponse: %v\nerror: %w\n", pndResponse, err)
 	}
 	if pndList := pndResponse.GetPnd(); pndList != nil {
-		fmt.Println("pndUUID is now: ", pndList[0].Id)
+		fmt.Println("pndUUID set to: ", pndList[0].Id)
 		p = pndList[0] // TODO: Only supports one pnd for now
 		return p, nil
 	} else {
diff --git a/applications/rtdt-manager/rtdt-manager/rtdt-manager.go b/applications/rtdt-manager/rtdt-manager/rtdt-manager.go
index adaa60c8d..20b877944 100644
--- a/applications/rtdt-manager/rtdt-manager/rtdt-manager.go
+++ b/applications/rtdt-manager/rtdt-manager/rtdt-manager.go
@@ -67,7 +67,7 @@ func (r *RtdtManager) LaunchRealnetVEnv(realnetName string, sdnConfig *sdnconfig
 		fmt.Println("Successfully wrote realnet clab config file")
 	}
 
-	fmt.Printf("Now trying to create realnet with config file: %s\n", realnetClabFName)
+	fmt.Printf("Trying to create realnet with config file: %s\n", realnetClabFName)
 	// NewVEnv tasks:
 	// - deploy the given clab config,
 	// - establish connection to it
diff --git a/applications/rtdt-manager/venv/venv.go b/applications/rtdt-manager/venv/venv.go
index 516725614..dd6204d30 100644
--- a/applications/rtdt-manager/venv/venv.go
+++ b/applications/rtdt-manager/venv/venv.go
@@ -128,11 +128,8 @@ func (v *VEnv) ApplyConfiguration(sdnConfig *sdnconfig.SdnConfig) error {
 	v.sdnConfig = sdnConfig
 	sdnConfigParsed, err := json.Marshal(v.sdnConfig)
 	if err != nil {
-		fmt.Println("PARSING ERROR")
-		return err
+        return fmt.Errorf("Parsing Error in ApplyConfiguration(): %w", err)
 	}
-	fmt.Println("Going to try and upload this sdnconfig json:")
-	fmt.Println(string(sdnConfigParsed))
 	configService := configPb.NewConfigurationManagementServiceClient(v.auth.GetConn())
 	request := &configPb.ImportSDNConfigRequest{
 		Timestamp:     util.Now(),
@@ -141,8 +138,7 @@ func (v *VEnv) ApplyConfiguration(sdnConfig *sdnconfig.SdnConfig) error {
 	}
 	response, err := configService.ImportSDNConfig(v.auth.CreateContextWithAuthorization(), request)
 	if err != nil {
-		fmt.Println("RESPONSE ERROR")
-		return err
+        return fmt.Errorf("Response Error in ApplyConfiguration(): %w", err)
 	}
 	fmt.Println("Configuration Response:", response.String())
 	return nil
-- 
GitLab