Definitely seems to me a op-mode command to trigger a container rebuild would be appropriate.

How can I re-trigger the build of the container when I have changed the file?

HI @Viacheslav, this works even in 1.3, your problem is that you need to merge it with isis['FOO'] and not isis.

For example,

To wit, I already had this working with multiple networks (I had named them podman0/1/2/3/4/etc), but I wanted to simplify the initial PR here.

In T3766#100640, @Viacheslav wrote:

Network re-creates every time after reboot and gets configuration from "container network" section.
https://github.com/vyos/vyatta-cfg/blob/242f5685159f615ff79312041d3dde2063e5579a/scripts/init/vyos-router#L273-L277
So there is podman decide how to name this network.

In a different case, it tried to create a network which already been created.

Network re-creates every time after reboot and gets configuration from "container network" section.
https://github.com/vyos/vyatta-cfg/blob/242f5685159f615ff79312041d3dde2063e5579a/scripts/init/vyos-router#L273-L277
So there is podman decide how to name this network.

PR975

From conf mode I get error VyOS 1.4-rolling-202108130117

vyos@vyos-oobm# loadkey vyos scp://vyos@192.168.122.11:/etc/ssh/ssh_host_rsa_key.pub
Global symbol "$generate" requires explicit package name (did you forget to declare "my $generate"?) at /opt/vyatta/sbin/vyatta-load-user-key.pl line 162.
Execution of /opt/vyatta/sbin/vyatta-load-user-key.pl aborted due to compilation errors.
[edit]
vyos@vyos-oobm#

+1

The latest rolling 1.4-rolling-202108180805 should have it all.

from vyos.xml import defaults doesn't work for 1.3 correctly, for some reason it gets 2 isis process with same name "FOO"
https://github.com/sever-sever/vyos-1x/commit/7b0a33618bfa1d1ef99b9744ed1ded49a2c832af

vyos@r4-1.3# compare 
[edit protocols]
+isis FOO {
+    interface tun0 {
+    }
+    net 49.0001.0000.0011.0001.00
+}
[edit]
vyos@r4-1.3# commit
[ protocols isis FOO ]
{'FOO': {'interface': {'tun0': {}}, 'net': '49.0001.0000.0011.0001.00'},
 'lsp_mtu': '1497'}
Only one isis process can be defined

@c-po Thanks!!! :)

thanks for pushing and testing this featureset. Your requested changes will make it into the rolling image the next couple of days!

@darkdragon-001 It will be available in the next rolling release, can you test it?

PR for current https://github.com/vyos/vyos-1x/pull/974

Might be good to have a workaround in VyOS in the mean time

Thank's for opening an upstream bug

Fixed, 1.3-beta-202108151336

vyos@r4-1.3# run show conf com | match openvpn
set interfaces openvpn vtun10 encryption cipher 'aes256'
set interfaces openvpn vtun10 hash 'sha512'
set interfaces openvpn vtun10 local-host '192.168.122.14'
set interfaces openvpn vtun10 local-port '1194'
set interfaces openvpn vtun10 mode 'server'
set interfaces openvpn vtun10 persistent-tunnel
set interfaces openvpn vtun10 protocol 'udp'
set interfaces openvpn vtun10 server client client1 ip '10.10.0.10'
set interfaces openvpn vtun10 server domain-name 'vyos.net'
set interfaces openvpn vtun10 server max-connections '250'
set interfaces openvpn vtun10 server name-server '172.16.254.30'
set interfaces openvpn vtun10 server subnet '10.10.0.0/24'
set interfaces openvpn vtun10 server topology 'subnet'
set interfaces openvpn vtun10 tls ca-cert-file '/config/auth/ca.crt'
set interfaces openvpn vtun10 tls cert-file '/config/auth/central.crt'
set interfaces openvpn vtun10 tls dh-file '/config/auth/dh.pem'
set interfaces openvpn vtun10 tls key-file '/config/auth/central.key'
set interfaces openvpn vtun10 tls tls-version-min '1.0'
set interfaces openvpn vtun10 use-lzo-compression
[edit]
vyos@r4-1.3#
vyos@r4-1.3# set interfaces openvpn vtun10 authentication username foo
[edit]
vyos@r4-1.3# commit

I have just opened a GitHub issue for this at FRR as well: https://github.com/FRRouting/frr/issues/9405

Just checked, the behaviour for this bug is still the same.

more amount of generalisation as we would not only want to use it for DHCp but all kind of services

Well the commit you outlined alters file ins src/conf_mode - that directory is reserved for CLI configuration scripts.

I can confirm that this works fine on the latest 1.3 nightly.

Thanks, that makes sense. Do you think the current outstanding change could be merged in? It's not resulting in any incompatibilities (that I'm aware of), and while it doesn't fix the problem entirely on its own (doesn't include infrastructure work), it improves the code under test.

That is a noble idea. There are some build time tests available here: https://github.com/vyos/vyos-1x/tree/current/src/tests - maybe this helps

As far as I can tell (from README), smoke tests are meant more to be integration than unit tests:

that feels like you wan't to achieve the same goal as https://github.com/vyos/vyos-1x/blob/current/smoketest/scripts/cli/test_service_dhcp-server.py
I think the easiest way would be to just extend the smoketest with your tests that you find missing.

I managed to make the DHCP configuration testable, although the code has some hardcoded paths which I didn't want to mess with too much, so my addition may be suboptimal.

Merging this PR can fix this problem. Due to the complexity of the JSON parsing of NFT by the operation mode script, this task still needs to be tested, and the local test passes

@c-po It makes sense
Need to try.

Well test it tomorrow once it becomes available :)

They are all intermixed ;) - maybe I also missinterpreted the issue. Maybe you can retest the latest rolling which will be available by tomorrow? Image is currently build: https://ci.vyos.net/job/vyos-build/job/current/2195

https://github.com/vyos/vyos-build/pull/182

Nvm I just noticed that the task number was mentioned in a commit, I have a feeling this won't solve the issue as this is related to the router bgp 123 vrf something rather than vrf something statements.

Very cool this has apparently been fixed already, I was reading through the vyos-1x commints and didn't see anything that looked related. What was the implemented change for this?

https://github.com/vyos/vyos-1x/blob/595ab70a5d50ef1f9e166959affd96ea1ee8c8c8/data/templates/openvpn/server.conf.tmpl#L228

PR: https://github.com/vyos/vyos-1x/pull/969