From a268364cf1b176ef7246caac881baf51656c34c6 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 11 Dec 2024 11:47:17 +0000
Subject: [PATCH] Fixed EuCNC24 test:
- Updated Clab IP addresses
- Fixed endpoints in IETF L3VPN service
- Added correctness test for pings
---
src/tests/eucnc24/.gitlab-ci.yml | 46 +++++++++++++++----
src/tests/eucnc24/clab/eucnc24.clab.yml | 4 +-
.../eucnc24/data/ietf-l3vpn-service.json | 4 +-
3 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 8c5e9f20b..0225203b3 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -127,11 +127,24 @@ end2end_test eucnc24:
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-tfs-create.sh
# Run end-to-end test: test connectivity with ping
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.1'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.1'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.10'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.10'
+ - TEST1_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10')
+ - echo $TEST1_10
+ - echo $TEST1_10 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST1_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.1')
+ - echo $TEST1_1
+ - echo $TEST1_1 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST2_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.1')
+ - echo $TEST2_1
+ - echo $TEST2_1 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST2_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.10')
+ - echo $TEST2_10
+ - echo $TEST2_10 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST3_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.1')
+ - echo $TEST3_1
+ - echo $TEST3_1 | grep -E '3 packets transmitted, 0 received, 100\% packet loss'
+ - TEST3_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.10')
+ - echo $TEST3_10
+ - echo $TEST3_10 | grep -E '3 packets transmitted, 0 received, 100\% packet loss'
# Run end-to-end test: deconfigure service TFS
- >
@@ -148,11 +161,24 @@ end2end_test eucnc24:
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-ietf-create.sh
# Run end-to-end test: test connectivity with ping
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.1'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.1'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.10'
- - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.10'
+ - TEST1_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10')
+ - echo $TEST1_10
+ - echo $TEST1_10 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST1_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.1')
+ - echo $TEST1_1
+ - echo $TEST1_1 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST2_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.1')
+ - echo $TEST2_1
+ - echo $TEST2_1 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST2_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.2.10')
+ - echo $TEST2_10
+ - echo $TEST2_10 | grep -E '3 packets transmitted, 3 received, 0\% packet loss'
+ - TEST3_1=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.1')
+ - echo $TEST3_1
+ - echo $TEST3_1 | grep -E '3 packets transmitted, 0 received, 100\% packet loss'
+ - TEST3_10=$(sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.3.10')
+ - echo $TEST3_10
+ - echo $TEST3_10 | grep -E '3 packets transmitted, 0 received, 100\% packet loss'
# Run end-to-end test: deconfigure service IETF
- >
diff --git a/src/tests/eucnc24/clab/eucnc24.clab.yml b/src/tests/eucnc24/clab/eucnc24.clab.yml
index 807a1847c..c6b6ee070 100644
--- a/src/tests/eucnc24/clab/eucnc24.clab.yml
+++ b/src/tests/eucnc24/clab/eucnc24.clab.yml
@@ -49,7 +49,7 @@ topology:
dc1:
kind: linux
- mgmt-ipv4: 172.20.20.211
+ mgmt-ipv4: 172.20.20.201
exec:
- ip link set address 00:c1:ab:00:01:01 dev eth1
- ip address add 192.168.1.10/24 dev eth1
@@ -57,7 +57,7 @@ topology:
dc2:
kind: linux
- mgmt-ipv4: 172.20.20.221
+ mgmt-ipv4: 172.20.20.202
exec:
- ip link set address 00:c1:ab:00:02:01 dev eth1
- ip address add 192.168.2.10/24 dev eth1
diff --git a/src/tests/eucnc24/data/ietf-l3vpn-service.json b/src/tests/eucnc24/data/ietf-l3vpn-service.json
index a6297b28f..9eb70db54 100644
--- a/src/tests/eucnc24/data/ietf-l3vpn-service.json
+++ b/src/tests/eucnc24/data/ietf-l3vpn-service.json
@@ -11,7 +11,7 @@
"site-network-accesses": {
"site-network-access": [
{
- "site-network-access-id": "int",
+ "site-network-access-id": "eth1",
"site-network-access-type": "ietf-l3vpn-svc:multipoint",
"device-reference": "dc1",
"vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
@@ -48,7 +48,7 @@
"site-network-accesses": {
"site-network-access": [
{
- "site-network-access-id": "int",
+ "site-network-access-id": "eth1",
"site-network-access-type": "ietf-l3vpn-svc:multipoint",
"device-reference": "dc2",
"vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
--
GitLab