Initial commit of config commands for ospfv3

80 files changed, 600 insertions, 0 deletions

diff --git a/templates/interfaces/ethernet/node.tag/ipv6/node.def b/templates/interfaces/ethernet/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/node.def b/templates/interfaces/loopback/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/node.def b/templates/interfaces/multilink/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/multilink/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/multilink/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/node.def b/templates/interfaces/tunnel/node.tag/ipv6/node.def
new file mode 100644
index 00000000..6ad8bff4
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..2c653c8f
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 cost $VAR(@) \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/dead-interval/node.def
new file mode 100644
index 00000000..fcc3be00
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/dead-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval after which a neighbor is declared dead
+default: 40
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 dead-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/hello-interval/node.def
new file mode 100644
index 00000000..ae277b4c
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/hello-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between hello packets
+default: 10
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+       -c \"ipv6 ospf6 hello-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..b6b84a87
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
+        -c \"no ipv6 ospf6 ifmtu \"; "
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..4df3aea7
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set instance-id for this  interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/node.def
new file mode 100644
index 00000000..05014493
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/node.def
@@ -0,0 +1 @@
+help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..d5a43377
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,7 @@
+help: Disable forming of adjacency on this interface
+create:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 passive\"; "
+delete:expression: "vyatta-vtysh 
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..efd10574
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 priority $VAR(@)\"; "
+comp_help: possible completions:
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/retransmit-interval/node.def
new file mode 100644
index 00000000..34651d7a
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/retransmit-interval/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set interval between retransmitting lost link state advertisements
+default: 5
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
+comp_help: possible completions:
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/transmit-delay/node.def
new file mode 100644
index 00000000..0b623a42
--- /dev/null
+++ b/templates/interfaces/tunnel/node.tag/ipv6/ospfv3/transmit-delay/node.def
@@ -0,0 +1,9 @@
+type: u32
+help: Set link state transmit delay
+default: 1
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "vyatta-vtysh              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+       -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
+comp_help: possible completions:
+ <1-65535>          Seconds (default 1)
diff --git a/templates/protocols/ospfv3/area/node.def b/templates/protocols/ospfv3/area/node.def
new file mode 100644
index 00000000..244756b2
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.def
@@ -0,0 +1,6 @@
+tag:
+type: txt
+help: Set OSPFv3 Area
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFPv3 area \"$VAR(@)\" "
+comp_help: possible completions:
+ <x.x.x.x>          Set OSPFv3 area in dotted decimal notation
diff --git a/templates/protocols/ospfv3/area/node.tag/export-list/node.def b/templates/protocols/ospfv3/area/node.tag/export-list/node.def
new file mode 100644
index 00000000..ff984240
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/export-list/node.def
@@ -0,0 +1,8 @@
+type: txt
+help: Set name of export-list 
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"area $VAR(../@) export-list $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no area $VAR(../@) export-list $VAR(@) \"; "
diff --git a/templates/protocols/ospfv3/area/node.tag/filter-list/node.def b/templates/protocols/ospfv3/area/node.tag/filter-list/node.def
new file mode 100644
index 00000000..358fa36c
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/filter-list/node.def
@@ -0,0 +1,3 @@
+tag:
+type: txt
+help: Set filter-list
\ No newline at end of file
diff --git a/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def
new file mode 100644
index 00000000..eb63a9c2
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def
@@ -0,0 +1,10 @@
+tag:
+type: txt
+help: Set direction of filter (in|out)
+allowed: echo "in out"
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"area $VAR(../../@) filter-list $VAR(../@) $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no area $VAR(../../@) filter-list $VAR(../@) $VAR(@) \"; "
diff --git a/templates/protocols/ospfv3/area/node.tag/import-list/node.def b/templates/protocols/ospfv3/area/node.tag/import-list/node.def
new file mode 100644
index 00000000..9409e9d1
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/import-list/node.def
@@ -0,0 +1,8 @@
+type: txt
+help: Set name of import-list 
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"area $VAR(../@) import-list $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no area $VAR(../@) import-list $VAR(@) \"; "
diff --git a/templates/protocols/ospfv3/area/node.tag/interface/node.def b/templates/protocols/ospfv3/area/node.tag/interface/node.def
new file mode 100644
index 00000000..384a225f
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/interface/node.def
@@ -0,0 +1,17 @@
+type: txt
+help: Set OSPFv3 area interface
+create:expression: "vyatta-vtysh --noerror -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no interface $VAR(@) area $VAR(../@) \"; "
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"interface $VAR(@) area $VAR(../@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no interface $VAR(@) area $VAR(../@) \"; "
+
+allowed: for dev in /sys/class/net/*; 
+         do if [[ -d $dev && -L $dev/device ]]
+	    then echo -n ${dev##*/} " "
+            fi
+         done
diff --git a/templates/protocols/ospfv3/area/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/node.def
new file mode 100644
index 00000000..03cac4e1
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/node.def
@@ -0,0 +1 @@
+help: Set OSPFv3 area parameters
\ No newline at end of file
diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.def
new file mode 100644
index 00000000..4df392fc
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/range/node.def
@@ -0,0 +1,20 @@
+tag:
+type: ipv6net
+help: Set to spcify IPv6 prefix (border routers only)
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+
+delete: touch /tmp/ospf6-range.$PPID
+
+end: if [ -f /tmp/ospf6-range.$PPID ]; then
+        vyatta-vtysh -c "configure terminal" \
+          -c "router ospf6"                                        \
+          -c "no area $VAR(../@) range $VAR(@)";
+        rm /tmp/ospf6-range.$PPID;
+     else
+        vyatta-vtysh --noerror -c "configure terminal" \
+          -c "router ospf6"                                               \
+          -c "no area $VAR(../@) range $VAR(@)";
+        vyatta-vtysh -c "configure terminal" \
+          -c "router ospf6"                                        \
+          -c "area $VAR(../@) range $VAR(@)";
+     fi;
diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def
new file mode 100644
index 00000000..5da43c1e
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def
@@ -0,0 +1,7 @@
+help: Set to advertise this range
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"router ospf6\" \
+       -c \"area $VAR(../../@) range $VAR(../@) advertise\"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"router ospf6\" \
+       -c \"no area $VAR(../../@) range $VAR(../@) advertise\"; "
diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def
new file mode 100644
index 00000000..1b97f964
--- /dev/null
+++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def
@@ -0,0 +1,7 @@
+help: Set to not advertise this range
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"router ospf6\" \
+       -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"router ospf6\" \
+       -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def
new file mode 100644
index 00000000..65963f46
--- /dev/null
+++ b/templates/protocols/ospfv3/node.def
@@ -0,0 +1,5 @@
+help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"router ospf6\" "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+       -c \"no router ospf6\" "
diff --git a/templates/protocols/ospfv3/parameters/node.def b/templates/protocols/ospfv3/parameters/node.def
new file mode 100644
index 00000000..e92d1a08
--- /dev/null
+++ b/templates/protocols/ospfv3/parameters/node.def
@@ -0,0 +1 @@
+help: Set OSPFv3 specific parameters
diff --git a/templates/protocols/ospfv3/parameters/router-id/node.def b/templates/protocols/ospfv3/parameters/router-id/node.def
new file mode 100644
index 00000000..d38713eb
--- /dev/null
+++ b/templates/protocols/ospfv3/parameters/router-id/node.def
@@ -0,0 +1,5 @@
+type: ipv4
+help: Set router identifier
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
+           -c \"router ospf6\" \
+           -c \"router-id $VAR(@)\" "
diff --git a/templates/protocols/ospfv3/redistribute/node.def b/templates/protocols/ospfv3/redistribute/node.def
new file mode 100644
index 00000000..4d7d1bcc
--- /dev/null
+++ b/templates/protocols/ospfv3/redistribute/node.def
@@ -0,0 +1,10 @@
+multi:
+type: txt
+help: Set route type to redistribute
+allowed: echo "static kernel connected ripng bgp"
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"redistribute $VAR(@) \"; "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+        -c \"router ospf6 \" \
+        -c \"no redistribute $VAR(@) \"; "