ifupdown2 2.0.0-1

Signed-off-by: Julien Fortin <[email protected]>

.gitignore

@@ -16,7 +16,7 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
+/lib/
 lib64/
 parts/
 sdist/

debian/changelog

@@ -1,8 +1,22 @@
-ifupdown2 (1.2.9-1) unstable; urgency=medium
-
-  *
-
- -- Julien Fortin <[email protected]>  Thu, 11 Jul 2019 23:42:42 +0200
+ifupdown2 (2.0.0-1) unstable; urgency=medium
+
+  * Introduction of the live netlink cache
+  * Refactoring and PEP8 fixes
+  * Install systemd ifupdown2.netowrking.service and ifup.service
+  * Addons: bond: bond-primary attributes (closes: #9)
+  * Addons: address-virtual: vrrp support
+  * Addons: address: add arp-accept option
+  * Addons: tunnel: adding "tunnel-" prefix to every attributes
+  * Loopback interface won't go down (unless link-down yes)
+  * Macvlans (address-virtual) can now be configured without ips
+  * Add support for vxlan multicast group (vxlan-mcastgrp)
+  * New sets of poliicies:
+       - bridge polcy for vxlan port: bridge-vxlan-arp-nd-suppres (ON/off)
+       - bridge policy for vxlan port: bridge_vxlan_port_learning (ON/off)
+       - bridge policy for vxlan port:
+               vxlan_bridge_igmp_snooping_enable_port_mcrouter (1/0)
+
+ -- Julien Fortin <[email protected]>  Tue, 01 Oct 2019 23:42:42 +0200
 
 ifupdown2 (1.2.8-1) unstable; urgency=medium
 

debian/control

@@ -2,21 +2,23 @@ Source: ifupdown2
 Section: admin
 Priority: optional
 Maintainer: Julien Fortin <[email protected]>
-Build-Depends: debhelper (>= 9.20160709),
+Build-Depends: debhelper (>=9),
+               dh-systemd,
                dh-python,
                python-all,
                python-setuptools,
                python-docutils
 Standards-Version: 4.2.1
 Homepage: https://github.com/cumulusnetworks/ifupdown2
+X-Python-Version: >= 2.7
 
 Package: ifupdown2
 Architecture: all
 Provides: ifupdown
 Conflicts: ifupdown
 Replaces: ifupdown
 Depends: ${python:Depends}, ${misc:Depends}, iproute2, python-argcomplete, python-ipaddr
-Suggests: isc-dhcp-client, bridge-utils, ethtool, python-gvgen, python-mako, python-pkg-resources
+Suggests: isc-dhcp-client, bridge-utils, ethtool, python-gvgen, python-mako
 Description: Network Interface Management tool similar to ifupdown
  ifupdown2 is ifupdown re-written in Python. It replaces ifupdown and provides
  the same user interface as ifupdown for network interface configuration.

debian/ifup@.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=ifup for %I
+After=local-fs.target network-pre.target networking.service systemd-sysctl.service
+Before=network.target shutdown.target network-online.target
+Conflicts=shutdown.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+DefaultDependencies=no
+IgnoreOnIsolate=yes
+
+[Service]
+# avoid stopping on shutdown via stopping system-ifup.slice
+Slice=system.slice
+ExecStart=/sbin/ifup --allow=hotplug %I
+ExecStop=/sbin/ifdown %I
+RemainAfterExit=true
+TimeoutStartSec=2min

debian/ifupdown2.install

@@ -1,3 +1,2 @@
-etc/default/networking /etc/default/
 etc/network/ifupdown2/addons.conf /etc/network/ifupdown2/
 etc/network/ifupdown2/ifupdown2.conf /etc/network/ifupdown2/

debian/ifupdown2.networking.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=ifupdown2 networking initialization
+Description=Network initialization
 Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8)
 DefaultDependencies=no
 Before=shutdown.target
@@ -10,9 +10,9 @@ Type=oneshot
 RemainAfterExit=yes
 SyslogIdentifier=networking
 TimeoutStopSec=30s
-ExecStart=/usr/share/ifupdown2/sbin/start-networking start
-ExecStop=/usr/share/ifupdown2/sbin/start-networking stop
-ExecReload=/usr/share/ifupdown2/sbin/start-networking reload
+ExecStart=/sbin/ifup -a
+ExecStop=/sbin/ifdown -a
+ExecReload=/sbin/ifreload -a
 
 [Install]
 WantedBy=basic.target network.target shutdown.target

debian/rules

@@ -11,14 +11,17 @@ override_dh_installman:
 	./ifupdown2/man/genmanpages.sh ./ifupdown2/man ./man
 	dh_installman
 
+override_dh_install:
+	dh_install
+	mkdir -p debian/ifupdown2/lib/systemd/system/
+	install --mode=644 debian/[email protected] debian/ifupdown2/lib/systemd/system/
+
+
 override_dh_systemd_start:
 	dh_systemd_start --name=networking --no-start
 
 override_dh_systemd_enable:
 	dh_systemd_enable --name=networking
 
-override_dh_installinit:
-	dh_installinit --name=networking --no-start
-
 override_dh_compress:
 	dh_compress -X.py

debian/watch

@@ -0,0 +1 @@
+version=3

etc/network/ifupdown2/addons.conf

@@ -12,7 +12,9 @@ pre-up,bridgevlan
 pre-up,mstpctl
 pre-up,tunnel
 pre-up,vrf
+pre-up,tunnel
 pre-up,ethtool
+pre-up,address
 up,dhcp
 up,address
 up,addressvirtual
@@ -40,4 +42,4 @@ post-down,batman_adv
 post-down,usercmds
 post-down,link
 post-down,tunnel
-post-down,xfrm
+post-down,xfrm

etc/network/ifupdown2/ifupdown2.conf

@@ -4,6 +4,9 @@
 # This file contains default settings for ifupdown
 #
 
+# use ifupdown2d
+use_daemon=no
+
 # enable templates
 template_enable=1
 
@@ -84,5 +87,5 @@ adjust_logical_dev_mtu=1
 # directory where the state file is stored
 # if this directory doesn't exists ifupdown2 will create it
 # if directory creation fails or state_dir variable is empty
-# state_dir will default to /run/network/
-state_dir=/run/network/
+# state_dir will default to /var/tmp/network/
+state_dir=/var/tmp/network/

ifupdown2/__init__.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = '1.2.9'
+__version__ = '2.0.0'
 
-# Copyright (C) 2014,2015,2016,2017,2018,219 Cumulus Networks, Inc. All rights reserved
+# Copyright (C) 2014,2015,2016,2017,2018,2019 Cumulus Networks, Inc. All rights reserved
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as