Merge pull request #1631 from jrha/nmstate_schema

ncm-network: Throw error if commands used with nmstate
quattor · Sep 15, 2023 · d6ece90 · d6ece90
2 parents 705b3bd + d57c7f7
commit d6ece90
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ncm-network/src/main/pan/components/network/core-schema.pan b/ncm-network/src/main/pan/components/network/core-schema.pan
@@ -30,8 +30,9 @@ type structure_route = {
     "command" ? string with !match(SELF, '[;]')
 } with {
     if (exists(SELF['command'])) {
-        if (length(SELF) != 1)
-            error("Cannot use command and any of the other attributes as route");
+        module = value('/software/components/network/ncm-module', '');
+        if (module == 'nmstate') error("Command routes are not supported by the nmstate backend");
+        if (length(SELF) != 1) error("Cannot use command and any of the other attributes as route");
     } else {
         if (!exists(SELF['address']))
             error("Address is mandatory for route (in absence of command)");
@@ -80,8 +81,9 @@ type structure_rule = {
     "command" ? string with !match(SELF, '[;]')
 } with {
     if (exists(SELF['command'])) {
-        if (length(SELF) != 1)
-            error("Cannot use command and any of the other attributes as rule");
+        module = value('/software/components/network/ncm-module', '');
+        if (module == 'nmstate') error("Command routes are not supported by the nmstate backend");
+        if (length(SELF) != 1) error("Cannot use command and any of the other attributes as rule");
     } else {
         if (!exists(SELF['to']) && !exists(SELF['from'])) {
             error("Rule requires selector to or from (or use command)");