diff options
| author | John Estabrook <jestabro@vyos.io> | 2021-08-19 15:00:22 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2021-08-19 15:00:22 -0500 |
| commit | 50280c9ec8dbf87a5ddea65374c651fc379b4cb3 (patch) | |
| tree | 44ef694fec169339daba0e79add2767ae3a49837 /schema | |
| parent | ae6f94f8a910b91433a5133a96bfaae40ee34b4c (diff) | |
| download | vyos-1x-50280c9ec8dbf87a5ddea65374c651fc379b4cb3.tar.gz vyos-1x-50280c9ec8dbf87a5ddea65374c651fc379b4cb3.zip | |
T3768: Revert "xml: T1962: Add syntaxVersion to schema"
This reverts commit 5849ba88a1a20e4d3584843e0be46e456c5f7980.
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/interface_definition.rnc | 17 | ||||
| -rw-r--r-- | schema/interface_definition.rng | 18 |
2 files changed, 0 insertions, 35 deletions
diff --git a/schema/interface_definition.rnc b/schema/interface_definition.rnc index d7fc4966c..192a70024 100644 --- a/schema/interface_definition.rnc +++ b/schema/interface_definition.rnc @@ -24,16 +24,9 @@ # Interface definition starts with interfaceDefinition tag that may contain node tags start = element interfaceDefinition { - syntaxVersion*, node* } -# interfaceDefinition may contain syntax version attribute lists. -syntaxVersion = element syntaxVersion -{ - (componentAttr & versionAttr) -} - # 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 @@ -109,16 +102,6 @@ properties = element properties (element keepChildOrder { empty })? } -componentAttr = attribute component -{ - text -} - -versionAttr = attribute version -{ - text -} - # All nodes must have "name" attribute nodeNameAttr = attribute name { diff --git a/schema/interface_definition.rng b/schema/interface_definition.rng index 3ff60cf18..1ed18f456 100644 --- a/schema/interface_definition.rng +++ b/schema/interface_definition.rng @@ -29,22 +29,10 @@ <start> <element name="interfaceDefinition"> <zeroOrMore> - <ref name="syntaxVersion"/> - </zeroOrMore> - <zeroOrMore> <ref name="node"/> </zeroOrMore> </element> </start> - <!-- interfaceDefinition may contain syntax version attribute lists. --> - <define name="syntaxVersion"> - <element name="syntaxVersion"> - <interleave> - <ref name="componentAttr"/> - <ref name="versionAttr"/> - </interleave> - </element> - </define> <!-- node tag may contain node, leafNode, or tagNode tags Those are intermediate configuration nodes that may only contain @@ -213,12 +201,6 @@ </interleave> </element> </define> - <define name="componentAttr"> - <attribute name="component"/> - </define> - <define name="versionAttr"> - <attribute name="version"/> - </define> <!-- All nodes must have "name" attribute --> <define name="nodeNameAttr"> <attribute name="name"/> |