summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-13 20:45:14 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-13 20:45:14 +0200
commit1a79ff11798a0fc790034bf6efd799491247c594 (patch)
tree13b7f8ac6e9823620194d04a493fc5eeae302b26
parent1eb6aee88f411127175fdab031d896af1e1adbc3 (diff)
downloadvyos-1x-1a79ff11798a0fc790034bf6efd799491247c594.tar.gz
vyos-1x-1a79ff11798a0fc790034bf6efd799491247c594.zip
op-mode: ipv6: move nd/rd command under "force ipv6"
-rw-r--r--op-mode-definitions/force-ipv6-nd.xml.in33
-rw-r--r--op-mode-definitions/force-ipv6-rd.xml.in34
-rw-r--r--op-mode-definitions/force-ipv6.xml.in67
3 files changed, 67 insertions, 67 deletions
diff --git a/op-mode-definitions/force-ipv6-nd.xml.in b/op-mode-definitions/force-ipv6-nd.xml.in
deleted file mode 100644
index 49de097f6..000000000
--- a/op-mode-definitions/force-ipv6-nd.xml.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
- <node name="force">
- <children>
- <node name="ipv6-nd">
- <properties>
- <help>IPv6 Neighbor Discovery</help>
- </properties>
- <children>
- <tagNode name="interface">
- <properties>
- <help>IPv6 Neighbor Discovery on specified interface</help>
- <completionHelp>
- <script>${vyos_completion_dir}/list_interfaces.py</script>
- </completionHelp>
- </properties>
- <children>
- <tagNode name="address">
- <properties>
- <help>IPv6 address of node to lookup</help>
- <completionHelp>
- <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
- </completionHelp>
- </properties>
- <command>/usr/bin/ndisc6 -m "$6" "$4"</command>
- </tagNode>
- </children>
- </tagNode>
- </children>
- </node>
- </children>
- </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/force-ipv6-rd.xml.in b/op-mode-definitions/force-ipv6-rd.xml.in
deleted file mode 100644
index 8c901af25..000000000
--- a/op-mode-definitions/force-ipv6-rd.xml.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
- <node name="force">
- <children>
- <node name="ipv6-rd">
- <properties>
- <help>IPv6 Router Discovery</help>
- </properties>
- <children>
- <tagNode name="interface">
- <properties>
- <help>IPv6 Router Discovery on specified interface</help>
- <completionHelp>
- <script>${vyos_completion_dir}/list_interfaces.py</script>
- </completionHelp>
- </properties>
- <command>/usr/bin/rdisc6 "$4"</command>
- <children>
- <tagNode name="address">
- <properties>
- <help>IPv6 address of target</help>
- <completionHelp>
- <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
- </completionHelp>
- </properties>
- <command>/usr/bin/rdisc6 -m "$6" "$4"</command>
- </tagNode>
- </children>
- </tagNode>
- </children>
- </node>
- </children>
- </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/force-ipv6.xml.in b/op-mode-definitions/force-ipv6.xml.in
new file mode 100644
index 000000000..7c2528148
--- /dev/null
+++ b/op-mode-definitions/force-ipv6.xml.in
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+ <node name="force">
+ <children>
+ <node name="ipv6">
+ <properties>
+ <help>IPv6 related commands</help>
+ </properties>
+ <children>
+ <node name="nd">
+ <properties>
+ <help>IPv6 Neighbor Discovery</help>
+ </properties>
+ <children>
+ <tagNode name="interface">
+ <properties>
+ <help>IPv6 Neighbor Discovery on specified interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ </properties>
+ <children>
+ <tagNode name="address">
+ <properties>
+ <help>IPv6 address of node to lookup</help>
+ <completionHelp>
+ <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>ndisc6 -m "$6" "$4"</command>
+ </tagNode>
+ </children>
+ </tagNode>
+ </children>
+ </node>
+ <node name="rd">
+ <properties>
+ <help>IPv6 Router Discovery</help>
+ </properties>
+ <children>
+ <tagNode name="interface">
+ <properties>
+ <help>IPv6 Router Discovery on specified interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ </properties>
+ <command>rdisc6 "$4"</command>
+ <children>
+ <tagNode name="address">
+ <properties>
+ <help>IPv6 address of target</help>
+ <completionHelp>
+ <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>rdisc6 -m "$6" "$4"</command>
+ </tagNode>
+ </children>
+ </tagNode>
+ </children>
+ </node>
+ </children>
+ </node>
+ </children>
+ </node>
+</interfaceDefinition>