Merge pull request #109 from c-po/t1580-dummy

T1580 dummy

3 files changed, 194 insertions, 2 deletions

diff --git a/interface-definitions/interfaces-dummy.xml b/interface-definitions/interfaces-dummy.xml
new file mode 100644
index 000000000..7c425480a
--- /dev/null
+++ b/interface-definitions/interfaces-dummy.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="dummy" owner="${vyos_conf_scripts_dir}/interface-dummy.py">
+        <properties>
+          <help>Dummy interface name</help>
+          <priority>300</priority>
+          <constraint>
+            <regex>dum[0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>Dummy interface must be named dumN</constraintErrorMessage>
+          <valueHelp>
+            <format>dumN</format>
+            <description>Dummy interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          <leafNode name="address">
+            <properties>
+              <help>IP address</help>
+              <valueHelp>
+                <format>ipv4net</format>
+                <description>IPv4 address and prefix length</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6net</format>
+                <description>IPv6 address and prefix length</description>
+              </valueHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="description">
+            <properties>
+              <help>Interface description</help>
+              <constraint>
+                <regex>^.{1,256}$</regex>
+              </constraint>
+              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="disable">
+            <properties>
+              <help>Disable interface</help>
+            </properties>
+          </leafNode>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/python/vyos/configinterface.py b/python/vyos/configinterface.py
index 0f5b0842c..188d5b9e2 100644
--- a/python/vyos/configinterface.py
+++ b/python/vyos/configinterface.py
@@ -123,11 +123,9 @@ def add_interface_address(intf, addr):
         os.system('/opt/vyatta/sbin/vyatta-dhcpv6-client.pl --start -ifname "{}"'.format(intf))
     elif vyos.validate.is_ipv4(addr):
         if not vyos.validate.is_intf_addr_assigned(intf, addr):
-            print("Assigning {} to {}".format(addr, intf))
             os.system('sudo ip -4 addr add "{}" broadcast + dev "{}"'.format(addr, intf))
     elif vyos.validate.is_ipv6(addr):
         if not vyos.validate.is_intf_addr_assigned(intf, addr):
-            print("Assigning {} to {}".format(addr, intf))
             os.system('sudo ip -6 addr add "{}" dev "{}"'.format(addr, intf))
     else:
         raise ConfigError('{} is not a valid interface address'.format(addr))
@@ -151,3 +149,24 @@ def remove_interface_address(intf, addr):
         raise ConfigError('{} is not a valid interface address'.format(addr))
 
     pass
+
+def remove_interface(ifname):
+    """
+    Remove given interface from operating system, e.g. 'dum0'
+    """
+
+    if os.path.isdir('/sys/class/net/' + ifname):
+        os.system('ip link delete "{}"'.format(ifname))
+
+    pass
+
+def add_interface(type, ifname):
+    """
+    Add given interface to operating system, e.g. add 'dummy' interface with
+    name 'dum0'
+    """
+
+    if not os.path.isdir('/sys/class/net/' + ifname):
+        os.system('ip link add "{}" type "{}"'.format(ifname, type))
+
+    pass
diff --git a/src/conf_mode/interface-dummy.py b/src/conf_mode/interface-dummy.py
new file mode 100755
index 000000000..668e4acc7
--- /dev/null
+++ b/src/conf_mode/interface-dummy.py
@@ -0,0 +1,122 @@
+#!/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
+import sys
+import copy
+
+import vyos.configinterface as VyIfconfig
+
+from vyos.config import Config
+from vyos import ConfigError
+
+default_config_data = {
+    'address': [],
+    'address_remove': [],
+    'deleted': False,
+    'description': '',
+    'disable': False,
+    'intf': ''
+}
+
+def diff(first, second):
+    second = set(second)
+    return [item for item in first if item not in second]
+
+def get_config():
+    dummy = copy.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'] = diff(eff_addr, act_addr)
+
+    return dummy
+
+def verify(dummy):
+    if dummy is None:
+        return None
+
+    return None
+
+def generate(dummy):
+    if dummy is None:
+        return None
+
+    return None
+
+def apply(dummy):
+    if dummy is None:
+        return None
+
+    # Remove dummy interface
+    if dummy['deleted']:
+        VyIfconfig.remove_interface(dummy['intf'])
+    else:
+        # Interface will only be added if it yet does not exist
+        VyIfconfig.add_interface('dummy', dummy['intf'])
+
+        # update interface description used e.g. within SNMP
+        VyIfconfig.set_description(dummy['intf'], dummy['description'])
+
+        # Configure interface address(es)
+        for addr in dummy['address_remove']:
+            VyIfconfig.remove_interface_address(dummy['intf'], addr)
+
+        for addr in dummy['address']:
+            VyIfconfig.add_interface_address(dummy['intf'], addr)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        sys.exit(1)