summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Jenkinsfile14
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/quagga@4 (renamed from cfg-version/quagga@3)0
-rw-r--r--interface-templates/ip/ospf/bandwidth/node.def6
-rw-r--r--interface-templates/ip/ospf/retransmit-interval/node.def2
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def3
-rw-r--r--templates/protocols/bgp/node.tag/parameters/scan-time/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def3
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def12
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def13
13 files changed, 37 insertions, 30 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index b11267ec..3b8daeb1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,7 +73,8 @@ pipeline {
agent {
docker {
args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006'
- image 'vyos/vyos-build:equuleus'
+ image 'vyos/vyos-build:current'
+ alwaysPull true
}
}
options {
@@ -87,7 +88,8 @@ pipeline {
steps {
script {
dir('build') {
- git branch: getGitBranchName(), url: getGitRepoURL()
+ git branch: getGitBranchName(),
+ url: getGitRepoURL()
}
}
}
@@ -96,7 +98,10 @@ pipeline {
steps {
script {
dir('build') {
- sh "dpkg-buildpackage -b -us -uc -tc"
+ def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim()
+ currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1])
+
+ sh 'dpkg-buildpackage -b -us -uc -tc'
}
}
}
@@ -118,9 +123,6 @@ pipeline {
// every option over and over again!
def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/'
- if (getGitBranchName() != "equuleus")
- VYOS_REPO_PATH += 'vyos/'
-
def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR'
def SSH_REMOTE = 'khagen@10.217.48.113'
diff --git a/Makefile.am b/Makefile.am
index 434de372..cd4b1ba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ share_perl5_DATA = lib/Vyatta/Quagga/Config.pm
src_check_prefix_boundary = src/check_prefix_boundary.c
-curver_DATA = cfg-version/quagga@3
+curver_DATA = cfg-version/quagga@4
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
diff --git a/cfg-version/quagga@3 b/cfg-version/quagga@4
index e69de29b..e69de29b 100644
--- a/cfg-version/quagga@3
+++ b/cfg-version/quagga@4
diff --git a/interface-templates/ip/ospf/bandwidth/node.def b/interface-templates/ip/ospf/bandwidth/node.def
index 9de76350..1919251b 100644
--- a/interface-templates/ip/ospf/bandwidth/node.def
+++ b/interface-templates/ip/ospf/bandwidth/node.def
@@ -1,7 +1,7 @@
type: u32
-help: Bandwidth of interface (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; "Must be between 1-10000000"
-val_help: u32:1-10000000; Bandwidth in kilobits/sec (for calculating OSPF cost)
+help: Bandwidth of interface (megabits/sec)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 100000; "Must be between 1-100000"
+val_help: u32:1-100000; Bandwidth in megabits/sec (for calculating OSPF cost)
update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)"
delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth"
diff --git a/interface-templates/ip/ospf/retransmit-interval/node.def b/interface-templates/ip/ospf/retransmit-interval/node.def
index ca4de11e..58b94791 100644
--- a/interface-templates/ip/ospf/retransmit-interval/node.def
+++ b/interface-templates/ip/ospf/retransmit-interval/node.def
@@ -2,7 +2,7 @@ type: u32
help: Interval between retransmitting lost link state advertisements
default: 5
syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-val_help: u32: 3-65535; Retransmit interval in seconds (default 5)
+val_help: u32:3-65535; Retransmit interval in seconds (default 5)
update: vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "ip ospf retransmit-interval $VAR(@)"
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 9a816344..a99b7897 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -764,10 +764,6 @@ my %qcom = (
set => 'router bgp #3 ; bgp router-id #6',
del => 'router bgp #3 ; no bgp router-id #6',
},
- 'protocols bgp var parameters scan-time' => {
- set => 'router bgp #3 ; bgp scan-time #6',
- del => 'router bgp #3 ; no bgp scan-time #6',
- },
'protocols bgp var peer-group' => {
set => undef,
del => undef,
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
index 82dde319..b378b2f4 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
@@ -1,2 +1,2 @@
help: Remove private AS numbers from AS path in outbound IPv4-route updates
-commit:expression: $VAR(../../../remote-as/@) != $VAR(../../../../@); "you can't set remove-private-as for an iBGP peer"
+commit:expression: exec "test $VAR(../../../remote-as/@) -ne $VAR(../../../../@)"; "you can't set remove-private-as for an iBGP peer"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
index c1b03f4f..9b73cfdf 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
@@ -1,3 +1,2 @@
help: Remove private AS numbers from AS path in outbound route updates
-commit:expression: $VAR(../../../remote-as/@) != $VAR(../../../../@); "you can't set remove-private-as for an iBGP peer"
-
+commit:expression: exec "test $VAR(../../../remote-as/@) -ne $VAR(../../../../@)"; "you can't set remove-private-as for an iBGP peer"
diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
deleted file mode 100644
index 5a009f86..00000000
--- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: BGP route scanner interval
-val_help: u32:5-60; Scan interval in seconds
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds"
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index 3a5c98de..afaad490 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -13,7 +13,8 @@ end:expression: "\
vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no area $VAR(../../../../@) \
- virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
+ virtual-link $VAR(../../../@) message-digest-key $VAR(@) \
+ md5 _\"; \
rm /tmp/ospf-md5.$PPID; \
else \
vtysh -c \"configure terminal\" \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index 312efb87..e04a2036 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -4,7 +4,7 @@ commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password alre
create: vtysh -c "configure terminal" \
-c "router ospf" \
-c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
- authentication-key" \
+ authentication-key _" \
-c "area $VAR(../../../@) virtual-link $VAR(../../@) \
authentication message-digest";
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
index b0f807de..9911dd16 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
@@ -3,9 +3,15 @@ help: Advertise stub-router prior to full shutdown of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
-update:expression: "vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"max-metric router-lsa on-shutdown $VAR(@)\"; "
+update:
+ METRIC=$VAR(@)
+ if [ $METRIC -gt 100 ]; then
+ echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100";
+ METRIC=100;
+ fi
+ vtysh -c "configure terminal" \
+ -c "router ospf" \
+ -c "max-metric router-lsa on-shutdown $METRIC"
delete:expression: "vtysh -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
index d54d3012..2992ed48 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
@@ -3,10 +3,17 @@ help: Automatically advertise stub Router-LSA on startup of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
-update:expression: "vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"max-metric router-lsa on-startup $VAR(@)\"; "
+update:
+ METRIC=$VAR(@)
+ if [ $METRIC -gt 100 ]; then
+ echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100";
+ METRIC=100;
+ fi
+ vtysh -c "configure terminal" \
+ -c "router ospf" \
+ -c "max-metric router-lsa on-startup $METRIC"
delete:expression: "vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no max-metric router-lsa on-startup \"; "
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 13:38:28 +0000