diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-05-14 04:47:12 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-05-14 05:38:59 +0200 |
| commit | 6a88f32eea3850d58411b854ba102a2baa978158 (patch) | |
| tree | 427a5d1b474a66843fb09a32591e48c1ed14e462 /schema | |
| parent | 32b6793b210505a2a69dc6f7615ddd5f66ad74b8 (diff) | |
| download | vyos-1x-6a88f32eea3850d58411b854ba102a2baa978158.tar.gz vyos-1x-6a88f32eea3850d58411b854ba102a2baa978158.zip | |
T633: build integration and minor fixes in the op mode command generator.
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/op-mode-definition.rnc | 5 | ||||
| -rw-r--r-- | schema/op-mode-definition.rng | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/schema/op-mode-definition.rnc b/schema/op-mode-definition.rnc index 01276123c..9c84de0e4 100644 --- a/schema/op-mode-definition.rnc +++ b/schema/op-mode-definition.rnc @@ -52,8 +52,7 @@ tagNode = element tagNode leafNode = element leafNode { nodeNameAttr, - command, - properties + (command & properties) } # Normal and tag nodes may have children @@ -105,4 +104,4 @@ completionHelp = element completionHelp (element list { text })* & (element path { text })* & (element script { text })* -}
\ No newline at end of file +} diff --git a/schema/op-mode-definition.rng b/schema/op-mode-definition.rng index 98a231e53..e9e7887cf 100644 --- a/schema/op-mode-definition.rng +++ b/schema/op-mode-definition.rng @@ -67,7 +67,9 @@ <optional> <ref name="properties"/> </optional> - <ref name="children"/> + <optional> + <ref name="children"/> + </optional> <optional> <ref name="command"/> </optional> @@ -81,8 +83,10 @@ <define name="leafNode"> <element name="leafNode"> <ref name="nodeNameAttr"/> - <ref name="command"/> - <ref name="properties"/> + <interleave> + <ref name="command"/> + <ref name="properties"/> + </interleave> </element> </define> <!-- Normal and tag nodes may have children --> |