Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  Sync XML interface description source file pattern and conf script name
  Python/ifconfig: T1557: add support for DHCPv6 client options
  bonding: T1614: support DHCP options on VLAN interfaces
  Python/ifconfig: T1557: bugfix when configuring accept_ra on VLAN interfaces
  conf_mode: bonding/ethernet fix comments
  Jenkins: Docker: always pull container from Dockerhub

1 files changed, 114 insertions, 0 deletions

diff --git a/src/conf_mode/interfaces-dummy.py b/src/conf_mode/interfaces-dummy.py
new file mode 100755
index 000000000..eb0145f65
--- /dev/null
+++ b/src/conf_mode/interfaces-dummy.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from copy import deepcopy
+from sys import exit
+
+from vyos.ifconfig import DummyIf
+from vyos.configdict import list_diff
+from vyos.config import Config
+from vyos import ConfigError
+
+default_config_data = {
+    'address': [],
+    'address_remove': [],
+    'deleted': False,
+    'description': '',
+    'disable': False,
+    'intf': ''
+}
+
+def get_config():
+    dummy = deepcopy(default_config_data)
+    conf = Config()
+
+    # determine tagNode instance
+    try:
+        dummy['intf'] = os.environ['VYOS_TAGNODE_VALUE']
+    except KeyError as E:
+        print("Interface not specified")
+
+    # Check if interface has been removed
+    if not conf.exists('interfaces dummy ' + dummy['intf']):
+        dummy['deleted'] = True
+        return dummy
+
+    # set new configuration level
+    conf.set_level('interfaces dummy ' + dummy['intf'])
+
+    # retrieve configured interface addresses
+    if conf.exists('address'):
+        dummy['address'] = conf.return_values('address')
+
+    # retrieve interface description
+    if conf.exists('description'):
+        dummy['description'] = conf.return_value('description')
+
+    # Disable this interface
+    if conf.exists('disable'):
+        dummy['disable'] = True
+
+    # Determine interface addresses (currently effective) - to determine which
+    # address is no longer valid and needs to be removed from the interface
+    eff_addr = conf.return_effective_values('address')
+    act_addr = conf.return_values('address')
+    dummy['address_remove'] = list_diff(eff_addr, act_addr)
+
+    return dummy
+
+def verify(dummy):
+    return None
+
+def generate(dummy):
+    return None
+
+def apply(dummy):
+    d = DummyIf(dummy['intf'])
+
+    # Remove dummy interface
+    if dummy['deleted']:
+        d.remove()
+    else:
+        # update interface description used e.g. within SNMP
+        d.set_alias(dummy['description'])
+
+        # Configure interface address(es)
+        # - not longer required addresses get removed first
+        # - newly addresses will be added second
+        for addr in dummy['address_remove']:
+            d.del_addr(addr)
+        for addr in dummy['address']:
+            d.add_addr(addr)
+
+        # disable interface on demand
+        if dummy['disable']:
+            d.set_state('down')
+        else:
+            d.set_state('up')
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)