Skip to content
Snippets Groups Projects
Commit 2e6a7a29 authored by Katharina Renk's avatar Katharina Renk
Browse files

restructure lab integration test environment

parent 6d47909e
No related branches found
No related tags found
2 merge requests!784Draft: Resolve "Integration test for Lab01",!757Draft: Resolve "Integration test for Lab01"
Pipeline #184813 failed
package integration_test_labs package integration_test_lab_00
import ( import (
"context" "context"
"fmt" "fmt"
"testing" "testing"
lab_utility "code.fbi.h-da.de/danet/gosdn/-/tree/349-integration-test-for-lab01/integration-tests/lab_tests/utils/labUtils"
mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement" mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
integration_test_utils "code.fbi.h-da.de/danet/gosdn/integration-tests/integrationTestUtils" integration_test_utils "code.fbi.h-da.de/danet/gosdn/integration-tests/integrationTestUtils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
...@@ -80,7 +81,7 @@ func TestLab00(t *testing.T) { ...@@ -80,7 +81,7 @@ func TestLab00(t *testing.T) {
// Create the two managed network elements. // Create the two managed network elements.
for i, mne := range managedNetworkElements { for i, mne := range managedNetworkElements {
alr := createAddListRequestSingleMne(mne.addr, mne.name, mne.id, integration_test_utils.DefaultTargetUsername, integration_test_utils.DefaultTargetPassword) alr := lab_utility.createAddListRequestSingleMne(mne.addr, mne.name, mne.id, integration_test_utils.DefaultTargetUsername, integration_test_utils.DefaultTargetPassword)
_, err := mneService.AddList(ctx, alr) _, err := mneService.AddList(ctx, alr)
if err != nil { if err != nil {
...@@ -102,7 +103,7 @@ func TestLab00(t *testing.T) { ...@@ -102,7 +103,7 @@ func TestLab00(t *testing.T) {
// Check the initial hostname of both managed network elements. // Check the initial hostname of both managed network elements.
for _, mne := range managedNetworkElements { for _, mne := range managedNetworkElements {
hostnameRequest := getHostnameSingleMne(mne.id) hostnameRequest := lab_utility.getHostnameSingleMne(mne.id)
resp, err := mneService.GetPath(ctx, hostnameRequest) resp, err := mneService.GetPath(ctx, hostnameRequest)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
...@@ -115,7 +116,7 @@ func TestLab00(t *testing.T) { ...@@ -115,7 +116,7 @@ func TestLab00(t *testing.T) {
// Change the hostname of both managed network elements. // Change the hostname of both managed network elements.
for _, mne := range managedNetworkElements { for _, mne := range managedNetworkElements {
hostnamePathListRequest, err := setHostnamePathListRequestSingleMne(mne.id, mne.newHostname, mnepb.ApiOperation_API_OPERATION_UPDATE) hostnamePathListRequest, err := lab_utility.setHostnamePathListRequestSingleMne(mne.id, mne.newHostname, mnepb.ApiOperation_API_OPERATION_UPDATE)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -128,14 +129,14 @@ func TestLab00(t *testing.T) { ...@@ -128,14 +129,14 @@ func TestLab00(t *testing.T) {
assert.Equal(t, 1, len(setResp.GetResponses()), "A single path change for the hostname has been requested. Therefore exactly one response is expected.") assert.Equal(t, 1, len(setResp.GetResponses()), "A single path change for the hostname has been requested. Therefore exactly one response is expected.")
// Commit the change. // Commit the change.
commitChange := commitOrConfirmChange(setResp.GetResponses()[0].GetId(), mnepb.Operation_OPERATION_COMMIT) commitChange := lab_utility.commitOrConfirmChange(setResp.GetResponses()[0].GetId(), mnepb.Operation_OPERATION_COMMIT)
_, err = mneService.SetChangeList(ctx, commitChange) _, err = mneService.SetChangeList(ctx, commitChange)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
// Confirm the change. // Confirm the change.
confirmChange := commitOrConfirmChange(setResp.GetResponses()[0].GetId(), mnepb.Operation_OPERATION_CONFIRM) confirmChange := lab_utility.commitOrConfirmChange(setResp.GetResponses()[0].GetId(), mnepb.Operation_OPERATION_CONFIRM)
_, err = mneService.SetChangeList(ctx, confirmChange) _, err = mneService.SetChangeList(ctx, confirmChange)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
...@@ -145,7 +146,7 @@ func TestLab00(t *testing.T) { ...@@ -145,7 +146,7 @@ func TestLab00(t *testing.T) {
// Check if the hostname has been changed and is accessible through a // Check if the hostname has been changed and is accessible through a
// GetPath request. // GetPath request.
for _, mne := range managedNetworkElements { for _, mne := range managedNetworkElements {
hostnameRequest := getHostnameSingleMne(mne.id) hostnameRequest := lab_utility.getHostnameSingleMne(mne.id)
resp, err := mneService.GetPath(ctx, hostnameRequest) resp, err := mneService.GetPath(ctx, hostnameRequest)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
......
package integration_test_labs package lab_utils
import ( import (
mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement" mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"github.com/openconfig/ygot/ygot" "github.com/openconfig/ygot/ygot"
) )
func getHostnameSingleMne(mneId string) *mnepb.GetPathRequest { func GetHostnameSingleMne(mneId string, pndID string) *mnepb.GetPathRequest {
gpr := &mnepb.GetPathRequest{ gpr := &mnepb.GetPathRequest{
Timestamp: integration_test_utils.GetTimestamp(), Timestamp: integration_test_utils.GetTimestamp(),
Mneid: mneId, Mneid: mneId,
...@@ -19,7 +19,7 @@ func getHostnameSingleMne(mneId string) *mnepb.GetPathRequest { ...@@ -19,7 +19,7 @@ func getHostnameSingleMne(mneId string) *mnepb.GetPathRequest {
return gpr return gpr
} }
func commitOrConfirmChange(cid string, operation mnepb.Operation) *mnepb.SetChangeListRequest { func CommitOrConfirmChange(cid string, operation mnepb.Operation, pndID string) *mnepb.SetChangeListRequest {
sclr := &mnepb.SetChangeListRequest{ sclr := &mnepb.SetChangeListRequest{
Timestamp: integration_test_utils.GetTimestamp(), Timestamp: integration_test_utils.GetTimestamp(),
Change: []*mnepb.SetChange{{ Change: []*mnepb.SetChange{{
...@@ -31,7 +31,7 @@ func commitOrConfirmChange(cid string, operation mnepb.Operation) *mnepb.SetChan ...@@ -31,7 +31,7 @@ func commitOrConfirmChange(cid string, operation mnepb.Operation) *mnepb.SetChan
return sclr return sclr
} }
func setHostnamePathListRequestSingleMne(mneId string, newHostname string, operation mnepb.ApiOperation) (*mnepb.SetPathListRequest, error) { func SetHostnamePathListRequestSingleMne(mneId string, newHostname string, operation mnepb.ApiOperation) (*mnepb.SetPathListRequest, error) {
hostnamePath, err := ygot.StringToStructuredPath("/system/config/hostname") hostnamePath, err := ygot.StringToStructuredPath("/system/config/hostname")
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -55,7 +55,7 @@ func setHostnamePathListRequestSingleMne(mneId string, newHostname string, opera ...@@ -55,7 +55,7 @@ func setHostnamePathListRequestSingleMne(mneId string, newHostname string, opera
return splr, nil return splr, nil
} }
func createAddListRequestSingleMne(addr, name, id, username, password string) *mnepb.AddListRequest { func CreateAddListRequestSingleMne(addr, name, id, username, password string, pndID string) *mnepb.AddListRequest {
opt := &tpb.TransportOption{ opt := &tpb.TransportOption{
Address: addr, Address: addr,
Username: username, Username: username,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment