refact: Renamed netmask property to network-mask

Author: simonwalz

system/cuos/init.sh

@@ -367,8 +367,8 @@ configure_network() {
           .routes // empty |
           (if type=="array" then .[] else . end) |
           (.network // "") as $d |
+          (."network-mask" // "") as $m |
           (.gateway // "") as $g |
-          (.netmask // "") as $m |
           [$d, $g, $m] | @tsv' |
         while IFS=$'\t' read -r RDEST RGW RMASK; do
           if [ -z "$RDEST" ] || [ -z "$RGW" ]; then

system/cuos/init.test.sh

@@ -90,7 +90,7 @@ expect \
 export CONFIG_PATH="${SCRIPT_DIR}/init.test.system2.json"
 expect \
   "configure_network 2: eth0: 155.7, eth1: dhcp" \
-  $'auto lo\niface lo inet loopback\n\nauto eth0\niface eth0 inet static\n    address 192.168.155.7\n    netmask 255.255.255.128\n    gateway 192.168.155.1\n    dns-nameservers 192.168.155.1 192.168.155.2\n    ntp-servers 192.168.155.1 192.168.155.2\n\n    up ip route add 192.168.77.0/11 via 255.255.255.0 dev eth0\n    down ip route del 192.168.77.0/11 via 255.255.255.0 dev eth0\nauto eth1\niface eth1 inet dhcp\n    metric 20' \
+  $'auto lo\niface lo inet loopback\n\nauto eth0\niface eth0 inet static\n    address 192.168.155.7\n    netmask 255.255.255.128\n    gateway 192.168.155.1\n    dns-nameservers 192.168.155.1 192.168.155.2\n    ntp-servers 192.168.155.1 192.168.155.2\n\n    up ip route add 192.168.77.0/24 via 192.168.155.1 dev eth0\n    down ip route del 192.168.77.0/24 via 192.168.155.1 dev eth0\nauto eth1\niface eth1 inet dhcp\n    metric 20' \
   configure_network
 
 export CONFIG_PATH="${SCRIPT_DIR}/init.test.system3.json"

system/cuos/init.test.system2.json

@@ -13,8 +13,8 @@
       "routes": [
         {
           "network": "192.168.77.0",
-          "gateway": "255.255.255.0",
-          "netmask": "192.168.155.1"
+          "network-mask": "255.255.255.0",
+          "gateway": "192.168.155.1"
         }
       ]
     },

system/cuos/system-schema.json

@@ -82,17 +82,17 @@
                     "description": "Alias for destination (used by CuOS)",
                     "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}(/\\d{1,2})?$"
                   },
-                  "gateway": {
-                    "type": "string",
-                    "description": "Next-hop IPv4 address for the route",
-                    "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$"
-                  },
-                  "netmask": {
+                  "network-mask": {
                     "description": "Subnet mask for the destination. Accepts dotted-decimal (e.g. '255.255.255.0') or numeric prefix (e.g. 24).",
                     "oneOf": [
                       { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$" },
                       { "type": "integer", "minimum": 0, "maximum": 32 }
                     ]
+                  },
+                  "gateway": {
+                    "type": "string",
+                    "description": "Next-hop IPv4 address for the route",
+                    "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$"
                   }
                 },
                 "additionalProperties": false
@@ -103,8 +103,8 @@
                   "type": "object",
                   "properties": {
                     "network": { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}(/\\d{1,2})?$" },
-                    "gateway": { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$" },
-                    "netmask": { "oneOf": [ { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$" }, { "type": "integer", "minimum": 0, "maximum": 32 } ] }
+                    "network-mask": { "oneOf": [ { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$" }, { "type": "integer", "minimum": 0, "maximum": 32 } ] },
+                    "gateway": { "type": "string", "pattern": "^\\d{1,3}(\\.\\d{1,3}){3}$" }
                   },
                   "additionalProperties": false
                 }