networking-tools: Add nmstate

As discussed at [1] the nmstatectl tool is going to be added to FCOS, it will allow to declare the network configuration at boot time [1] coreos/fedora-coreos-tracker#1175 Signed-off-by: Enrique Llorente <ellorent@redhat.com>
qinqon · Mar 17, 2023 · c7ab8d2 · c7ab8d2
1 parent 7205d41
commit c7ab8d2
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 0 deletions.
diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
@@ -14,3 +14,8 @@ packages:
     metadata:
       bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-5a7c2a5c5b
       type: fast-track
+  nmstate:
+    evr: 2.2.8-2.fc37
+    metadata:
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-59543876eb
+      type: fast-track
diff --git a/manifests/networking-tools.yaml b/manifests/networking-tools.yaml
@@ -19,3 +19,6 @@ packages:
   - iptables nftables
   # Interactive network tools for admins
   - socat net-tools bind-utils
+  # Declarative network configuration
+  # https://github.com/coreos/fedora-coreos-tracker/issues/1175
+  - nmstate
diff --git a/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset b/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset
@@ -32,3 +32,6 @@ enable rtas_errd.service
 enable clevis-luks-askpass.path
 # Provide status information about the Ignition run
 enable coreos-ignition-write-issues.service
+# Apply network configuration from /etc/nmstate/*.yml
+# We can drop this after merging https://src.fedoraproject.org/rpms/fedora-release/pull-request/255
+enable nmstate.service
diff --git a/tests/kola/networking/nmstate/data/nmstate-common.sh b/tests/kola/networking/nmstate/data/nmstate-common.sh
@@ -0,0 +1,28 @@
+. $KOLA_EXT_DATA/commonlib.sh
+
+run-checks() {
+    local prefix=$1
+    if ! nmcli c show br-ex ; then
+        nmstatectl show
+        journalctl -u nmstate
+        fatal "${prefix}: bridge not configured"
+    fi
+    ok "${prefix}: bridge configured correctly"
+}
+
+main() {
+    case "${AUTOPKGTEST_REBOOT_MARK:-}" in
+      "")
+            run-checks "first boot"
+            /tmp/autopkgtest-reboot rebooted
+            ;;
+
+      rebooted)
+            run-checks "second boot"
+            if ! ls /etc/nmstate/*applied; then
+                fatal "nmstate yamls files not marked as applied"    
+            fi
+            ;;
+      *) fatal "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}";;
+    esac
+}
diff --git a/tests/kola/networking/nmstate/policy/config.bu b/tests/kola/networking/nmstate/policy/config.bu
@@ -0,0 +1,24 @@
+variant: fcos
+version: 1.4.0
+storage:
+  files:
+    - path: /etc/nmstate/br-ex-policy.yml
+      contents:
+        inline: |
+          capture:
+            default-gw-route: routes.running.destination=="0.0.0.0/0"
+            default-gw-iface: interfaces.name==capture.default-gw-route.routes.running.0.next-hop-interface
+          desiredState:
+            interfaces:
+            - name: "{{ capture.default-gw-iface.interfaces.0.name }}"
+              type: ethernet
+              state: up
+            - name: br-ex
+              type: linux-bridge
+              copy-mac-from: "{{ capture.default-gw-iface.interfaces.0.name }}"
+              state: up
+              ipv4: "{{ capture.default-gw-iface.interfaces.0.ipv4 }}"
+              ipv6: "{{ capture.default-gw-iface.interfaces.0.ipv6 }}"
+              bridge:
+                port:
+                - name: "{{ capture.default-gw-iface.interfaces.0.name }}"
diff --git a/tests/kola/networking/nmstate/policy/data/commonlib.sh b/tests/kola/networking/nmstate/policy/data/commonlib.sh
@@ -0,0 +1 @@
+../../../data/commonlib.sh
diff --git a/tests/kola/networking/nmstate/policy/data/nmstate-common.sh b/tests/kola/networking/nmstate/policy/data/nmstate-common.sh
@@ -0,0 +1 @@
+../../data/nmstate-common.sh
diff --git a/tests/kola/networking/nmstate/policy/test.sh b/tests/kola/networking/nmstate/policy/test.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+## kola:
+##   tags: "platform-independent"
+#
+# Configure a DHCP linux bridge using butane and nmstate service with policy
+
+set -xeuo pipefail
+
+. $KOLA_EXT_DATA/nmstate-common.sh
+
+main
diff --git a/tests/kola/networking/nmstate/state/config.bu b/tests/kola/networking/nmstate/state/config.bu
@@ -0,0 +1,17 @@
+variant: fcos
+version: 1.4.0
+storage:
+  files:
+    - path: /etc/nmstate/br-ex.yml
+      contents:
+        inline: |
+          interfaces:
+           - name: br-ex
+             type: linux-bridge
+             state: up
+             ipv4:
+               enabled: false
+             ipv6:
+               enabled: false
+             bridge:
+               port: []
diff --git a/tests/kola/networking/nmstate/state/data/commonlib.sh b/tests/kola/networking/nmstate/state/data/commonlib.sh
@@ -0,0 +1 @@
+../../../data/commonlib.sh
diff --git a/tests/kola/networking/nmstate/state/data/nmstate-common.sh b/tests/kola/networking/nmstate/state/data/nmstate-common.sh
@@ -0,0 +1 @@
+../../data/nmstate-common.sh
diff --git a/tests/kola/networking/nmstate/state/test.sh b/tests/kola/networking/nmstate/state/test.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+## kola:
+##   tags: "platform-independent"
+#
+# Configure a DHCP linux bridge using butane and nmstate service with state
+
+set -xeuo pipefail
+
+. $KOLA_EXT_DATA/nmstate-common.sh
+
+main