Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ntp: T6911: fix migration script to not allow empty "service ntp" CLI node #4315

Merged
merged 1 commit into from
Jan 24, 2025
Merged

ntp: T6911: fix migration script to not allow empty "service ntp" CLI node #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions smoketest/config-tests/basic-vyos-no-ntp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
set interfaces dummy dum0 address '172.18.254.203/32'
set interfaces ethernet eth0 duplex 'auto'
set interfaces ethernet eth0 offload gro
set interfaces ethernet eth0 offload gso
set interfaces ethernet eth0 offload sg
set interfaces ethernet eth0 offload tso
set interfaces ethernet eth0 speed 'auto'
set interfaces ethernet eth0 vif 203 address '172.18.203.10/24'
set interfaces ethernet eth1 duplex 'auto'
set interfaces ethernet eth1 offload gro
set interfaces ethernet eth1 offload gso
set interfaces ethernet eth1 offload sg
set interfaces ethernet eth1 offload tso
set interfaces ethernet eth1 speed 'auto'
set interfaces ethernet eth2 offload gro
set interfaces ethernet eth2 offload gso
set interfaces ethernet eth2 offload sg
set interfaces ethernet eth2 offload tso
set interfaces ethernet eth3 offload gro
set interfaces ethernet eth3 offload gso
set interfaces ethernet eth3 offload sg
set interfaces ethernet eth3 offload tso
set protocols ospf area 0 network '172.18.203.0/24'
set protocols ospf area 0 network '172.18.254.203/32'
set protocols ospf interface eth0.203 authentication md5 key-id 10 md5-key 'vyos'
set protocols ospf interface eth0.203 dead-interval '40'
set protocols ospf interface eth0.203 hello-interval '10'
set protocols ospf interface eth0.203 passive disable
set protocols ospf interface eth0.203 priority '1'
set protocols ospf interface eth0.203 retransmit-interval '5'
set protocols ospf interface eth0.203 transmit-delay '1'
set protocols ospf log-adjacency-changes detail
set protocols ospf parameters abr-type 'cisco'
set protocols ospf parameters router-id '172.18.254.201'
set protocols ospf passive-interface 'default'
set protocols ospf redistribute connected metric-type '2'
set service lldp interface all
set service ssh disable-host-validation
set service ssh port '22'
set system config-management commit-revisions '200'
set system conntrack modules ftp
set system conntrack modules h323
set system conntrack modules nfs
set system conntrack modules pptp
set system conntrack modules sip
set system conntrack modules sqlnet
set system conntrack modules tftp
set system console device ttyS0 speed '115200'
set system domain-name 'vyos.ci.net'
set system host-name 'no-ntp'
set system login user vyos authentication encrypted-password '$6$r/Yw/07NXNY$/ZB.Rjf9jxEV.BYoDyLdH.kH14rU52pOBtrX.4S34qlPt77chflCHvpTCq9a6huLzwaMR50rEICzA5GoIRZlM0'
set system login user vyos authentication plaintext-password ''
set system name-server '172.16.254.30'
set system syslog global facility all level 'debug'
set system syslog global facility local7 level 'debug'
set system time-zone 'Europe/Berlin'
142 changes: 142 additions & 0 deletions smoketest/configs/basic-vyos-no-ntp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
interfaces {
dummy dum0 {
address 172.18.254.203/32
}
ethernet eth0 {
duplex auto
offload {
gro
gso
sg
tso
}
speed auto
vif 203 {
address 172.18.203.10/24
ip {
ospf {
authentication {
md5 {
key-id 10 {
md5-key vyos
}
}
}
dead-interval 40
hello-interval 10
priority 1
retransmit-interval 5
transmit-delay 1
}
}
}
}
ethernet eth1 {
duplex auto
offload {
gro
gso
sg
tso
}
speed auto
}
ethernet eth2 {
offload {
gro
gso
sg
tso
}
}
ethernet eth3 {
offload {
gro
gso
sg
tso
}
}
}
protocols {
ospf {
area 0 {
network 172.18.203.0/24
network 172.18.254.203/32
}
log-adjacency-changes {
detail
}
parameters {
abr-type cisco
router-id 172.18.254.203
}
passive-interface default
passive-interface-exclude eth0.203
redistribute {
connected {
metric-type 2
}
}
}
}
service {
lldp {
interface all {
}
}
ssh {
disable-host-validation
port 22
}
}
system {
config-management {
commit-revisions 200
}
conntrack {
modules {
ftp
h323
nfs
pptp
sip
sqlnet
tftp
}
}
domain-name vyos.ci.net
console {
device ttyS0 {
speed 115200
}
}
host-name no-ntp
login {
user vyos {
authentication {
encrypted-password $6$r/Yw/07NXNY$/ZB.Rjf9jxEV.BYoDyLdH.kH14rU52pOBtrX.4S34qlPt77chflCHvpTCq9a6huLzwaMR50rEICzA5GoIRZlM0
plaintext-password ""
}
}
}
name-server 172.16.254.30
ntp {
}
syslog {
global {
facility all {
level debug
}
facility protocols {
level debug
}
}
}
time-zone Europe/Berlin
}


// Warning: Do not remove the following line.
// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@3:conntrack-sync@2:container@1:dhcp-relay@2:dhcp-server@6:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@23:ipoe-server@1:ipsec@5:isis@1:l2tp@3:lldp@1:mdns@1:nat@5:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@8:rpki@1:salt@1:snmp@2:ssh@2:sstp@3:system@21:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
// Release version: 1.3.8
7 changes: 6 additions & 1 deletion src/migration-scripts/ntp/1-to-2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023-2024 VyOS maintainers and contributors <maintainers@vyos.io>
# Copyright 2023-2025 VyOS maintainers and contributors <maintainers@vyos.io>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand All @@ -25,6 +25,11 @@ def migrate(config: ConfigTree) -> None:
# Nothing to do
return

# T6911: do not migrate NTP configuration if mandatory server is missing
if not config.exists(base_path + ['server']):
config.delete(base_path)
return

# config.copy does not recursively create a path, so create ['service'] if
# it doesn't yet exist, such as for config.boot.default
if not config.exists(['service']):
Expand Down
Loading