]> git.proxmox.com Git - mirror_ifupdown2.git/log
mirror_ifupdown2.git
6 years agoaddons: vrf: fix vrf slave link kind (fixes #39)
Julien Fortin [Mon, 22 Jan 2018 11:09:07 +0000 (19:09 +0800)]
addons: vrf: fix vrf slave link kind (fixes #39)

$ cat /etc/network/interfaces
auto v0
iface v0
      link-type veth
      vrf blue

auto blue
iface blue
      vrf-table auto

$ ifreload -a
$ echo $?
0
$ ifquery -a -c
auto v0
iface v0                         [pass]
      link-type veth             [pass]
      vrf blue                   [pass]

auto blue
iface blue                       [pass]
      vrf-table 1001             [pass]
$ echo $?
0

Reported-by: Maximilian Wilhelm <max@rfc2324.org>
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agoaddons: bridge: allow "bridge-ports: none" for bridges without initial ports. (#33)
Maximilian Wilhelm [Tue, 24 Oct 2017 18:58:10 +0000 (20:58 +0200)]
addons: bridge: allow "bridge-ports: none" for bridges without initial ports. (#33)

This simple patch allows the creation of bridges which should be set up
  without any ports, like a bridge for virtual machines on a hosting box.

  With this patch ifupdown2 get's a step closer to feature parity and
  compatiblity with ifupdown1.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
6 years agoaddons: tunnel: Add support for GRETAP tunnels. (#34)
Maximilian Wilhelm [Tue, 24 Oct 2017 18:42:10 +0000 (20:42 +0200)]
addons: tunnel: Add support for GRETAP tunnels. (#34)

This commit adds support to configure and check gretap tunnels. An example
  configuration could look like this:

    iface tap0 inet tunnel
        mode gretap
        local 10.132.255.3
        endpoint 10.132.255.1
        ttl 64
        mtu 1400
        tunnel-physdev eth0
        #
        address 10.10.0.1/2

  ifup will happily configure the interface (which it does even without this
  patch) and ifquery now can successfully validate the configure interface:

    cr03.in.ffho.net:~# ifquery -c tap0
    iface tap0 inet tunnel                   [[ OK ]]
        tunnel-physdev eth0                  [[ OK ]]
        endpoint 10.132.255.1                [[ OK ]]
        local 10.132.255.3                   [[ OK ]]
        mode gretap                          [[ OK ]]
        ttl 64                               [[ OK ]]
        mtu 1400                             [[ OK ]]
        address 10.10.0.1/24                 [[ OK ]]

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
6 years agoaddons: batman_adv: Add support for more B.A.T.M.A.N. adv. attributes. (#35)
Maximilian Wilhelm [Tue, 24 Oct 2017 18:38:32 +0000 (20:38 +0200)]
addons: batman_adv: Add support for more B.A.T.M.A.N. adv. attributes. (#35)

* addons: batman_adv: Rework B.A.T.M.A.N. adv. attribute handling.

  This commit reworks the internal handling of B.A.T.M.A.N. adv. attributes
  within the plugin. The new approach on setting and checking attributes is
  more generic and allows adding more B.A.T.M.A.N. adv. which should be set
  as attributes of an B.A.T.M.A.N. adv. interface in a simple way.

  This commit does not introduce any changes visibile to the user.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
* addons: batman_adv: Add support for more B.A.T.M.A.N. adv. attributes.

  This commit adds supports for setting the following optional attributes:
   * gw-mode (one of { off, client, server })
   * multicast-mode (can be 'enabled' or 'disabled')
   * distributed-arp-table (cat be 'enabled' or 'disabled')

  Example config:

  pandora:~# ifquery -c bat-foo
  iface bat-foo                                         [pass]
      batman-ifaces dummy-bat                           [pass]
      batman-ifaces-ignore-regex                        [pass]
      batman-hop-penalty 7                              [pass]
      batman-multicast-mode enabled                     [pass]
      batman-distributed-arp-table enabled              [pass]
      batman-gw-mode client                             [pass]

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
6 years agoAddons/tunnel: fix typo in validvals (#31)
kokel [Tue, 3 Oct 2017 16:48:12 +0000 (18:48 +0200)]
Addons/tunnel: fix typo in validvals (#31)

6 years agoaddons: address: Fix handling of 'pointopoint' attr. (#23)
Maximilian Wilhelm [Wed, 23 Aug 2017 21:11:57 +0000 (23:11 +0200)]
addons: address: Fix handling of 'pointopoint' attr. (#23)

Due to a simple logic bug the 'pointopoint' attribute was ignored when
  specifying and address as <ip/mask> and only considered when IP and mask
  where given seperately. This commit fixes this behaviour.

  When configured in ptp mode »ip addr« will show the IP address without a
  netmask which will make »ifquery -c« mark the IP as failed. The check has
  been fixed, too.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agosbin: ifupdown2: update ifupdown2 version number for --version option
Julien Fortin [Sun, 5 Mar 2017 17:21:35 +0000 (00:21 +0700)]
sbin: ifupdown2: update ifupdown2 version number for --version option

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agosbin: start-networking: adjust allow-hotplug behavior to ifupdown
Julien Fortin [Thu, 23 Feb 2017 09:42:34 +0000 (16:42 +0700)]
sbin: start-networking: adjust allow-hotplug behavior to ifupdown

Ticket: Bug#855598: src:ifupdown2: allow-hotplug behaves differently, not UPing interfaces
Reviewed By: Roopa
Testing Done: mark an interface (ethX) as hotplug then reboot

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agoAdd support GRE/SIT tunnels. (#20)
Maximilian Wilhelm [Sat, 28 Jan 2017 22:54:43 +0000 (23:54 +0100)]
Add support GRE/SIT tunnels. (#20)

This commit adds support for configuring GRE/IPIP/SIT tunnel interfaces as know
from previous versions of ifupdown. Currently only configuration checks for GRE
and SIT tunnels are implemented.

A tunnel interface configuration could look like this:

auto gre42
iface gre42 inet tunnel
        mode     gre
        local    198.51.100.1
        endpoint 203.0.113.2
#
# optional tunnel attributes
        ttl      64
        mtu      1400
tunnel-physdev eth0
        #
        address  192.0.2.42/31
        address  2001:db8:d0c:23::42/64

auto he-ipv6
iface he-ipv6 inet tunnel
mode sit
endpoint 203.0.113.6
local    198.51.100.66
#
# optional tunnel attributes
ttl 255
mtu 1466
tunnel-physdev vrf_external
#
address 2001:db8:666::2/64

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agocloses: #810844: debian: control: Unlisted dependencies
Julien Fortin [Thu, 22 Dec 2016 13:01:52 +0000 (14:01 +0100)]
closes: #810844: debian: control: Unlisted dependencies

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agobatman_adv: Ignore non-existing batman interface when setting up batman iface.
Maximilian Wilhelm [Thu, 17 Nov 2016 17:52:29 +0000 (18:52 +0100)]
batman_adv: Ignore non-existing batman interface when setting up batman iface.

  Previously a single non existing batman member interface could prevent the
  configuration of the batman interface. This patch makes sure only existing
  member interfaces will be considered when setting up the interface.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agobatman_adv: Rename _sysfs_mgmt_member_if() to _batctl_if() and use absolute path...
Maximilian Wilhelm [Thu, 17 Nov 2016 17:51:05 +0000 (18:51 +0100)]
batman_adv: Rename _sysfs_mgmt_member_if() to _batctl_if() and use absolute path to batctl.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agobatman-adv: Show function where error occured in message.
Maximilian Wilhelm [Thu, 17 Nov 2016 17:48:51 +0000 (18:48 +0100)]
batman-adv: Show function where error occured in message.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agoAdd support for setting phys-dev for VXLAN interfaces.
Maximilian Wilhelm [Thu, 6 Oct 2016 17:22:06 +0000 (19:22 +0200)]
Add support for setting phys-dev for VXLAN interfaces.

  Add interface configuration option »vxlan-physdev« to set »dev« attribute
  of VXLAN interfaces and a check for the running configuration.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agoAddons: vxlan: Fix check of »vxlan-svcnodeip« config option.
Maximilian Wilhelm [Sun, 2 Oct 2016 20:30:44 +0000 (22:30 +0200)]
Addons: vxlan: Fix check of »vxlan-svcnodeip« config option.

  The »vxlan-svcnodeip« corresponds with the multicast »group« parameter
  of the VXLAN interface and should be checked against this value instead
  of the »remote« parameter for unicast ptp tunnels.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agodocs: examples: new batman_adv folder with configuration script and example
Julien Fortin [Wed, 5 Oct 2016 14:55:00 +0000 (16:55 +0200)]
docs: examples: new batman_adv folder with configuration script and example

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agoAdd addon module for B.A.T.M.A.N. advanced interface configuration. (#12)
Maximilian Wilhelm [Wed, 5 Oct 2016 10:18:05 +0000 (12:18 +0200)]
Add addon module for B.A.T.M.A.N. advanced interface configuration. (#12)

* Add addon module for B.A.T.M.A.N. advanced interface configuration.

  This commit adds support for configuring B.A.T.M.A.N. advanced interfaces
  with ifupdown2. B.A.T.M.A.N. advanced is a protocol to build Layer2 based
  mesh networks with. It's supported in the Linux kernel and thus available
  in many Linux environments.

  A configuration could look like this

  auto bat0
  iface bat0
      batman-ifaces eth1 eth2.23
      batman-ifaces-ignore-regex .*_nodes
      batman-hop-penalty 23
      #
      address 192.0.2.42/24

  where »bat0« would be the local connection to the mesh network.

  The interfaces »eth1« and »eth2.23« would be used by the B.A.T.M.A.N. adv.
  protocol to communicate to other member of the mesh network.

  Any interfaces matching the »ifaces-ignore-regex« will be gently ignored
  by ifquery and ifreload as there might be some tunnels or interfaces
  added to the mesh network by other means which should not be removed by
  any subsequent ifreload run.

  The »hop-penalty» parameter set the penalty of this node within the mesh
  network.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
* addons: batman_adv: replacing rtnetlink by netlink api call and iproute2 instantiation fix

These changes are due to modifications we introduced in debian-prep2.
We no longer use the rtnetlink_api but a new one "netlink" build on top of python-nlmanager.

* Reflect upstream change where flags are stored.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
6 years agoRevert "iproute2: addr_add: change default broadcast to '+' so iproute2 generate...
Julien Fortin [Tue, 13 Mar 2018 00:05:52 +0000 (11:05 +1100)]
Revert "iproute2: addr_add: change default broadcast to '+' so iproute2 generate broadcast addrs"

this patch is breaking ip6, i'll try to fix it later by adding a ip4 check first.

This reverts commit c4d1cffc5e34d4afb38606ecf4288b431c82b683.

6 years agoiproute2: addr_add: change default broadcast to '+' so iproute2 generate broadcast...
Julien Fortin [Thu, 1 Mar 2018 05:46:53 +0000 (16:46 +1100)]
iproute2: addr_add: change default broadcast to '+' so iproute2 generate broadcast addrs

    today ifupdown2 doesn't generate the broadcast address for an intf while ifupdown1(debian)
    does, simply changing the default broadcast value to '+' solve the issue.

    auto bond1
    iface bond1 inet static
            address 88.213.145.1
            netmask 255.255.255.0
            bond-slaves ens6 ens6d1
            bond-mode 0
            bond-miimon 100

    $ ifconfig bond1
    bond1: flags=5187<UP,BROADCAST,RUNNING,MASTER,MULTICAST>  mtu 1500
            inet 88.213.145.1  netmask 255.255.255.0  broadcast 0.0.0.0
            inet6 fe80::f652:14ff:fe33:ea01  prefixlen 64  scopeid 0x20<link>
            ether f4:52:14:33:ea:01  txqueuelen 1000  (Ethernet)
            RX packets 6  bytes 522 (522.0 B)
            RX errors 0  dropped 0  overruns 0  frame 0
            TX packets 66  bytes 4878 (4.8 KB)
            TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

    $ ip addr show bond1
    13: bond1: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
        link/ether f4:52:14:33:ea:01 brd ff:ff:ff:ff:ff:ff
        inet 88.213.145.1/24 scope global bond1
           valid_lft forever preferred_lft forever
        inet6 fe80::f652:14ff:fe33:ea01/64 scope link
           valid_lft forever preferred_lft forever

    ******************************************
    With ifupdown1 (debian) with the same configuration

    bond1: flags=5187<UP,BROADCAST,RUNNING,MASTER,MULTICAST>  mtu 1500
            inet 88.213.144.1  netmask 255.255.255.0  broadcast 88.213.144.255
            inet6 8f54:2573:3de8:92ba::2  prefixlen 126  scopeid 0x0<global>
            inet6 fe80::f652:14ff:fe33:eac2  prefixlen 64  scopeid 0x20<link>
            ether f4:52:14:33:ea:c2  txqueuelen 1000  (Ethernet)
            RX packets 18  bytes 1566 (1.5 KB)
            RX errors 0  dropped 0  overruns 0  frame 0
            TX packets 51  bytes 4508 (4.5 KB)

    5: bond1: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
        link/ether f4:52:14:33:ea:c2 brd ff:ff:ff:ff:ff:ff
        inet 88.213.144.1/24 brd 88.213.144.255 scope global bond1
           valid_lft forever preferred_lft forever
        inet6 8f54:2573:3de8:92ba::2/126 scope global
           valid_lft forever preferred_lft forever
        inet6 fe80::f652:14ff:fe33:eac2/64 scope link
           valid_lft forever preferred_lft forever

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
6 years agoPass environment variables to addon scripts (#32)
Gaudenz Steinlin [Wed, 25 Oct 2017 00:00:27 +0000 (02:00 +0200)]
Pass environment variables to addon scripts (#32)

Pass the same environment variables to addon scripts from /etc/network/
as are passed to user defined commands in interfaces stanzas. This is
needed for compatibility with ifupdown.

Fixes: #14
6 years agoUpdate README.md with install instructions
Julien Fortin [Fri, 13 Oct 2017 23:10:29 +0000 (16:10 -0700)]
Update README.md with install instructions

6 years agoUpdate README.rst (#11)
Jeffrey [Tue, 1 Aug 2017 14:08:10 +0000 (16:08 +0200)]
Update README.rst (#11)

Fixed formatting issue which did put the second 'apt-get install' line behind the first one.

6 years agoFor hotplug devices check if the link is present, not up (#28)
Nigel Kukard [Wed, 26 Jul 2017 23:45:52 +0000 (23:45 +0000)]
For hotplug devices check if the link is present, not up (#28)

Checking operstate would require firmware to be loaded and link
negotiation to of taken place. Some firmwares take a few seconds to
upload and online the device, and some link negotiations take a second
or two.

Immediately checking operstate is not feasible here. Checking if the
link is present is a more suitable non-delaying approach.

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
7 years agoMerge remote-tracking branch 'cumulus/dev'
Julien Fortin [Thu, 23 Feb 2017 10:17:26 +0000 (17:17 +0700)]
Merge remote-tracking branch 'cumulus/dev'

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: changelog: update changelog for new version cl3u10 (unreleased)
Julien Fortin [Thu, 23 Feb 2017 10:10:01 +0000 (17:10 +0700)]
debian: changelog: update changelog for new version cl3u10 (unreleased)

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agosbin: start-networking: adjust allow-hotplug behavior to ifupdown
Julien Fortin [Thu, 23 Feb 2017 09:42:34 +0000 (16:42 +0700)]
sbin: start-networking: adjust allow-hotplug behavior to ifupdown

Ticket: Bug#855598: src:ifupdown2: allow-hotplug behaves differently, not UPing interfaces
Reviewed By: Roopa
Testing Done: mark an interface (ethX) as hotplug then reboot

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agosbin: ifupdown2: drop the dependency to pkg_resource, hardcode version number
Julien Fortin [Thu, 23 Feb 2017 09:31:58 +0000 (16:31 +0700)]
sbin: ifupdown2: drop the dependency to pkg_resource, hardcode version number

Ticket:
Reviewed By: Roopa
Testing Done:

Debian Bug#855401, we didn't list pkg_resource as a dependency so the
installation is failing for upstream users.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdown2: bond-downdelay and bond-updelay need validrange
Daniel Walton [Wed, 22 Feb 2017 15:13:40 +0000 (03:13 +1200)]
ifupdown2: bond-downdelay and bond-updelay need validrange

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: julien@cumulusnetworks.com
Ticket: CM-15012

7 years agoifupdown2: restrict mstpctl-treeprio validvals
Daniel Walton [Wed, 22 Feb 2017 15:12:16 +0000 (03:12 +1200)]
ifupdown2: restrict mstpctl-treeprio validvals

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: julien@cumulusnetworks.com
Ticket: CM-15011

7 years agoMerge remote-tracking branch 'origin/dev-next' into dev
Julien Fortin [Fri, 17 Feb 2017 18:46:15 +0000 (01:46 +0700)]
Merge remote-tracking branch 'origin/dev-next' into dev

7 years agodebian: mark 1.1-cl3u9 RELEASED
Roopa Prabhu [Wed, 8 Feb 2017 18:51:22 +0000 (10:51 -0800)]
debian: mark 1.1-cl3u9 RELEASED

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agodebian: add new changelog entry for 1.1-cl3u9
Roopa Prabhu [Mon, 6 Feb 2017 21:24:09 +0000 (13:24 -0800)]
debian: add new changelog entry for 1.1-cl3u9

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bridge: support for bridge-learning attribute
Roopa Prabhu [Mon, 6 Feb 2017 00:27:02 +0000 (16:27 -0800)]
addons: bridge: support for bridge-learning attribute

Ticket: CM-14683
Reviewed By: julien, mallik, anita, vivek, balki, wkok
Testing Done: tested with bridge-learning on off

- support for bridge-learning attribute on bridge ports.
  (currently uses sysfs, must move to netlink soon)
- Additional feature for vxlan bridge ports: sync learning
flag to vxlan bridge ports. No ifquery check for this auto
sync feature.

example config for vxlan ports:
auto vxlan1000
iface vxlan1000
        vxlan-id 1000
        bridge-learning off
        bridge-access 100

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bond: adding attribute bond-(up|down)delay
Nikhil [Mon, 30 Jan 2017 22:09:58 +0000 (14:09 -0800)]
addons: bond: adding attribute bond-(up|down)delay

Ticket: CM-8424
Reviewed By: Roopa, Julien
Testing Done: using the config mentioned in bug

updelay

    Specifies the time, in milliseconds, to wait before enabling a
    slave after a link recovery has been detected.  This option is
    only valid for the miimon link monitor.

downdelay

    Specifies the time, in milliseconds, to wait before disabling
    a slave after a link failure has been detected.  This option
    is only valid for the miimon link monitor.

Signed-off-by: Nikhil Gajendrakumar <nikhil@cumulusnetworks.com>
Conflicts:
ifupdownaddons/bondutil.py

7 years agoMerge branch 'dev' into dev-next
Julien Fortin [Fri, 27 Jan 2017 20:40:07 +0000 (23:40 +0300)]
Merge branch 'dev' into dev-next

7 years agoRevert "ifupdownaddons: bridgeutils: uncomment parsing code for brctl mc attributes"
Julien Fortin [Fri, 27 Jan 2017 14:34:13 +0000 (17:34 +0300)]
Revert "ifupdownaddons: bridgeutils: uncomment parsing code for brctl mc attributes"

This reverts commit 65beb82662576c047a281389bd663589dcba09db.

it's causing testifupdown2.py:TestMakoJson to fail... Basically this commit
uncomment codes which parse mc value from brctl output. So `ifquery -r` output
is different (this new attribute show up under the bridge). TestMakoJson at
some point does:
$ ifquery -a -r -t json > running_json
Then later
$ ifup -i running_json...
This ifup fails on:
...
warning: br0: unsupported attribute 'bridge-mclmt'
...

7 years agoaddons: vxlan: ifquery: fix remote-ip handling
Roopa Prabhu [Thu, 26 Jan 2017 22:34:32 +0000 (14:34 -0800)]
addons: vxlan: ifquery: fix remote-ip handling

Ticket: CM-14628
Reviewed By: julien, nikhil, vivek, mallik
Testing Done: Tested with vxlan config and remote ips added externally

Recent handling of vxlan-purge-routes as part of CM-13815 did not fix
handling of remote ips during ifquery --check and ifquery --running.
This patch fixes ifquery -c and ifquery running for external
vxlan controller cases.

Without this, ifquery --check always returns exit code of 1 for
external vxlan controller configs

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoMerge branch 'dev' into dev-next
Julien Fortin [Mon, 23 Jan 2017 23:53:53 +0000 (02:53 +0300)]
Merge branch 'dev' into dev-next

7 years agoRevert "addons: mstpctl: reset (default) bridge mstpctl options when users remove...
Nikhil [Fri, 20 Jan 2017 21:39:45 +0000 (13:39 -0800)]
Revert "addons: mstpctl: reset (default) bridge mstpctl options when users remove settings"

This reverts commit a3d36dd86d6888a0b61b506a534c24ea4867a18f.
Ticket CM-14516 has been filed to track this

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
7 years agoaddons: mstpctl: ifquery -c --with-default, ignore mstpctl default attributes when...
Nikhil [Thu, 5 Jan 2017 22:41:42 +0000 (14:41 -0800)]
addons: mstpctl: ifquery -c --with-default, ignore mstpctl default attributes when stp is off

Ticket: CM-13779
Reviewed By: roopa, satish, julien
Testing Done: testing the config given in the CM

mstpctl showportdetail <bridge> command won't output anything when
bridge-stp is off, therefore ignore mstpctl default attributes during
ifquery -c --with-defaults

This patch also consistently updates bridge and bridge port cache
at the same time.
Earlier bridge and bridge port cache were not consistent
because of the early return condition
    attrs = MSTPAttrsCache.get(bridgename)
        if attrs:
            return attrs
If either of bridge port cache and bridge cache is updated, function used to
return inconsistent cache values

Signed-off-by: Nikhil Gajendrakumar <nikhil@cumulusnetworks.com>
7 years agoifupdownaddons: bridgeutils: uncomment parsing code for brctl mc attributes
Julien Fortin [Thu, 19 Jan 2017 09:22:44 +0000 (12:22 +0300)]
ifupdownaddons: bridgeutils: uncomment parsing code for brctl mc attributes

Ticket: None
Reviewed By: Roopa, Nikhil G
Testing Done: ssim ifupdown2-tests

runtests.sh -T ~/result_smoke/single/ifupdown2-tests.log -r ~/result_smoke/single/summary_ifupdown2tests.txt -d cel-redxp-06 -t nightly -l INFO -k $VM_BASE_KERNEL -i $VM_BASE_IMG $TESTS_HOME/tests/smoke/testOneConfigifupdown2.py:Testifupdown2OneConfig

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: address: replay all gateway commands at every ifreload
Nikhil [Wed, 18 Jan 2017 01:55:35 +0000 (17:55 -0800)]
addons: address: replay all gateway commands at every ifreload

Ticket: CM-14472
Reviewed By: Roopa, Julien
Testing Done: used the config mentioned in CM

Fix introduced by "addons: address: add both v4 and v6 gateways
instead of just one" changed the way gateway commands were configured.
ifupdown2 does not replay default gateway commands on ifreload

This patch ensures all the gateway commands at every ifreload are replayed

Signed-off-by: Nikhil Gajendrakumar <nikhil@cumulusnetworks.com>
7 years agoaddons: mstpctl: reset (default) bridge mstpctl options when users remove settings
Nikhil [Wed, 7 Dec 2016 17:53:33 +0000 (09:53 -0800)]
addons: mstpctl: reset (default) bridge mstpctl options when users remove settings

Ticket: CM-8401
Reviewed By: Roopa, Julien
Testing Done: tested on all bridge mstpctl attributes.

This patch resets th following bridge attributes to defauls when
users remove settings from interface config file.

mstpctl-treeprio
mstpctl-ageing
mstpctl-fdelay
mstpctl-maxhops
mstpctl-maxage
mstpctl-txholdcount
mstpctl-forcevers
mstpctl-hello

Added an api in policy manager to get policy default value of any
module attribute.

Added a cache for bridge attributes to save some runtime

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
7 years agodebian: ifupdown2.postinst: refine 'iface lo' regex
Julien Fortin [Tue, 17 Jan 2017 12:49:23 +0000 (15:49 +0300)]
debian: ifupdown2.postinst: refine 'iface lo' regex

Ticket: CM-14362
Reviewed By: Roopa, Nikhil G
Testing Done:

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: changelog: update changelog for new version cl3u8
Julien Fortin [Tue, 17 Jan 2017 08:03:02 +0000 (11:03 +0300)]
debian: changelog: update changelog for new version cl3u8

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years ago'link-down' needs 'default' entry in dictionary
Daniel Walton [Fri, 13 Jan 2017 18:18:39 +0000 (18:18 +0000)]
'link-down' needs 'default' entry in dictionary

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: roopa@cumulusnetworks.com
Ticket: CM-14330

7 years agoaddons: address: log error when ip route gateway command fails
Julien Fortin [Fri, 13 Jan 2017 03:51:28 +0000 (06:51 +0300)]
addons: address: log error when ip route gateway command fails

Ticket: CM-14386
Reviewed By: Roopa, Purna, NIkhil G
Testing Done:

We have incorrect Address Range and Default g/w configuration. Kernel will give
error in such condition and ignore the route. but ifupdown2 is masking this
error and making user in blind spot.

$ ifdown -a -X eth0
$ ifreload -a
error: h2t_c-1: cmd 'ip route add table DataVrf1080 default via 3.0.0.1 dev h2t_c-1' failed: returned 2 (RTNETLINK answers: Network is unreachable
)
$ echo $?
1
$ ifquery -a
auto h2t_c-1
iface h2t_c-1
      address 6.0.0.1/26
      address 2001:fee1::1/64
      bond-slaves swp1 swp2
      bond-mode 802.3ad
      bond-miimon 100
      bond-min-links 1
      bond-xmit-hash-policy layer3+4
      bond-lacp-rate 1
      mtu 9152
      alias Local Node/s hostd-1-1 and Ports swp1 swp2 <==> Remote  Node/s torc-1-1 torc-1-2 and Ports swp7 swp7
      gateway 3.0.0.1
      gateway 2001:fee1::1
      vrf DataVrf1080

auto DataVrf1080
iface DataVrf1080
      vrf-table 1080

$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port
Julien Fortin [Thu, 12 Jan 2017 20:08:57 +0000 (23:08 +0300)]
addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port

Ticket: CM-14209
Reviewed By: Julien
Testing Done:

vids was a list and pvid is not a list, hence the check was failing

$ cat /etc/network/interfaces
auto vxlan1000
iface vxlan1000
      vxlan-id 1000
      vxlan-local-tunnelip 172.16.20.103
      vxlan-remoteip 172.16.20.106

auto bridge
iface bridge
      bridge-vlan-aware yes
      bridge-ports swp1 vxlan1000
      bridge-vids 100 200

$
$ ifdown -a -X eth0
$ ifreload -a -s
warning: vxlan1000: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
$ ifreload -a
warning: bridge: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
error: bridge: errors applying port settings
$ ifreload -a
error: vxlan1000: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
warning: bridge: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
error: bridge: errors applying port settings

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoRevert "addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA...
Roopa Prabhu [Thu, 12 Jan 2017 03:58:02 +0000 (19:58 -0800)]
Revert "addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port"
This reverts commit 4e2db079564a5055a03d2e7e97807b7956c6e110.

reverting because of some reported false errors.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port
Julien Fortin [Thu, 12 Jan 2017 00:19:19 +0000 (03:19 +0300)]
addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port

Ticket: CM-14209
Reviewed By: Roopa
Testing Done:

$ cat /etc/network/interfaces
auto vxlan1000
iface vxlan1000
       vxlan-id 1000
       vxlan-local-tunnelip 172.16.20.103
       vxlan-remoteip 172.16.20.106

auto bridge
iface bridge
       bridge-vlan-aware yes
       bridge-ports swp1 vxlan1000
       bridge-vids 100 200

$
$ ifdown -a -X eth0
$ ifreload -a -s
warning: vxlan1000: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
$ ifreload -a
warning: bridge: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
error: bridge: errors applying port settings
$ ifreload -a
error: vxlan1000: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
warning: bridge: `bridge-access` attribute is mandatory when vxlan device (vxlan1000) is part of vlan aware bridge (bridge)
error: bridge: errors applying port settings
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: fix syntax check failing on bridge without port
Julien Fortin [Wed, 11 Jan 2017 20:01:11 +0000 (23:01 +0300)]
addons: bridge: fix syntax check failing on bridge without port

Ticket: CM-13653
Reviewed By: Roopa, Daniel W
Testing Done:

$ cat /etc/network/interfaces
auto bridge
iface bridge
    bridge-vids 10-15
    bridge-vlan-aware yes

$ ifup --syntax-check --verbose --all --interfaces /etc/network/interfaces
info: loading builtin modules from /usr/share/ifupdown2/addons
info: executing /var/lib/ifupdown2/hooks/get_reserved_vlan_range.sh
info: executing /bin/pidof -x clagd
info: executing /var/lib/ifupdown2/hooks/get_reserved_vlan_range.sh
info: executing /bin/pidof mstpd
info: executing /sbin/ip rule show
info: executing /sbin/ip -6 rule show
info: address: using default mtu 1500
info: 'link_master_slave' is set. slave admin state changes will be delayed till the masters admin state change.
info: processing interfaces file /etc/network/interfaces
$ echo $?
0
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agovxlan: add new attribute vxlan-purge-remotes to make purging remotes explicit
Roopa Prabhu [Tue, 10 Jan 2017 22:59:32 +0000 (14:59 -0800)]
vxlan: add new attribute vxlan-purge-remotes to make purging remotes explicit

Ticket: CM-13815
Reviewed By:
Testing Done: Tested remote purging

vxlan purging remotes is a feature where we clean up
existing fdb remote entries in favor of the ones specified in the
interfaces file. Obviously in precense of an external controller
like bgp or vxrd this is not a good thing because these remotes
maybe installed by these external controller  daemons.
This patch makes the purgining behaviour explicit by a new attribute.
We will ship with a default policy file which sets vxlan-purge-remotes to no.

This also cleans up a bug introduced by fix to CM-13767 where we were
trying to delete default remote entry pointing to the local ip.

more details below.

problem:
for static configuration, ifupdown2 has some code to "purge" existing
default remote fdb entries and install
new ones corresponding to the ones specified in the interfaces file
(with vxlan-remoteip).
For non-static configuration (ie in presence of an external controller),
it skips this "purge"...because these entries
maybe added by an external controller. To detect that there is no
external controller running..., today it
checks if the vxrd process is running or not. We need to extend this
check to now include bgp (for evpn)...and it gets trickier with bgp
since just checking the quagga pid is not good.

Solution:
I would like to make this purging explicit with an attribute. This patch
adds a 'vxlan-purge-remotes yes|no' attribute. vxlan remote address purging
will take into affect when:
        vxlan-remoteip attribute is present in the interfaces file
        or
        vxlan-purge-remotes is set to 'yes'

We will ship a ifupdown2 default policy file to disable purging by
default (vxlan-purge-remotes no).
For existing customer deployed static configs, since the interfaces file
will already have remote entries, this change
will behave as existing code (ie purge = yes).

For existing vxrd deployments, as long as already deployed interfaces
files have no vxlan-remoteip entries,
this patch does not change any behavior (can people confirm that
existing vxrd deployments have no vxlan-remoteip entries in their
interfaces ?)

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoMerge branch 'dev' into dev-next
Julien Fortin [Sun, 8 Jan 2017 13:32:35 +0000 (16:32 +0300)]
Merge branch 'dev' into dev-next

7 years agoaddons: bridge: add support for bridge-vids alias: bridge-trunk
Julien Fortin [Sun, 8 Jan 2017 04:38:35 +0000 (07:38 +0300)]
addons: bridge: add support for bridge-vids alias: bridge-trunk

Daniel: Having both bridge-vids and bridge-trunk at the
net add interface NAME <TAB>
level creates confusion… need to remove bridge-vids

This commit adds bridge-trunk as an alias for bridge-vids

Ticket: CM-14041
Reviewed By: Roopa, Nikhil G
Testing Done:

$ ifquery -a
auto bridge
iface bridge
      bridge-vlan-aware yes
      bridge-ports swp1 swp9
      bridge-trunk 2-100
      bridge-pvid 101
      bridge-stp on

$ ifrelaod -a
$ ifquery -a -c
auto bridge
iface bridge                                                        [pass]
      bridge-vlan-aware yes                                       [pass]
      bridge-ports swp1 swp9                                      [pass]
      bridge-stp yes                                              [pass]
      bridge-pvid 101
      bridge-trunk 2-100                                              []

$ ifquery -a -r
auto bridge
iface bridge
      bridge-vlan-aware yes
      bridge-ports swp9 swp1
      bridge-stp yes
      bridge-pvid 101
      bridge-vids 2-101

$ net show bridge vlan
port       vlan ids
swp1        2-100
             101 PVID Egress Untagged

swp9          2-100
               101 PVID Egress Untagged

bridge         None

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoMerge branch 'dev' into dev-next
Julien Fortin [Sun, 8 Jan 2017 02:40:26 +0000 (05:40 +0300)]
Merge branch 'dev' into dev-next

7 years agoaddons: bond: add support for attribute aliases (bond-ports)
Julien Fortin [Fri, 6 Jan 2017 14:58:49 +0000 (17:58 +0300)]
addons: bond: add support for attribute aliases (bond-ports)

This features will allow attributes to have aliases. Our use case today is
between bond-slaves and bridge-ports, which be a little confusing.
It follows the kernel api and existing linux tools. Bonding driver calls them
slaves and to the bridge driver they are ports.

With NCLU we we would like to be more consistent. We will now also support
"bond-ports"a

Ticket: CM-12763
Reviewed By: Roopa
Testing Done:

$ ifquery -a -c
auto bond0
iface bond0                                                         [pass]
      bond-slaves swp1                                            [pass]

auto bond1
iface bond1                                                         [pass]
      bond-ports swp2                                             [pass]

root@cel-redxp-06:~# ifquery -a -r
auto bond0
iface bond0
      bond-lacp-bypass-allow 0
      bond-slaves swp1
      bond-mode 802.3ad
      bond-use-carrier 1
      bond-lacp-rate 1
      bond-min-links 1
      bond-miimon 100
      bond-xmit-hash-policy layer3+4

auto bond1
iface bond1
      bond-lacp-bypass-allow 0
      bond-slaves swp2
      bond-mode 802.3ad
      bond-use-carrier 1
      bond-lacp-rate 1
      bond-min-links 1
      bond-miimon 100
      bond-xmit-hash-policy layer3+4

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port
Julien Fortin [Fri, 6 Jan 2017 02:20:10 +0000 (05:20 +0300)]
addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA port

Ticket: CM-12235
Reviewed By: Roopa, Nikhil G
Testing Done:

$ ifquery vx br0
auto vx
iface vx
      vxlan-id 14567100
      vxlan-local-tunnelip 27.0.0.11
      mstpctl-portbpdufilter yes
      mstpctl-bpduguard yes
      mtu 1500

auto br0
iface br0
      bridge-stp off
      bridge-ports vx
      bridge-vlan-aware yes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdown: add missing supporting code for 'link-down [yes|no]'
Roopa Prabhu [Wed, 4 Jan 2017 22:52:09 +0000 (14:52 -0800)]
ifupdown: add missing supporting code for 'link-down [yes|no]'

Ticket: CM-13434
Reviewed by: julien, nikhil, daniel
Testing Done: ifreload and multiple down [yes|no] sequences under
physical and logical interfaces (ifupdown2-tests test case is pending)

This also moves the fix done for CM-4125 (inet manual handling for
logical devices) into a single place under ifupdownmain.

attribute 'link-down [yes|no]' will not work in all cases when 'inet manual'
is used. This is only to preserve the semantics of 'inet manual'.
Best use of 'link-down [yes|no]' is to use it without 'inet manual'..
they are conflicting features anyways.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: link: add new 'link-down [yes|no]' link attribute to keep link down
Roopa Prabhu [Thu, 5 Jan 2017 18:52:31 +0000 (10:52 -0800)]
addons: link: add new 'link-down [yes|no]' link attribute to keep link down

Ticket: CM-13434
Reviewed by: julien, nikhil, daniel
Testing Done: ifreload and multiple down [yes|no] sequences under
physical and logical interfaces (ifupdown2-tests test case is
pending)

This also moves the fix done for CM-4125 (inet manual handling for
logical devices) into a single place under ifupdownmain.

attribute 'link-down [yes|no]' will not work in all cases when 'inet
manual' is used. This is only to preserve the semantics of 'inet manual'.
Best use of 'link-down [yes|no]' is to use it without 'inet manual'..
they are conflicting features anyways.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoRevert "addons: address: add 'down' keyword to modinfo dictionary"
Roopa Prabhu [Thu, 5 Jan 2017 18:51:32 +0000 (10:51 -0800)]
Revert "addons: address: add 'down' keyword to modinfo dictionary"

This reverts commit a21c63b65ca297ca6f23c919bbb74e58f9e04a07.

Moving this to link-down in link.py addon module..due to conflict
with usercmds.py

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoRevert "ifupdown: add new 'down [yes|no]' link attribute to keep link down"
Roopa Prabhu [Thu, 5 Jan 2017 18:50:48 +0000 (10:50 -0800)]
Revert "ifupdown: add new 'down [yes|no]' link attribute to keep link down"

This reverts commit 02e00f54bbf9d0ca647c1ed2c39f7af28b6653b7.

reverting this commit to move it to link.py addon module.
down conflicts with usercmds.py 'down'

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: address: add 'down' keyword to modinfo dictionary
Roopa Prabhu [Thu, 5 Jan 2017 16:44:26 +0000 (08:44 -0800)]
addons: address: add 'down' keyword to modinfo dictionary

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoifupdown: add new 'down [yes|no]' link attribute to keep link down
Roopa Prabhu [Wed, 4 Jan 2017 22:52:09 +0000 (14:52 -0800)]
ifupdown: add new 'down [yes|no]' link attribute to keep link down

Ticket: CM-13434
Reviewed by: julien, nikhil, daniel
Testing Done: ifreload and multiple down [yes|no] sequences under
physical and logical interfaces (ifupdown2-tests test case is pending)

This also moves the fix done for CM-4125 (inet manual handling for
logical devices) into a single place under ifupdownmain.

attribute 'down [yes|no]' will not work in all cases when 'inet manual'
is used. This is only to preserve the semantics of 'inet manual'.
Best use of 'down [yes|no]' is to use it without 'inet manual'..
they are conflicting features anyways.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bridge: update bridge-access valid range (0 and 4095 are reserved)
Julien Fortin [Wed, 4 Jan 2017 16:54:42 +0000 (19:54 +0300)]
addons: bridge: update bridge-access valid range (0 and 4095 are reserved)

Ticket: CM-14173
Reviewed By: Roopa, Daniel W, Nikhil G

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: ethtool: update link speed valid values: add 25G and 50G
Julien Fortin [Wed, 4 Jan 2017 16:28:29 +0000 (19:28 +0300)]
addons: ethtool: update link speed valid values: add 25G and 50G

Ticket: CM-14122
Reviewed By: Roopa, Daniel W, Nikhil G

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: bridge-portmcfl: add support for yes/no value
Julien Fortin [Tue, 3 Jan 2017 15:48:59 +0000 (18:48 +0300)]
addons: bridge: bridge-portmcfl: add support for yes/no value

Ticket: CM-14146
Reviewed By: Roopa, Daniel W, Nikhil G
Testing Done:

bridge-portmcfl attribute needs to validate an <interface-yes-no-0-1-list>
to support the yes/no syntax.
This is an incremental commit for CM-8866

$ ifquery -a
auto br0
iface br0
      bridge-ports swp1 swp2 swp3 swp4
      bridge-portmcfl swp1=yes swp2=no swp3=1 swp4=0

auto br1
iface br1
      bridge-vlan-aware yes
      bridge-ports swp5 swp6 swp7 swp8

auto swp5
iface swp5
      bridge-portmcfl yes

auto swp6
iface swp6
      bridge-portmcfl no

auto swp7
iface swp7
      bridge-portmcfl 1

auto swp8
iface swp8
      bridge-portmcfl 0
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoonly ipv4 tunnel end points supported for Vxlan
Daniel Walton [Tue, 3 Jan 2017 15:42:43 +0000 (15:42 +0000)]
only ipv4 tunnel end points supported for Vxlan

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: roopa@cumulusnetworks.com
Ticket: CM-14197

7 years agoaddons: bridge: missing bridge-portmcrouter yes/no support under port
Julien Fortin [Tue, 3 Jan 2017 07:40:26 +0000 (10:40 +0300)]
addons: bridge: missing bridge-portmcrouter yes/no support under port

Ticket: CM-14199
Reviewed By: Roopa, Nikhil G, Daniel W
Testing Done:

$ cat /etc/network/interfaces
auto br0
iface br0
        bridge-ports swp1

auto swp1
iface swp1
        bridge-portmcrouter yes

$ ifreload -a
$ ifquery -a -c
auto br0
iface br0                                                           [pass]
      bridge-ports swp1                                           [pass]

auto swp1
iface swp1                                                          [pass]
      bridge-portmcrouter yes                                     [pass]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: address: purge ifalias when no alias keyword is provided
Julien Fortin [Tue, 27 Dec 2016 16:03:19 +0000 (17:03 +0100)]
addons: address: purge ifalias when no alias keyword is provided

Ticket: CM-13044
Reviewed By: Roopa, Nikhil G, Daniel W,
Testing Done:

For some reason we can't simply write into a file when we want to purge the
ifalias, we have to exec a command. I wasn't able to make it work in any
other way.

add an alias to an interface, ifreload, ip link show interface
modify it, ifreload, ip link show interface
remove it, ifreload, ip link show interface

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years ago'address-virtual' needs to be multivalue
Daniel Walton [Thu, 29 Dec 2016 16:29:20 +0000 (16:29 +0000)]
'address-virtual' needs to be multivalue

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: roopa@cumulusnetworks.com
Ticket: CM-14164

7 years agoaddons: address: purge ifalias when no alias keyword is provided
Julien Fortin [Tue, 27 Dec 2016 16:03:19 +0000 (17:03 +0100)]
addons: address: purge ifalias when no alias keyword is provided

Ticket: CM-13044
Reviewed By: Roopa, Nikhil G, Daniel W,
Testing Done:

For some reason we can't simply write into a file when we want to purge the
ifalias, we have to exec a command. I wasn't able to make it work in any
other way.

add an alias to an interface, ifreload, ip link show interface
modify it, ifreload, ip link show interface
remove it, ifreload, ip link show interface

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: identify a bridge with bridge-ports or bridge-vlan-aware keywords
Roopa Prabhu [Thu, 22 Dec 2016 07:02:12 +0000 (23:02 -0800)]
addons: bridge: identify a bridge with bridge-ports or bridge-vlan-aware keywords

Ticket: CM-14158
Reviewed By: julien, nikhilg
Testing Done: Tested with a bridge config without bridge-ports line.

NCLU wants the ability to create a bridge without ports (to add them
later). Today we cannot specify an attribute without values. We get the
below error:
info: processing interfaces file /etc/network/interfaces
error: /etc/network/interfaces: line10: iface bridge: invalid syntax
'bridge-ports'

The error comes from a generic parser check...we will
need to add exceptions to the generic check if we allow attributes
without values.

This patch simply identifies a bridge by both the bridge-vlan-aware and
bridge-ports keyword. For vlan aware bridge it will simply work.
For old bridge driver nclu will have to specify 'bridge-vlan-aware no'
to achieve the same. nclu does not support old bridge
model today, so defering the old bridge driver discussion for later.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: mstpctl: reset (default) bridge mstpctl options when users remove settings
Nikhil [Wed, 7 Dec 2016 17:53:33 +0000 (09:53 -0800)]
addons: mstpctl: reset (default) bridge mstpctl options when users remove settings

Ticket: CM-8401
Reviewed By: Roopa, Julien
Testing Done: tested on all bridge mstpctl attributes.

This patch resets th following bridge attributes to defauls when
users remove settings from interface config file.

mstpctl-treeprio
mstpctl-ageing
mstpctl-fdelay
mstpctl-maxhops
mstpctl-maxage
mstpctl-txholdcount
mstpctl-forcevers
mstpctl-hello

Added an api in policy manager to get policy default value of any
module attribute.

Added a cache for bridge attributes to save some runtime

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
7 years agobondutils: caching min_links value
Julien Fortin [Mon, 12 Dec 2016 06:34:43 +0000 (07:34 +0100)]
bondutils: caching min_links value

Ticket: CM-13996
Reviewed By: Roopa, Nikhil G
Testing Done:

With the following configuration:
auto bond0
iface bond0
      bond-min-links 1
      bond-mode 802.3ad
      bond-slaves eth0 eth1 eth2
      bond-xmit-hash-policy layer3+4

auto vlan0
iface vlan0
      vlan-raw-device   bond0
      address 10.132.253.4/31
      address 2a03:2260:2342:fe09::1/126

On non cumulus distribution bond-min-links doesn't default to 1
For some reasons the min_links value wasn't cache with the other
bond values, if you issue an ifreload on a running/existing configuration
since the min_links value is not cache ifreload will down the bond, set
min_links to 1, then bond up. When taking the bond down the kernel will
also flush the ipv6 address but not the ipv4 address...

The issue was reported by an ifupdown2 contributor on github. He find out
that when running ifreload the ipv6 were flushed.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agobondutils: caching min_links value
Julien Fortin [Mon, 12 Dec 2016 06:34:43 +0000 (07:34 +0100)]
bondutils: caching min_links value

Ticket: CM-13996
Reviewed By: Roopa, Nikhil G
Testing Done:

With the following configuration:
auto bond0
iface bond0
      bond-min-links 1
      bond-mode 802.3ad
      bond-slaves eth0 eth1 eth2
      bond-xmit-hash-policy layer3+4

auto vlan0
iface vlan0
      vlan-raw-device   bond0
      address 10.132.253.4/31
      address 2a03:2260:2342:fe09::1/126

On non cumulus distribution bond-min-links doesn't default to 1
For some reasons the min_links value wasn't cache with the other
bond values, if you issue an ifreload on a running/existing configuration
since the min_links value is not cache ifreload will down the bond, set
min_links to 1, then bond up. When taking the bond down the kernel will
also flush the ipv6 address but not the ipv4 address...

The issue was reported by an ifupdown2 contributor on github. He find out
that when running ifreload the ipv6 were flushed.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: update changelog
Roopa Prabhu [Thu, 8 Dec 2016 05:19:07 +0000 (21:19 -0800)]
debian: update changelog

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: address: fix _cache_update to use the right set cache api
Roopa Prabhu [Thu, 8 Dec 2016 00:41:36 +0000 (16:41 -0800)]
addons: address: fix _cache_update to use the right set cache api

Ticket: CM-13967
Reviewed By: julien, nikhil
Testing Done: tested failing config in the bug

This patch fixes a cache_update problem caught during mtu updates.
Cache updates were failing silently, leaving stale cache values.
For the below config, ifupdown2 was falsely reporting an mtu error,
because the cache had a stale mtu default value

$ifquery peerlink-3 peerlink-3.4094
auto peerlink-3
iface peerlink-3
        bond-slaves swp32s0 swp32s1
        bond-mode 802.3ad
        mtu 9202

auto peerlink-3.4094
iface peerlink-3.4094
        address 27.0.0.11/32
        mtu 9202

$ifreload -a
warning: peerlink-3.4094: vlan dev mtu 9202 is greater than lower realdev peerlink-3 mtu 1500

Before patch:
sequence of events:
- build cache with current system running mtu
- link set mtu 9202 on peerlink-3
- update cache for peerlink-3 to 9202 <---- cache update fails
- when processing peerlink-3.4094, query cache for lowerdev peerlink-3
  mtu: this returns 1500   <--- stale cache value
- print warning

After patch:
sequence of events:
- build cache with current system running mtu
- link set mtu 9202 on peerlink-3
- update cache for peerlink-3 to 9202 <---- cache updates to 9202
- when processing peerlink-3.4094, query cache for lowerdev peerlink-3
  mtu: this returns 9202
- success and proceed

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoRevert "addons: vxlan: log info when bridge add/del fails"
Julien Fortin [Tue, 6 Dec 2016 03:37:18 +0000 (04:37 +0100)]
Revert "addons: vxlan: log info when bridge add/del fails"

This reverts commit 6a7f69a5a64d8fad400b72bd0cb73d5dab8d58d8.

7 years agoifupdownaddrons: moduleBase: adding length check before array manipulation
Julien Fortin [Mon, 5 Dec 2016 02:27:08 +0000 (03:27 +0100)]
ifupdownaddrons: moduleBase: adding length check before array manipulation

Ticket: CM-13862
Reviewed By: Roopa, Eric Pulvino, Nikghil G
Testing Done:

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: ethtool: ifquery -c displays ethtool attribute as 'unknown' when we can't...
Julien Fortin [Fri, 2 Dec 2016 18:36:40 +0000 (19:36 +0100)]
addons: ethtool: ifquery -c displays ethtool attribute as 'unknown' when we can't get the running values

Ticket: CM-13820
Reviewed By: Roopa, Daniel W
Testing Done: test from the bug

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: dhcp: release dhclient4/6 if it's still running but inet/inet6 is not configured
Julien Fortin [Fri, 2 Dec 2016 06:15:09 +0000 (07:15 +0100)]
addons: dhcp: release dhclient4/6 if it's still running but inet/inet6 is not configured

Ticket: CM-13817
Reviewed By: Roopa, Kanna, Nikhil G
Testing Done:

1) use inet and inet6 dhcp in interfaces file
2) do a ifup -v
3) make sure dhclient v4 and v6 is running
4) now remove inet6 dhcp section
5) ifreload -a -v (should kill dhclient6)
6) replace inet by inet6
7) ifreload -a -v (should kill dhclient4 and exec dhclient6)

etc.. I played with all possible combinations

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: ethtool: replacing loopback ipcmd check with private LOOPBACK flag
Julien Fortin [Fri, 2 Dec 2016 05:21:35 +0000 (06:21 +0100)]
addons: ethtool: replacing loopback ipcmd check with private LOOPBACK flag

Ticket: CM-13737
Reviewed By: Roopa, Nikhil G
Testing Done:

Incremental commit for CM-13737

Create a policy file such as:

$ cat /var/lib/ifupdown2/policy.d/defaults_policy.json
{
    "README": "This file is automatically generated. Do not edit this file.",
    "ethtool": {
            "defaults": {
           "link-autoneg": "off",
   "link-duplex": "full",
   "link-speed": "1000"
},
"iface_defaults": {}
    }
}

then do ifdown lo && ifup lo

without this patch or af8734d18a9e173a89db982285e801eb31deab5d
you would reproduce the fail

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdownmain: fix setting of loopback flag on 'lo' interface
Roopa Prabhu [Thu, 1 Dec 2016 23:42:46 +0000 (15:42 -0800)]
ifupdownmain: fix setting of loopback flag on 'lo' interface

It was initially set in a place where only interfaces with
dependencies were processed. This patch moves it to the right
place.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agodebian: changelog: updating changelog for version cl3u7
Julien Fortin [Thu, 1 Dec 2016 23:49:44 +0000 (00:49 +0100)]
debian: changelog: updating changelog for version cl3u7

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: dhcp: executing dhclient4 and dhclient6 ops independently
Julien Fortin [Thu, 1 Dec 2016 23:39:35 +0000 (00:39 +0100)]
addons: dhcp: executing dhclient4 and dhclient6 ops independently

Ticket: CM-13817
Reviewed By: CCR-5408
Testing Done: steups explained in the bug

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: address: fix syntax check handler for mtu
Roopa Prabhu [Thu, 1 Dec 2016 19:48:16 +0000 (11:48 -0800)]
addons: address: fix syntax check handler for mtu

I had redefined the main syntax check handler for mtu.
fix it to be a new function.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bridge: don't warn several times for duplicate bridge-ports in stanza
Julien Fortin [Thu, 1 Dec 2016 06:31:52 +0000 (07:31 +0100)]
addons: bridge: don't warn several times for duplicate bridge-ports in stanza

auto br0
iface br0
      bridge-ports swp1 swp2
      bridge-ports swp3 swp4

running ifquery in this configuration gaves us 2 identical warnings:

warning: br0: ignoring duplicate bridge-ports lines: ['swp3 swp4']
warning: br0: ignoring duplicate bridge-ports lines: ['swp3 swp4']

when running ifreload -a we still see 2 warnings, this will need to be looked
at later.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: dhcp: check if iface has link-local address before starting dhclient6
Julien Fortin [Thu, 1 Dec 2016 05:34:02 +0000 (06:34 +0100)]
addons: dhcp: check if iface has link-local address before starting dhclient6

Ticket: CM-13248
Reviewed By: Roopa, Kanna, Nikhil G
Testing Done: See bug

Today before starting dhclient6, we are sleeping 2 seconds we need to make sure
the configured interface is up and has a link-local address.
In some cases 2 seconds is not enough. This patch will install a retry loop
with a 10 sec timeout.
We are querying ip -6 addr show to make sure the interface is properly confi-
-gured but in the future the plan is to move this call to netlink.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: vrf: bring up master on first slave ifup if WITH_DEPENDS is set
Roopa Prabhu [Wed, 30 Nov 2016 21:06:36 +0000 (13:06 -0800)]
addons: vrf: bring up master on first slave ifup if WITH_DEPENDS is set

Ticket: CM-12988
Reviewed By: julien, nikhil
Testing Done: Tested ifdown and ifup of vrf device with --with-depends

This patch fixes transient errors like below on vrf slaves when
vrf device is being brought up with --with-depends:
"error: swp1: vrf vrf1 not around, skipping vrf config
error: br100: vrf vrf1 not around, skipping vrf config
error: br101: vrf vrf1 not around, skipping vrf config"

In this patch, the vrf device is brought up on bringing
up of the first vrf slave. This is also done in the normal
ifreload -a case.

history on --with-depends for vrf: On vrf device down,
a bunch of slave state gets cleaned up.
and today, ifup of vrf device alone does not fix all that state
especially when there are vrr (macvlan) interfaces involved.
One has to use --with-depends. This is now also part of documentation
https://tickets.cumulusnetworks.com/browse/UD-851

$ifdown vrf1

$ifup vrf1 --with-depends

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: bridge: warn if we are ignoring bridge-pvid and bridge-vids when
Roopa Prabhu [Wed, 30 Nov 2016 03:57:13 +0000 (19:57 -0800)]
addons: bridge: warn if we are ignoring bridge-pvid and bridge-vids when
bridge-access is given

Ticket: CM-13683
Reviewed By: julien
Testing Done: Tested with bridge-access, bridge-pvid and bridge-vids on
a bridge-port

$ifquery swp21 bridge
auto swp21
iface swp21
        bridge-access 100
        bridge-pvid 100

auto bridge
iface bridge
        bridge-ports swp20 swp21
        bridge-vlan-aware yes

$ifreload -a
warning: swp21: bridge-access given, bridge-vids and bridge-pvid will be
ignored

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: address: propagate physical mtu to upper vlan devices
Roopa Prabhu [Mon, 28 Nov 2016 21:24:31 +0000 (13:24 -0800)]
addons: address: propagate physical mtu to upper vlan devices

Ticket: CM-13221
Reviewed By: julien, nikhil
Testing Done: tested mtu propagation for vlan devices

This is a followup to commit
29de36f36053 ("addons: address: various fixes for mtu handling").
This fixes a pending issue with mtu readjustments on vlan
interfaces on top of physical interfaces.
eg: with the below config:

$ifquery -a
auto swp1.100
iface swp1.100

auto swp1
iface swp1
        mtu 9000

/* at boot-up swp1 and swp1.100 mtu is set to 9000 */
$ifdown swp1  /* resets swp1 mtu to 1500. swp1.100 mtu is reset to 1500
                 implicitly by the kernel */
$ifup swp1    /* swp1 mtu is set to 1500. But swp1.100 mtu stays at 1500
*/

This problem is unique to physical interfaces and vlan devices on
physical interfaces. This is because, when logical interface is ifdown,
kernel deletes all its sub-interfaces.  And on the way up (ifup),
ifupdown2 re-creates all these sub-interfaces for you....that
sequence re-adjusts the mtu. For physical
interfaces, since the sub-interfaces are not deleted,
ifupdown2 does not do anything...and mtu of the subinterface is left to
what it was. And this ends up being what was there initially when the
lower interface went down. And ifdown of the lower physical interface,
resets the physical mtu to default which is 1500. The sub-interface mtu
returns to 1500 while the lower physical interface remains down.
(another detail here: kernel vlan driver re-adjusts mtu of the vlan
sub-interface on its own when the lower device mtu becomes lower. But
does not re-adjust its mtu when the lower device mtu increases. This is
expected and correct behavior). We will have to work around it in
ifupdown2 to suit our needs.

two solutions:
a) when physical interface is brought up, ifupdown2 can go and
pro-actively adjust the upper sub-interface mtu
OR
b) when physical interface is brought down, do not reset the mtu on the
device to default

(b) is the easiest and costs less if we dont expect the mtu of a
physical device to go to default on ifdown.
(a) is doable too, but is additional cost to go over all upper
interfaces.

This patch fixes this problem with solution (a). But, makes sure
this does not add additional cost to the default ifreload -a path.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoiface: add support for ifaceLinkPrivFlags.LOOPBACK
Roopa Prabhu [Wed, 30 Nov 2016 03:55:32 +0000 (19:55 -0800)]
iface: add support for ifaceLinkPrivFlags.LOOPBACK

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: vxlan: log info when bridge add/del fails
Julien Fortin [Tue, 29 Nov 2016 01:43:24 +0000 (02:43 +0100)]
addons: vxlan: log info when bridge add/del fails

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: vxlan: remove vxlan-local-tunnel-ip from bridge fdb add list
Julien Fortin [Tue, 29 Nov 2016 00:43:14 +0000 (01:43 +0100)]
addons: vxlan: remove vxlan-local-tunnel-ip from bridge fdb add list

Ticket: None
Reviewed By: Roopa
Testing Done:

This was discover while working on CM-13767 and some other vxlan issues

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: vxlan: continue to add or delete fdb entry after catching exception
Julien Fortin [Tue, 29 Nov 2016 00:20:38 +0000 (01:20 +0100)]
addons: vxlan: continue to add or delete fdb entry after catching exception

Ticket: CM-13767
Reviewed By: Roopa, Purna, Nikhil G
Testing Done:

auto vx-1000
iface vx-1000
      vxlan-id 1000
      bridge-access 100
      vxlan-local-tunnelip 27.0.0.2
      vxlan-remoteip 27.0.0.1
      vxlan-remoteip 27.0.0.2
      vxlan-remoteip 27.0.0.3
      mstpctl-portbpdufilter yes
      mstpctl-bpduguard yes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoRevert "addons: vxlan: support for multiple ip addresses for vxlan-remoteip keyword"
Julien Fortin [Mon, 28 Nov 2016 16:46:57 +0000 (17:46 +0100)]
Revert "addons: vxlan: support for multiple ip addresses for vxlan-remoteip keyword"

This reverts commit 32e2363a694e5fdf535e45db7ef6baba8cab2ed4.

I pushed this commit by mistake. It was a local commit waiting to be reviewed.
Reverting it for now, might be applied later after positive review.

7 years agoaddons: ethtool: skip ethtool if current ifaceobj is loopback interface
Julien Fortin [Mon, 28 Nov 2016 16:42:29 +0000 (17:42 +0100)]
addons: ethtool: skip ethtool if current ifaceobj is loopback interface

Ticket: CM-13737
Reviewed By: Roopa, Nikhil G
Testing Done:

tested on VX and hardnodes

7 years agoaddons: vxlan: support for multiple ip addresses for vxlan-remoteip keyword
Julien Fortin [Mon, 28 Nov 2016 13:38:06 +0000 (14:38 +0100)]
addons: vxlan: support for multiple ip addresses for vxlan-remoteip keyword

Ticket: CM-11317
Reviewed By: Roopa, Purna, Nikhil G, Scott Laffer
Testing Done: ifupdown2 smoke + ifupdown2-tests

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: changelog: update changelog for version cl3u7
Julien Fortin [Wed, 23 Nov 2016 19:23:10 +0000 (20:23 +0100)]
debian: changelog: update changelog for version cl3u7

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdownmain: properly squash ifaceobj based on their type
Julien Fortin [Wed, 23 Nov 2016 19:20:50 +0000 (20:20 +0100)]
ifupdownmain: properly squash ifaceobj based on their type

Ticket: CM-13689
Reviewed By: Roopa
Testing Done: ifupdown2 smokes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>