Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
goSDN
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
danet
goSDN
Merge requests
!196
Add complex clab topology 1.0
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add complex clab topology 1.0
add-complex-clab-topology
into
develop
Overview
0
Commits
5
Pipelines
7
Changes
3
Merged
Felix Ohms
requested to merge
add-complex-clab-topology
into
develop
3 years ago
Overview
0
Commits
5
Pipelines
7
Changes
2
Expand
Description
Add a more complex network topology, modelled in containerlab.
Related Issue
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.
Edited
3 years ago
by
Felix Ohms
0
0
Merge request reports
Compare
version 2
version 6
46ad7d9b
3 years ago
version 5
fb197187
3 years ago
version 4
fb197187
3 years ago
version 3
ab5e5ac6
3 years ago
version 2
6465c55a
3 years ago
version 1
0a79a125
3 years ago
develop (base)
and
version 4
latest version
fa3c5e71
5 commits,
3 years ago
version 6
46ad7d9b
5 commits,
3 years ago
version 5
fb197187
4 commits,
3 years ago
version 4
fb197187
4 commits,
3 years ago
version 3
ab5e5ac6
3 commits,
3 years ago
version 2
6465c55a
2 commits,
3 years ago
version 1
0a79a125
1 commit,
3 years ago
Show latest version
2 files
+
36
−
11
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
build/ci/.containerlab-ci.yml
+
8
−
2
Options
@@ -42,7 +42,7 @@ variables:
containerlab:template:integration
:
extends
:
.containerlab_template
variables
:
CLAB_TEMPLATE
:
"
${CI_PROJECT_DIR}/test/containerlab/
int01
.clab.tmpl.yml"
CLAB_TEMPLATE
:
"
${CI_PROJECT_DIR}/test/containerlab/
complex-1.0
.clab.tmpl.yml"
rules
:
-
if
:
$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
-
if
:
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -53,12 +53,18 @@ containerlab:deploy:integration:
extends
:
.containerlab_deploy
needs
:
[
"
containerlab:template:integration"
,
"
build-docker"
]
script
:
-
cat ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml
-
sudo containerlab deploy --topo ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml --reconfigure
-
|
echo -e "\
GOSDN_HTTP_PORT=$(docker_host_port 8080 clab-${CLAB_NAME}-gosdn)\n\
GOSDN_GRPC_PORT=$(docker_host_port 55055 clab-${CLAB_NAME}-gosdn)\n\
CEOS1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1)" \
CEOS1_1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1-1)\n\
CEOS1_2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1-2)\n\
CEOS2_1_1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-1-1)\n\
CEOS2_1_2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-1-2)\n\
CEOS2_2_1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-2-1)\n\
CEOS2_2_2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-2-2)" \
> ${CI_PROJECT_DIR}/build.env
-
cat ${CI_PROJECT_DIR}/build.env
artifacts
:
Loading