Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FoD
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
David Schmitz
FoD
Commits
9434ade7
Commit
9434ade7
authored
3 years ago
by
David Schmitz
Browse files
Options
Downloads
Patches
Plain Diff
vnet_router: update
parent
ff1b6fa0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile.vnet_router1
+6
-6
6 additions, 6 deletions
Dockerfile.vnet_router1
vnet_router/fod_vnet_router
+16
-2
16 additions, 2 deletions
vnet_router/fod_vnet_router
with
22 additions
and
8 deletions
Dockerfile.vnet_router1
+
6
−
6
View file @
9434ade7
...
...
@@ -55,17 +55,17 @@
# (built from router-container/Dockerfile , but currently fails to be rebuilt):
FROM cejkat/fod-router
# 2. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration)
COPY vnet_router/fod_vnet_router /
COPY vnet_router/snmp/pass_persisttest_bgpflowspec /
COPY vnet_router/snmp/snmp-release/pass_persisttest /
##
#
3
. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing)
#
2
. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing)
RUN apt-get -qqy update
RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp
# 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration)
COPY vnet_router/fod_vnet_router /
COPY vnet_router/snmp/pass_persisttest_bgpflowspec /
COPY vnet_router/snmp/snmp-release/pass_persisttest /
##
# 4. default start command:
...
...
This diff is collapsed.
Click to expand it.
vnet_router/fod_vnet_router
+
16
−
2
View file @
9434ade7
...
...
@@ -125,11 +125,25 @@ elif [ "$1" = "--loop" ]; then #arg
elif
[
"
$1
"
=
"--process1"
]
;
then
#arg
shift
1
"
$0
"
--get_netconf_data
"
$@
"
|
"
$0
"
--parse_netconf_to_ruleinfo
|
"
$0
"
--process_ruleinfo
tmpfile1
=
"
$(
mktemp
XXXXXXXXXXXX.list
)
"
set
-o
pipefail
"
$0
"
--get_netconf_data
"
$@
"
|
"
$0
"
--parse_netconf_to_ruleinfo
>
"
$tmpfile1
"
status1
=
"
$?
"
if
[
"
$status1
"
!=
0
]
;
then
echo
"
$0
: get_netconf_data failed:
$status1
"
1>&2
rm
-f
"
$tmpfile1
"
exit
"
$status1
"
else
"
$0
"
--process_ruleinfo
<
"
$tmpfile1
"
rm
-f
"
$tmpfile1
"
fi
elif
[
"
$1
"
=
"--get_ruleinfo"
]
;
then
#arg
shift
1
set
-o
pipefail
"
$0
"
--get_netconf_data
|
"
$0
"
--parse_netconf_to_ruleinfo
elif
[
"
$1
"
=
"--process_netconf"
]
;
then
#arg
...
...
@@ -152,6 +166,7 @@ elif [ "$1" = "--parse_netconf_to_ruleinfo" -o "$1" = "--parse" ]; then #arg
shift
1
which gawk &>/dev/null
||
apt-get
install
gawk 1>&2
exec
gawk
'
function esc1(val) {
...
...
@@ -212,7 +227,6 @@ elif [ "$1" = "--parse_netconf_to_ruleinfo" -o "$1" = "--parse" ]; then #arg
'
FS
=
'[<>]'
elif
[
"
$1
"
=
"--process_ruleinfo"
]
;
then
#arg
shift
1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment