Merge remote-tracking branch 'upstream/current' into current

6 files changed, 17 insertions, 9 deletions

diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.in b/interface-definitions/include/accel-client-ipv6-pool.xml.i
index 455ada6ef..455ada6ef 100644
--- a/interface-definitions/include/accel-client-ipv6-pool.xml.in
+++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i
diff --git a/interface-definitions/include/accel-name-server.xml.in b/interface-definitions/include/accel-name-server.xml.i
index 82ed6771d..82ed6771d 100644
--- a/interface-definitions/include/accel-name-server.xml.in
+++ b/interface-definitions/include/accel-name-server.xml.i
diff --git a/interface-definitions/include/accel-radius-additions.xml.in b/interface-definitions/include/accel-radius-additions.xml.i
index e37b68514..e37b68514 100644
--- a/interface-definitions/include/accel-radius-additions.xml.in
+++ b/interface-definitions/include/accel-radius-additions.xml.i
diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i
new file mode 100644
index 000000000..c14ddf6f5
--- /dev/null
+++ b/interface-definitions/include/interface-dial-on-demand.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="connect-on-demand">
+  <properties>
+    <help>Establishment connection automatically when traffic is sent</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index a6d7c81ce..cd0afe742 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -13,25 +13,26 @@
     #include <include/dhcpv6-options.xml.i>
     #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
-    <leafNode name="ethertype">
+    <leafNode name="protocol">
       <properties>
-        <help>Set Ethertype</help>
+        <help>Protocol used for service VLAN (default: 802.1ad)</help>
         <completionHelp>
-          <list>0x88A8 0x8100</list>
+          <list>802.1ad 802.1q</list>
         </completionHelp>
         <valueHelp>
-          <format>0x88A8</format>
-          <description>802.1ad</description>
+          <format>802.1ad</format>
+          <description>Provider Bridging (IEEE 802.1ad, Q-inQ), ethertype 0x88a8</description>
         </valueHelp>
         <valueHelp>
-          <format>0x8100</format>
-          <description>802.1q</description>
+          <format>802.1q</format>
+          <description>VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100</description>
         </valueHelp>
         <constraint>
-          <regex>(0x88A8|0x8100)</regex>
+          <regex>(802.1q|802.1ad)</regex>
         </constraint>
-        <constraintErrorMessage>Ethertype must be 0x88A8 or 0x8100</constraintErrorMessage>
+        <constraintErrorMessage>Ethertype must be 802.1ad or 802.1q</constraintErrorMessage>
       </properties>
+      <defaultValue>802.1ad</defaultValue>
     </leafNode>
     <node name="ip">
       <children>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 5a4e52122..919e4d493 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -50,6 +50,7 @@
         #include <include/interface-enable-arp-announce.xml.i>
         #include <include/interface-enable-arp-ignore.xml.i>
         #include <include/interface-enable-proxy-arp.xml.i>
+        #include <include/interface-proxy-arp-pvlan.xml.i>
       </children>
     </node>
     <node name="ipv6">