From c743e730210824a2b756bd2599eca8dbf73fba8d Mon Sep 17 00:00:00 2001 From: Katharina Renk <katharina.renk@stud.h-da.de> Date: Mon, 26 Feb 2024 23:02:22 +0100 Subject: [PATCH] modifying request creation --- .../lab_tests/lab01/lab01_test.go | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/integration-tests/lab_tests/lab01/lab01_test.go b/integration-tests/lab_tests/lab01/lab01_test.go index 133fac764..a19f2ea37 100644 --- a/integration-tests/lab_tests/lab01/lab01_test.go +++ b/integration-tests/lab_tests/lab01/lab01_test.go @@ -161,39 +161,34 @@ func TestLab01(t *testing.T) { // Modify the interface of both managed network elements. for _, mne := range managedNetworkElements { for i := 0; i < len(mne.configEntries); i++ { + var pathListRequest *mnepb.SetPathListRequest + var err error + // Interface change request if strings.Contains(mne.configEntries[i].leaf, "eth") { - interfacePathListRequest, err := lab_utils.SetPathListRequestFromJsonImport(pathToInterfaceConfig, mne.configEntries[i].leaf, mne.id, mnepb.ApiOperation_API_OPERATION_UPDATE, mne.configEntries[i].value, pndID) - if err != nil { - t.Error(err) - } - setResp, err := mneService.SetPathList(ctx, interfacePathListRequest) - if err != nil { - t.Error(err) - } - - // Force-push changes - err = lab_utils.ForcePush(setResp.GetResponses()[0].GetId(), pndID, mneService, ctx) + pathListRequest, err = lab_utils.SetPathListRequestFromJsonImport(pathToInterfaceConfig, mne.configEntries[i].leaf, mne.id, mnepb.ApiOperation_API_OPERATION_UPDATE, mne.configEntries[i].value, pndID) if err != nil { t.Error(err) } // Route change request } else if strings.Contains(mne.configEntries[i].leaf, "route") { - routePathListRequest, err := lab_utils.SetPathListRequestFromJsonImport(pathToRouteConfig, mne.configEntries[i].leaf, mne.id, mnepb.ApiOperation_API_OPERATION_UPDATE, mne.configEntries[i].value, pndID) - if err != nil { - t.Error(err) - } - setResp, err := mneService.SetPathList(ctx, routePathListRequest) + pathListRequest, err = lab_utils.SetPathListRequestFromJsonImport(pathToRouteConfig, mne.configEntries[i].leaf, mne.id, mnepb.ApiOperation_API_OPERATION_UPDATE, mne.configEntries[i].value, pndID) if err != nil { t.Error(err) } + } - // Force-push changes - err = lab_utils.ForcePush(setResp.GetResponses()[0].GetId(), pndID, mneService, ctx) - if err != nil { - t.Error(err) - } + // Set the requested path on managed network element + setResp, err := mneService.SetPathList(ctx, pathListRequest) + if err != nil { + t.Error(err) + } + + // Force-push changes + err = lab_utils.ForcePush(setResp.GetResponses()[0].GetId(), pndID, mneService, ctx) + if err != nil { + t.Error(err) } } } -- GitLab