Fix 4184: ospfv3 interface values don't work on vlans

9 files changed, 80 insertions, 41 deletions

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
index 2c653c8f..7bae7638 100644
--- 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
@@ -1,8 +1,13 @@
 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(@) \"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 cost $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 cost"
 comp_help: possible completions:
- <1-65535>          Set Cost
+  <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
index fcc3be00..d6967b69 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 dead-interval $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 dead-interval"
 comp_help: possible completions:
- <1-65535>          Seconds (default 40)
+  <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
index ae277b4c..450d2b4b 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 hello-interval $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 hello-interval"
 comp_help: possible completions:
- <1-65535>          Seconds (default 10)
+  <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
index b6b84a87..5f66af6f 100644
--- 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
@@ -1,11 +1,13 @@
 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 \"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 ifmtu $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 ifmtu"
 comp_help: possible completions:
- <1-65535>          Set Cost
+  <1-65535>         Set interface MTU
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
index 4df3aea7..9cd33f16 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 instance-id $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 instance-id"
 comp_help: possible completions:
- <0-255>            Instance Id (default 0)
+  <0-255>           Instance Id (default 0)
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
index d5a43377..c40b17de 100644
--- 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
@@ -1,7 +1,9 @@
 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\"; "
+create: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 passive"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$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
index efd10574..d459e07f 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 priority $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 priority"
 comp_help: possible completions:
- <0-255>            Priority (default 1)
+  <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
index 34651d7a..acc85823 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 retransmit-interval $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 retransmit-interval"
 comp_help: possible completions:
- <3-65535>          Seconds (default 5)
+  <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
index 0b623a42..0fc8a699 100644
--- 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
@@ -2,8 +2,13 @@ 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(@)\"; "
+update: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "ipv6 ospf6 transmit-delay $VAR(@)"
+delete: vyatta-vtysh                                          \
+          -c "configure terminal"                             \
+          -c "interface $VAR(../../../../@).$VAR(../../../@)" \
+          -c "no ipv6 ospf6 transmit-delay"
 comp_help: possible completions:
- <1-65535>          Seconds (default 1)
+  <1-65535>         Seconds (default 1)