Stfaseid http refactor

Description

Draft for new API. Needs extensive manual testing. Only merge if changes in https://code.fbi.h-da.de/danet/api/-/tree/10-refactor-current-proto-definitions-stfahelm and upcoming changes to CLI are approved.

Related Issue

#141 (closed)

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

northbound/server/pnd.go

@@ -42,7 +42,12 @@ func (p pndServer) GetOnd(ctx context.Context, request *ppb.GetOndRequest) (*ppb
 	}
 	return &ppb.GetOndResponse{
 		Timestamp: time.Now().UnixNano(),
-		Ond:       onds,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Ond: onds,
 	}, nil
 }
 
@@ -60,14 +65,19 @@ func (p pndServer) GetOndList(ctx context.Context, request *ppb.GetOndListReques
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
-	onds, err := fillOnds(pnd, true, "")
+	onds, err := fillOnds(pnd, true)
 	if err != nil {
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 	return &ppb.GetOndListResponse{
 		Timestamp: time.Now().UnixNano(),
-		Ond:       onds,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Ond: onds,
 	}, nil
 }
 
@@ -140,7 +150,12 @@ func (p pndServer) GetSbi(ctx context.Context, request *ppb.GetSbiRequest) (*ppb
 	}
 	return &ppb.GetSbiResponse{
 		Timestamp: time.Now().UnixNano(),
-		Sbi:       sbis,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Sbi: sbis,
 	}, nil
 }
 
@@ -165,7 +180,12 @@ func (p pndServer) GetSbiList(ctx context.Context, request *ppb.GetSbiListReques
 	}
 	return &ppb.GetSbiListResponse{
 		Timestamp: time.Now().UnixNano(),
-		Sbi:       sbis,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Sbi: sbis,
 	}, nil
 
 }
@@ -218,6 +238,7 @@ func stringToUUID(sid []string) ([]uuid.UUID, error) {
 	return UUIDs, nil
 }
 
+//TODO: add body to request tod eal with / problem
 func (p pndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*ppb.GetPathResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
@@ -249,7 +270,12 @@ func (p pndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*p
 	}
 	return &ppb.GetPathResponse{
 		Timestamp: time.Now().UnixNano(),
-		Device:    ond[0].Device,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Device: ond[0].Device,
 	}, nil
 
 }
@@ -275,7 +301,12 @@ func (p pndServer) GetChange(ctx context.Context, request *ppb.GetChangeRequest)
 	}
 	return &ppb.GetChangeResponse{
 		Timestamp: time.Now().UnixNano(),
-		Change:    changes,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Change: changes,
 	}, nil
 }
 
@@ -300,7 +331,12 @@ func (p pndServer) GetChangeList(ctx context.Context, request *ppb.GetChangeList
 	}
 	return &ppb.GetChangeListResponse{
 		Timestamp: time.Now().UnixNano(),
-		Change:    changes,
+		Pnd: &ppb.PrincipalNetworkDomain{
+			Id:          pnd.ID().String(),
+			Name:        pnd.GetName(),
+			Description: pnd.GetDescription(),
+		},
+		Change: changes,
 	}, nil
 }
 
@@ -372,7 +408,7 @@ func (p pndServer) SetOndList(ctx context.Context, request *ppb.SetOndListReques
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
 		Responses: []*ppb.SetResponse{
-			&ppb.SetResponse{
+			{
 				Status: ppb.Status_STATUS_OK,
 			},
 		},
@@ -420,7 +456,7 @@ func (p pndServer) SetChangeList(ctx context.Context, request *ppb.SetChangeList
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
 		Responses: []*ppb.SetResponse{
-			&ppb.SetResponse{
+			{
 				Status: ppb.Status_STATUS_OK,
 			},
 		},
@@ -458,7 +494,7 @@ func (p pndServer) SetPathList(ctx context.Context, request *ppb.SetPathListRequ
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
 		Responses: []*ppb.SetResponse{
-			&ppb.SetResponse{
+			{
 				Status: ppb.Status_STATUS_OK,
 			},
 		},
@@ -466,6 +502,27 @@ func (p pndServer) SetPathList(ctx context.Context, request *ppb.SetPathListRequ
 
 }
 
+//TODO: update proto for setSBI and add sbiList after!
+// func (p pndServer) SetSbiList(ctx context.Context, request *ppb.SetSbiListRequest) (*ppb.SetSbiListResponse, error) {
+// 	labels := prometheus.Labels{"service": "pnd", "rpc": "set"}
+// 	start := metrics.StartHook(labels, grpcRequestsTotal)
+// 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
+// 	pid, err := uuid.Parse(request.Pid)
+// 	if err != nil {
+// 		return nil, handleRPCError(labels, err)
+// 	}
+
+// 	pnd, err := pndc.GetPND(pid)
+// 	if err != nil {
+// 		return nil, handleRPCError(labels, err)
+// 	}
+
+// 	for _, r := range request.Sbi {
+// 		err := pnd.AddSbi()
+// 	}
+
+// }
+
 func (p pndServer) DeleteOnd(ctx context.Context, request *ppb.DeleteOndRequest) (*ppb.DeleteOndResponse, error) {
 	pid, err := uuid.Parse(request.Pid)
 	if err != nil {