From 63060ded3ed851d9ecc30f24e3b5cefde81c67d2 Mon Sep 17 00:00:00 2001 From: Taniadz Date: Tue, 10 Oct 2017 13:15:43 +0300 Subject: T413: Make a schema for op mode --- data/schemata/op-mode-definition.rnc | 113 ++++++++++++++++++++++ data/schemata/op-mode-definition.rng | 182 +++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+) create mode 100644 data/schemata/op-mode-definition.rnc create mode 100644 data/schemata/op-mode-definition.rng (limited to 'data') diff --git a/data/schemata/op-mode-definition.rnc b/data/schemata/op-mode-definition.rnc new file mode 100644 index 0000000..6b55997 --- /dev/null +++ b/data/schemata/op-mode-definition.rnc @@ -0,0 +1,113 @@ +# interface_definition.rnc: VyConf reference tree XML grammar +# +# Copyright (C) 2014. 2017 VyOS maintainers and contributors +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +# USA + +# The language of this file is compact form RELAX-NG +# http://relaxng.org/compact-tutorial-20030326.htm +# (unless converted to XML, then just RELAX-NG :) + +# Interface definition starts with interfaceDefinition tag that may contain node tags +start = element interfaceDefinition +{ + node* +} + +# node tag may contain node, leafNode, or tagNode tags +# Those are intermediate configuration nodes that may only contain +# other nodes and must not have values +node = element node +{ + (ownerAttr? & nodeNameAttr), + (properties? & children? & command?) +} + +# Tag nodes are containers for nodes without predefined names, like network interfaces +# or user names (e.g. "interfaces ethernet eth0" or "user jrandomhacker") +# Tag nodes may contain node and leafNode elements, and also nameConstraint tags +# They must not contain other tag nodes +tagNode = element tagNode +{ + (ownerAttr? & nodeNameAttr), + (properties? & children & command?) +} + +# Leaf nodes are terminal configuration nodes that can't have children, +# but can have values. + +leafNode = element leafNode +{ + nodeNameAttr, + command, + properties +} + +# Normal and tag nodes may have children +children = element children +{ + (node | tagNode | leafNode)+ +} + +# Nodes may have properties +# For simplicity, any property is allowed in any node, +# but whether they are used or not is implementation-defined + + +properties = element properties +{ + help? & + completionHelp* +} + +# All nodes must have "name" attribute +nodeNameAttr = attribute name +{ + text +} + +# Ordinary nodes and tag nodes can have "owner" attribute. +# Owner is the component that is notified when node changes. +ownerAttr = attribute owner +{ + text +} + + + +# help tags contains brief description of the purpose of the node +help = element help +{ + text +} + +command = element command +{ + text +} + +# completionHelp tags contain information about allowed values of a node that is used for generating +# tab completion in the CLI frontend and drop-down lists in GUI frontends +# It is only meaninful for leaf nodes +# Allowed values can be given as a fixed list of values (e.g. foo bar baz), +# as a configuration path (e.g. interfaces ethernet), +# or as a path to a script file that generates the list (e.g. +completionHelp = element completionHelp +{ + (element list { text })* & + (element path { text })* & + (element script { text })* +} \ No newline at end of file diff --git a/data/schemata/op-mode-definition.rng b/data/schemata/op-mode-definition.rng new file mode 100644 index 0000000..26256bd --- /dev/null +++ b/data/schemata/op-mode-definition.rng @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 59c1e9cec9c457917d0c7a7449ca1d5f31d37c05 Mon Sep 17 00:00:00 2001 From: Taniadz Date: Wed, 11 Oct 2017 15:27:22 +0300 Subject: T413: Make a schema for op mode (delete ownerAttr) --- data/schemata/op-mode-definition.rnc | 11 +++------ data/schemata/op-mode-definition.rng | 43 +++++++++--------------------------- 2 files changed, 14 insertions(+), 40 deletions(-) (limited to 'data') diff --git a/data/schemata/op-mode-definition.rnc b/data/schemata/op-mode-definition.rnc index 6b55997..0127612 100644 --- a/data/schemata/op-mode-definition.rnc +++ b/data/schemata/op-mode-definition.rnc @@ -32,7 +32,7 @@ start = element interfaceDefinition # other nodes and must not have values node = element node { - (ownerAttr? & nodeNameAttr), + nodeNameAttr, (properties? & children? & command?) } @@ -42,7 +42,7 @@ node = element node # They must not contain other tag nodes tagNode = element tagNode { - (ownerAttr? & nodeNameAttr), + nodeNameAttr, (properties? & children & command?) } @@ -79,12 +79,7 @@ nodeNameAttr = attribute name text } -# Ordinary nodes and tag nodes can have "owner" attribute. -# Owner is the component that is notified when node changes. -ownerAttr = attribute owner -{ - text -} + diff --git a/data/schemata/op-mode-definition.rng b/data/schemata/op-mode-definition.rng index 26256bd..98a231e 100644 --- a/data/schemata/op-mode-definition.rng +++ b/data/schemata/op-mode-definition.rng @@ -2,19 +2,19 @@ - - - - - - + - + - + @@ -67,33 +62,27 @@ --> - - - - - - + + - - + @@ -112,7 +101,6 @@ Nodes may have properties For simplicity, any property is allowed in any node, but whether they are used or not is implementation-defined - --> @@ -130,30 +118,21 @@ - - - - - - -