Merge pull request #4316 from c-po/ntp-ease-smoketest-T6911

smoketest: T6911: fix wrong router-id in loaded config validation

2 files changed, 3 insertions, 16 deletions

diff --git a/smoketest/config-tests/basic-vyos-no-ntp b/smoketest/config-tests/basic-vyos-no-ntp
index 81ff98fc9..a18260108 100644
--- a/smoketest/config-tests/basic-vyos-no-ntp
+++ b/smoketest/config-tests/basic-vyos-no-ntp
@@ -31,13 +31,10 @@ 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 parameters router-id '172.18.254.203'
 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 config-management commit-revisions '50'
 set system conntrack modules ftp
 set system conntrack modules h323
 set system conntrack modules nfs
diff --git a/smoketest/configs/basic-vyos-no-ntp b/smoketest/configs/basic-vyos-no-ntp
index d9adb7c8e..6fb8f384f 100644
--- a/smoketest/configs/basic-vyos-no-ntp
+++ b/smoketest/configs/basic-vyos-no-ntp
@@ -80,19 +80,9 @@ protocols {
         }
     }
 }
-service {
-    lldp {
-        interface all {
-        }
-    }
-    ssh {
-        disable-host-validation
-        port 22
-    }
-}
 system {
     config-management {
-        commit-revisions 200
+        commit-revisions 50
     }
     conntrack {
         modules {