]> git.proxmox.com Git - mirror_ifupdown2.git/log
mirror_ifupdown2.git
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 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>
7 years agoaddons: warn or ignore if IP address is assigned to an enslaved interface
Julien Fortin [Tue, 22 Nov 2016 16:06:16 +0000 (17:06 +0100)]
addons: warn or ignore if IP address is assigned to an enslaved interface

Ticket: CM-11967
Reviewed By: Roopa, Daniel W, Nikhil G
Testing Done: ifupdown2-tests

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: ifquery: re-ordering bridge-ports and bond-slaves interfaces
Julien Fortin [Tue, 22 Nov 2016 10:36:04 +0000 (11:36 +0100)]
addons: ifquery: re-ordering bridge-ports and bond-slaves interfaces

Ticket: CM-11953
Reviewed By: Roopa, Nikhil G
Testing Done: ifupdown2-tests and ifupdown2 smokes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agopython-nlmanager: Handle decode of ILFA_ADDRESS which is 4 bytes
Scott Emery [Sat, 12 Nov 2016 00:02:30 +0000 (16:02 -0800)]
python-nlmanager: Handle decode of ILFA_ADDRESS which is 4 bytes

Ticket: CM-13536
Reviewed By: None
Testing Done: Sankaran tested it out

The IFLA_ADDRESS and IFLA_BROADCAST attributes for all interfaces has been a
6-byte MAC address. But the GRE interface uses a 4-byte IP address for this
attribute. This patch allows for decoding a 4-byte value as an IP address as
well as a 6-byte value as a MAC address.

7 years agonetlink: moving ip link set master commands to netlink
Julien Fortin [Mon, 21 Nov 2016 22:59:58 +0000 (23:59 +0100)]
netlink: moving ip link set master commands to netlink

Ticket:
Reviewed By: Roopa, Daniel W, Nikhil G, Dave O, Scott E
Testing Done: ifupdown2 smokes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agonlmanager: add support for ip link set master/nomaster
Julien Fortin [Mon, 21 Nov 2016 22:51:15 +0000 (23:51 +0100)]
nlmanager: add support for ip link set master/nomaster

Reviewed By: Roopa, Daniel, Scott E, Nikhil G, Dave O
Testing Done: ifupdown2 smokes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: address: syntax check for multiple gateways in the same addr family
Julien Fortin [Mon, 21 Nov 2016 15:43:57 +0000 (16:43 +0100)]
addons: address: syntax check for multiple gateways in the same addr family

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

$ ifquery br0
auto br0
iface br0
bridge-ports tap0 tap1
gateway 1.1.1.2
gateway 1.1.1.3
gateway 2001::2
gateway 2004::2

$ ifreload -a -s
warning: br0: address: 1.1.1.3: multiple gateways for inet family
warning: br0: address: 2004::2: multiple gateways for inet6 family
$
$ echo $?
1
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdown: iface: fix changes in default json output and ifquery -r output for inet6
Julien Fortin [Mon, 21 Nov 2016 14:23:22 +0000 (15:23 +0100)]
ifupdown: iface: fix changes in default json output and ifquery -r output for inet6

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

    incremental commit of:
    bef23f40a1e5 dhcp: add support for inet + inet6 dhcp on same interface

    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json
    [
        {
            "name": "swp1",
            "addr_method": "dhcp",
            "addr_family": "inet",
            "auto": true,
            "config": {
                "link-duplex": "full",
                "link-autoneg": "off",
                "link-speed": "10000"
            }
        },
        {
            "name": "swp1",
            "addr_method": "dhcp",
            "addr_family": "inet6",
            "auto": true,
            "config": {}
        }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json -c
    [
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": "inet",
        "auto": true,
        "config": {},
        "config_status": {},
        "status": "pass"
      },
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": "inet6",
        "auto": true,
        "config": {},
        "config_status": {},
        "status": "pass"
      }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json -r
    [
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": [
          "inet",
          "inet6"
        ],
        "auto": true,
        "config": {}
      }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus#

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoman: update ifreload man page to indicate that ifreload is
Roopa Prabhu [Thu, 17 Nov 2016 17:19:53 +0000 (09:19 -0800)]
man: update ifreload man page to indicate that ifreload is
non-disruptive

Ticket: CM-12655
Reviewed By: julien
Testing Done: tested build and help

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoifupdown: iface: if auto %ifacename is not part of the first stanza we squash it
Julien Fortin [Fri, 18 Nov 2016 16:14:13 +0000 (17:14 +0100)]
ifupdown: iface: if auto %ifacename is not part of the first stanza we squash it

Ticket: CM-12713
Reviewed By: Roopa, Nikhil G
Testing Done: Test from the bug

% for i in range(1,49):
iface swp${i}
    mtu 9216
    link-speed 10000
    link-duplex full
    link-autoneg off
% endfor

auto swp1
iface swp1

% ifup -a -v # should only up swp1

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdownmain: warn user if an interface matches a regex but doesn't exists in the...
Julien Fortin [Thu, 17 Nov 2016 20:56:37 +0000 (21:56 +0100)]
ifupdownmain: warn user if an interface matches a regex but doesn't exists in the config anymore

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

auto v0
iface v0
      vlan-id 100
      vlan-raw-device tap1

auto v1
iface v1
      vlan-id 100
      vlan-raw-device tap2

auto v2
iface v2
      vlan-id 100
      vlan-raw-device tap3

auto br0
iface br0
        bridge-ports tap9 regex v.*

In this specific case, if you remove v0 then execute ifreload ifupdown2 will
barf and say that v0 still exists as a dependency of br0.

From roopa:
The problem here is that the dependency gathering should have been done after
the ifdown's. However the ifdown's  need the dependency tree for built in
interfaces which could be part of globs. And this dependency tree needs to be
the current state of things so can't do the selective picking of interfaces
either. So, its a chicken and egg problem.

Ideally when one uses regex, if he is removing an interface that was matched by
a regex, he has to do a 'ifdown' manually today. 'ifdown v0' in this case.

So today we decided to change the warning message to let the user know that he
should manually down the interface that matches a regex.
This is not a permanent fix but a work-around. We don't want to introduce new
changes that may introduce false positive case for existing and working config

post 3.2:
-----------
we should consider doing the down's in two phases during ifreload
a) down everything that we are very certain was removed from the file
(to make sure regex's don't catch it).
b) build dependency tree and run through the down's once more, to
catch all glob matches for built-in interfaces

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: disable ip fwding on a bridge with no ip and no upperifaces
Roopa Prabhu [Tue, 15 Nov 2016 05:27:02 +0000 (21:27 -0800)]
addons: bridge: disable ip fwding on a bridge with no ip and no upperifaces

Ticket: CM-8363
Reviewed By: purna, balki, julien
Testing Done: Tested bridge bringup with and without addr and svi's

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agosystemd: start-networking: include interface exclusions in all targets
Roopa Prabhu [Mon, 14 Nov 2016 20:48:41 +0000 (12:48 -0800)]
systemd: start-networking: include interface exclusions in all targets

Ticket: CM-12934
Reviewed By: julien
Testing Done: tested systemctl <start|stop> networking with interface
exclusions

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: usercmd: ifquery lists user commands and sets unknown status
Julien Fortin [Wed, 16 Nov 2016 11:02:54 +0000 (12:02 +0100)]
addons: usercmd: ifquery lists user commands and sets unknown status

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

$ ifquery br0
auto br0
iface br0
      bridge-ports tap17 tap19
          up ls -l

$ ifquery br0 -c
auto br0
iface br0                                                           [pass]
      up ls -l                                                        []
      bridge-ports tap17 tap19       [pass]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodhcp: add support for inet + inet6 dhcp on same interface
Julien Fortin [Tue, 15 Nov 2016 17:33:07 +0000 (18:33 +0100)]
dhcp: add support for inet + inet6 dhcp on same interface

Ticket: CM-12370
Reviewed By: Roopa, Kanna, Scott E
Testing Done:

This patch also fixes a problem where dhcp6 used to create lease file with
a trailing whitespace. dhcp6 operation were also sometimes using the wrong
pid file. I added some code in the debian.postinst script to correctly
rename these files if they exists when we install/update ifupdown2.

(cumulus-qa-infra/cl-tests/tests/smoke/testdhcp.py:Testdhcp_relay)
auto swp1
iface swp1 inet dhcp
      link-speed 10000
      link-duplex full
      link-autoneg off

auto swp1
iface swp1 inet6 dhcp

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge/bond: fix ifquery regression where glob and regexes weren't expanded
Julien Fortin [Tue, 15 Nov 2016 13:25:10 +0000 (14:25 +0100)]
addons: bridge/bond: fix ifquery regression where glob and regexes weren't expanded

Ticket:
Reviewed By: Roopa, Nikhil G
Testing Done:

auto br0
iface br0
      bridge-ports tap17 glob tap[2-4].100 tap19 regex tap2.*

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdown: fix built-in iface ranges to include swp[1-3].100
Roopa Prabhu [Sun, 13 Nov 2016 22:31:38 +0000 (14:31 -0800)]
ifupdown: fix built-in iface ranges to include swp[1-3].100

Ticket: CM-11536, CM-11537
Reviewed By: julien, nikhil
Testing Done: Tested ifup, ifdown, ifquery for inerface ranges

Code already supports 'iface swp1.[2-4]'
This patch extends that support to include 'iface swp[1-3].100'.

Also fixes boundary conditions described in CM-11537. This
makes it consistent with glob syntax.

example config file with all cases:

auto swp[2-4].100
iface swp[2-4].100

auto swp5.[100-104]
iface swp5.[100-104]

auto br0
iface br0
        bridge-ports glob swp[6-7].100

auto bridge.[100-104]
vlan bridge.[100-104]
        bridge-igmp-querier-src 123.1.1.1

auto bridge
iface bridge
        bridge-vlan-aware yes
        bridge-ports glob swp8-9
        bridge-vids 100-104

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agonetlink: force python to load ifupdown2's nlmanager cpy instead of python-nlmanager
Julien Fortin [Thu, 10 Nov 2016 18:14:43 +0000 (19:14 +0100)]
netlink: force python to load ifupdown2's nlmanager cpy instead of python-nlmanager

Ticket: CM-13453
Reviewed By: Roopa, Nikhil G, Daniel W
Testing Done: ifupdown2-tests

We had an issue where python-nlmanager and ifupdown2's nlmanager differed
When netd starts it loads ifupdown2's addons, so it also tries to do the
imports. Since the current working directy is not /usr/share/ifupdown2 but
netd directory it won't load ifupdown2's nlmanager first but python-nlmanager
if it exists.

Here we insert/hardcode /usr/share/ifupdown2/ first in the path to make sure
we load the right nlmanager

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: address: various fixes for mtu handling
Roopa Prabhu [Mon, 7 Nov 2016 18:48:24 +0000 (10:48 -0800)]
addons: address: various fixes for mtu handling

Ticket: CM-6908, CM-6110, CM-13221
Reviewed By: julien, nikhil
Testing Done: added a new test in ifupdown2-tests which covers all cases

- move all mtu handling to a single function in addons/address.py
- Have an ifupdown2 default of 1500 mtu
- add a policy manager max_mtu check (we want to default cumulus max mtu
  to 9216)
- special handling for bond and bridges
        -  print an info log abt setting mtu on bridge
        -  this can be enhanced in the future to look
        at individual port mtu and rejecting the bridge mtu.
        this operation can be expensive right now. Hence
        just an info log.
- bond and vxlan dev mtu follow the rules of physical device mtu

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoifupdown2:ethtool: Add link-fec extension support
Vidya Sagar Ravipati [Thu, 3 Nov 2016 17:47:54 +0000 (10:47 -0700)]
ifupdown2:ethtool: Add link-fec extension support

Ticket:CM-12695
Reviewed By:TBD
Testing Done:
Validated
a) ifup -v <interface>
b) ifdown -v <interface>
c) ifreload -a

Changes:
a) Support for link-fec attribute for link to configure
   FEC configuration

Ex:
auto swp17
iface swp17
link-autoneg on
link-fec rs

Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Vidya Sagar Ravipati <vidya@cumulusnetworks.com>
7 years agonlmanager: removes 'Add support for decoding' debug msgs on -d output
Julien Fortin [Fri, 4 Nov 2016 10:36:25 +0000 (11:36 +0100)]
nlmanager: removes 'Add support for decoding' debug msgs on -d output

Ticket: CM-13208
Reviewed By: Roopa, Scott E, Daniel
Testing Done: smoke + ifupdown2-tests

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agonlmanager: pulling-in latest stable version
Julien Fortin [Fri, 4 Nov 2016 10:19:06 +0000 (11:19 +0100)]
nlmanager: pulling-in latest stable version

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agonlmanager: Provide option to prevent color output
Scott Emery [Mon, 29 Aug 2016 18:28:52 +0000 (11:28 -0700)]
nlmanager: Provide option to prevent color output

Ticket: CM-7361
Reviewed By: CCR-
Testing Done: Tested with clag

Certain loggers, most notably the syslog, don't allow non-printable characters
in their output, and so they convert them to a string of printable characters.
For example, the newline character is converted to #012. This results in output
that looks like this:

2016-08-29T18:50:46.263178+00:00 act-5712-08 clagd[21539]: RXed RTM_NEWNEIGH,
length 68, seq 0, pid 0, flags 0x0#012#012  #033[91mNetlink Header#033[0m#012
1: #033[91m0x44000000#033[0m  D...  Length 0x00000044 (68)#012   2:
#033[91m0x1c000000#033[0m  ....  Type 0x001c (28 - RTM_NEWNEIGH), Flags 0x0000
()#012   3: #033[91m0x00000000#033[0m  ....  Sequence Number 0x00000000 (0)#012
4: #033[91m0x00000000#033[0m  ....  Process ID 0x00000000 (0)#012
#033[93mService Header#033[0m#012   5: #033[93m0x07000000#033[0m  ....  Family
0x07 (7)#012   6: #033[93m0x29010000#033[0m  )...  Interface Index 0x00000129
(297)#012   7: #033[93m0x02000000#033[0m  ....  State 0x0002 (2), Flags 0x00,
Type 0x0000 (0)#012  Attributes#012   8: #033[92m0x0a000200#033[0m  ....  Length
0x000a (10) padded to 12, Type 0x0002 (2) NDA_LLADDR#012   9:
#033[92m0x00020000#033[0m  ....  00:02:00:00:00:09#012  10:
#033[92m0x00090000#033[0m  ....  #012  11: #033[94m0x08000900#033[0m  ....
Length 0x0008 (8), Type 0x0009 (9) NDA_MASTER#012  12: #033[94m0x2b010000#033[0m
+...  299#012  13: #033[92m0x14000300#033[0m  ....  Length 0x0014 (20), Type
0x0003 (3) NDA_CACHEINFO#012  14: #033[92m0x00000000#033[0m  ....  0#012  15:
#033[92m0x00000000#033[0m  ....  0#012  16: #033[92m0x00000000#033[0m  ....
0#012  17: #033[92m0x00000000#033[0m  ....  0#012#012Attributes Summary#012{'(
2) NDA_LLADDR': '00:02:00:00:00:09',#012 '( 3) NDA_CACHEINFO': (0, 0, 0, 0),#012
'( 9) NDA_MASTER': 299}

which is rather hard to interpret. So this patch modifes the nlpacket debug
output so that the user can specify whether or not color output should be used
by including an extra, optional parameter when instantiating a NetlinkPacket
object. The default is for color output, just like before this patch. But if
color output is not desired, then no VT100 control sequences will be output. Nor
will there be any newline characters embedded in the output.

The NetlinkManagerWithListener and NetlinkManager classes were also modified to
add the same optional use_color attribute, which defaults to True. Thus when
class members which instantiate NetlinkPacket objects are created the
appropriate value for the use_color attribute will be applied.

I also noticed that the default pid_offset of the NetlinkListener class was 2,
when it should have been 1. So I fixed that too.

7 years agonlmanager: Support new attribute types
Scott Emery [Mon, 22 Aug 2016 19:51:40 +0000 (12:51 -0700)]
nlmanager: Support new attribute types

Ticket: CM-7361
Reviewed By: CCR-5124
Testing Done: Tested with clag

CLAG requires some additional nlmanager functionality. Firstly, different
threads in CLAG with the same PID may instantiate NetlinkManager objects. This
currently assigned each the same pid value, which causes issues. So an optional
pid_offset parameter is added which is added to the PID when instantiating a
NetlinkManager object. This allows multiple threads in the same PID to be able
to have distinct identifiers. If a pid_offset is supplied, it should be 2 or
greater, since 0 and 1 are used by the NetlinkManagerWithListener.

Added two new attribute classes: FourByteList and TwoByteValue. Added an encode
function for the IPAddress attribute, and corrected some length errors in the
MACAddress attribute.

The Neighbor class got actual values for the CacheInfo, VLAN, VNI, IfIndex, and
Master attributes. The "Self" and "Master" flag values were added.

Also added the "family" parameter to the constructor for all attribute classes.
This eliminates the special-casing required for certain attribute's
instantiation.

7 years agoaddons: bond: 'ifquery -c' doesn't re-order user's bond-slaves list
Julien Fortin [Mon, 31 Oct 2016 00:45:46 +0000 (01:45 +0100)]
addons: bond: 'ifquery -c' doesn't re-order user's bond-slaves list

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

$ ifquery b0
auto b0
iface b0
      bond-slaves swp1 swp2

$ ifreload -a
$ ifquery -a -c
auto b0
iface b0
      bond-slaves swp2 swp1 [pass]

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

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: 'ifquery -c' doesn't re-order user's bridge-ports list
Julien Fortin [Mon, 31 Oct 2016 00:37:02 +0000 (01:37 +0100)]
addons: bridge: 'ifquery -c' doesn't re-order user's bridge-ports list

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

auto br0
iface br0
      bridge-ports tap0 tap1

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

$ ifreload -a
$ ifquery br0 -c

auto br0
iface br0                                                           [pass]
      bridge-ports tap0 tap1                                      [pass]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: bridge-access + bridge-vids on the same intf give a warning
Julien Fortin [Mon, 31 Oct 2016 00:24:31 +0000 (01:24 +0100)]
addons: bridge: bridge-access + bridge-vids on the same intf give a warning

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

auto tap0
iface tap0
      bridge-access 20
      bridge-vids 20

$ ifreload -a -s
warning: tap0: `bridge-access` and `bridge-vids` are not allowed on the same interface
$ echo $?
1
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: mstpctl: ifquery -with-defaults update for vlan-aware bridge ports
Nikhil [Thu, 6 Oct 2016 00:26:09 +0000 (17:26 -0700)]
addons: mstpctl: ifquery -with-defaults update for vlan-aware bridge ports

Ticket: CM-13086
Reviewed By: roopa, julien
Testing Done: smoke testifupdown2:TestWithdefaults is run

'ifquery -with-defaults' should display default values of
mstpctl-portbpdufilter and mstpctl-bpduguard under bridge port,
but not under the bridge itself

added PORT_PROCESSED flag check to prevent processing
bridge ports again

Example:
auto vxlan1wd
iface vxlan1wd
     vxlan-id 1001

auto vxlan2wd
iface vxlan2wd
     vxlan-id 1002

auto brwithdef2
iface brwithdef2
    bridge_ports vxlan1wd vxlan2wd
    bridge-vlan-aware yes

Sample 'ifquery --with-defaults vxlan1wd' output before fix:
auto vxlan1wd
iface vxlan1wd
    vxlan-id 1001

Sample 'ifquery --with-defaults vxlan1wd' output after fix:
auto vxlan1wd
iface vxlan1wd
    vxlan-id 1001
    mstpctl-portbpdufilter yes
    mstpctl-bpduguard yes

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
7 years agobridge-vids needs to be multivalue
Daniel Walton [Fri, 28 Oct 2016 00:01:13 +0000 (00:01 +0000)]
bridge-vids needs to be multivalue

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: julien@cumulusnetworks.com
7 years agoman: ifup: fixing spelling mistake
Julien Fortin [Sun, 23 Oct 2016 22:41:21 +0000 (00:41 +0200)]
man: ifup: fixing spelling mistake

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: control: updating standards-version to 3.9.8
Julien Fortin [Sun, 23 Oct 2016 22:40:17 +0000 (00:40 +0200)]
debian: control: updating standards-version to 3.9.8

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoRevert "ifupdown: utils: user command output on stdout"
Roopa Prabhu [Tue, 1 Nov 2016 04:41:47 +0000 (21:41 -0700)]
Revert "ifupdown: utils: user command output on stdout"

This reverts commit d9bb08208429349566139cd5fc65693c2493c372.

7 years agodebian: update changelog for version cl3u6
Julien Fortin [Mon, 24 Oct 2016 08:50:08 +0000 (10:50 +0200)]
debian: update changelog for version cl3u6

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoMerge branch 'dev' into release/cl-stable
Julien Fortin [Fri, 21 Oct 2016 21:10:09 +0000 (23:10 +0200)]
Merge branch 'dev' into release/cl-stable

7 years ago[PATCH ifupdown2] addons: addressvirtual: fixup macvlan device enslavements for vrfs
Roopa Prabhu [Wed, 19 Oct 2016 17:43:45 +0000 (10:43 -0700)]
[PATCH ifupdown2] addons: addressvirtual: fixup macvlan device enslavements for vrfs

Ticket: CM-12988
Reviewed By: julien, nikhil, dsa
Testing Done: tested ifup and ifdown of vrf devices with address virtual
slaves

This patch fixes up macvlan device enslavements when vrf device
or vrf slave is brought down and up. address virtual macvlan
devices on vrf slaves need to enslaved to the vrf. This
patch checks and fixes up those vrf enslavements for the following
cases:
ifdown <vrf_device> && ifup <vrf_device>
ifdown <vrf_slave> && ifup <vrf_slave>

starting state:
------------
$ip -br link show
myvrf            UP  46:c6:44:db:37:60 <NOARP,MASTER,UP,LOWER_UP>
bridge.901@bridge UP 44:38:39:00:77:88 <UP,BROADCAST,MULTICAST,UP>
bridge-901-v0@bridge.901 UP 00:00:5e:00:01:81 <UP,BROADCAST,MULTICAST,UP>

$ifdown myvrf
$ip -br link show
bridge.901@bridge DOWN           44:38:39:00:77:88 <BROADCAST,MULTICAST>
bridge-901-v0@bridge.901 DOWN    00:00:5e:00:01:81 <BROADCAST,MULTICAST,M-DOWN>

before patch (macvlan device bridge-901-v0 did not come up:
----------------------------------------
$ifup myvrf
$ip -br link show
bridge.901@bridge UP 44:38:39:00:77:88 <UP,BROADCAST,MULTICAST,UP>
bridge-901-v0@bridge.901 DOWN  00:00:5e:00:01:81 <BROADCAST,MULTICAST>
myvrf            UP             ce:a6:e1:85:75:73 <NOARP,MASTER,UP,LOWER_UP>

after patch:
------------
$ifup myvrf
$ip -br link show
bridge.901@bridge UP 44:38:39:00:77:88 <UP,BROADCAST,MULTICAST,UP>
bridge-901-v0@bridge.901 UP 00:00:5e:00:01:81 <UP,BROADCAST,MULTICAST,UP>
myvrf                   UP     ce:a6:e1:85:75:73 <NOARP,MASTER,UP,LOWER_UP>

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: addressvirtual: ifquery normalizing ip address to IPNetwork format for compar...
Julien Fortin [Tue, 18 Oct 2016 22:41:02 +0000 (00:41 +0200)]
addons: addressvirtual: ifquery normalizing ip address to IPNetwork format for comparaisons

Ticket: None
Reviewed By: Roopa
Testing Done:

Test from CM-8736:

auto bridge
iface bridge
      bridge-vlan-aware yes
      bridge-ports swp42
      mstpctl-treeprio 4096
      bridge-stp on
      bridge-vids 5 13 14 20 799 1001-1006
      bridge-pvid 192

auto bridge.20
iface bridge.20
      address 10.7.192.194/27
      address-virtual 44:38:39:ff:00:20 10.7.192.193

$ ifreload -a
$ ifquery bridge.20 -c
auto bridge.20
iface bridge.20                                                     [fail]
      address 10.7.192.194/27                                     [pass]
      address-virtual 44:38:39:ff:00:20 10.7.192.193/32           [fail]
$

it fails because ifquery is comparing : ['10.7.192.193/32'] with ['10.7.192.193']

after the patch:

$ ifquery bridge.20 -c
auto bridge.20
iface bridge.20                                                     [pass]
      address 10.7.192.194/27                                     [pass]
             address-virtual 44:38:39:ff:00:20 10.7.192.193              [pass]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: bridge: syntax check for illegal subintf as member of VLAN aware bridge
Julien Fortin [Tue, 18 Oct 2016 22:30:21 +0000 (00:30 +0200)]
addons: bridge: syntax check for illegal subintf as member of VLAN aware bridge

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

$ ifquery br0
auto br0
iface br0
      bridge-vlan-aware yes
      bridge-ports tap0 tap1.100
      bridge-vids 100 200
      bridge-pvid 1
      bridge-stp on

$ ifreload -a -s
error: br0: tap1.100: vlan sub-interface is not supported in a vlan-aware bridge
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdownmain: missing return statement and fixing 'network down' error checking
Julien Fortin [Mon, 10 Oct 2016 13:22:30 +0000 (15:22 +0200)]
ifupdownmain: missing return statement and fixing 'network down' error checking

Ticket:
Reviewed By: Roopa, Nikhil G

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodocs: examples: adding new example interface file
Julien Fortin [Wed, 5 Oct 2016 14:44:42 +0000 (16:44 +0200)]
docs: examples: adding new example interface file

Ticket: None
Reviewed By: Roopa
Testing Done:

This new interface file uses bridge, vlan, vxlan, bond and vrf interfaces.
It's a good way to try ifupdown2 capabilities.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: vrf: cosmetic print statement fix
Nikhil [Tue, 4 Oct 2016 18:37:52 +0000 (11:37 -0700)]
addons: vrf: cosmetic print statement fix

Ticket: CM-12753
Reviewed By: roopa, julien
Testing Done: used same config mentioned in the bug

Changed %d to %s inorder to print a string.

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
7 years agoifupdownaddons: bridgeutils: iproute2: skipping unsupported commands
Julien Fortin [Tue, 4 Oct 2016 08:18:26 +0000 (10:18 +0200)]
ifupdownaddons: bridgeutils: iproute2: skipping unsupported commands

Ticket:
Reviewed By: Roopa, Nikhil G
Testing Done:

When using ifupdown2 on regular distribution (debian/ubuntu etc...) users may
not have the latest iproute2/bridge-utils version. Thus the output parsed from
the various subcommands executed by ifupdown2 might defer and cause exception
to be throwned.
We identified several cases:
/sbin/bridge -c -json vlan show
/sbin/brctl showmcqv4src bridge0
/sbin/brctl showstp bridge0

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: vrf: removing ifaceobj.name from exception message
Julien Fortin [Tue, 4 Oct 2016 08:13:23 +0000 (10:13 +0200)]
addons: vrf: removing ifaceobj.name from exception message

Ticket: None
Reviewed By:
Testing Done:

The function _create_vrf_dev is surrounded by a try/catch as follow:
    try:
        vrf_table = self._create_vrf_dev(ifaceobj, vrf_table)
    except Exception, e:
        self.log_error('%s: %s' %(ifaceobj.name, str(e)), ifaceobj)

Thus we shouldn't include the ifaceobj.name in any error message passed to
log_error(). Since this function will raise an exception by default, it will
result in something like this:

error:br0.4002: red: red: create failed (cmd 'ip link add name red type vrf table 1001' failed: returned 1 ...[snip]
error:red: red: create failed (cmd 'ip link add name red type vrf table 1002' failed: returned 1 ...[snip]

after this patch:
error: red: create failed (cmd 'ip link add name red type vrf table 1002' failed: returned 1 ... [snip]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons may provide a list of ifupdown scripts to ignore
Julien Fortin [Tue, 27 Sep 2016 09:05:37 +0000 (11:05 +0200)]
addons may provide a list of ifupdown scripts to ignore

Ticket:
Reviewed By: Roopa, Nikhil G
Testing Done:

ifupdown2's python addons are replacing some/most of the old ifupdown shell
scripts. When addon_scripts_support is set to 1, ifupdown2 will execute every
scripts present in /etc/network/if-$ACTION.d/ if a script exists with a name
identical to an ifupdown2 addon, this script won't be executed.

Sometimes an ifupdown2 addons doesn't have the same name as the ifupdown script
it's supposed to replace. Or maybe one addon is replacing several scripts.
For example: bond.py is replacing /etc/network/if-*.d/ifenslave

Now each addon is able to provide a list of script to ignore.

[16:54:40] root:ifupdown2 # ifquery bond0
iface bond0
      bond-slaves tap0 tap1

[16:54:49] root:ifupdown2 # ifreload -a -d &> /tmp/ifreload.log
[16:54:54] root:ifupdown2 # cat /tmp/ifreload.log | grep ifenslave
debug: tap1: pre-up : running script /etc/network/if-pre-up.d/ifenslave
info: executing /etc/network/if-pre-up.d/ifenslave
debug: tap1: up : running script /etc/network/if-up.d/ifenslave
info: executing /etc/network/if-up.d/ifenslave
debug: lo: pre-up : running script /etc/network/if-pre-up.d/ifenslave
info: executing /etc/network/if-pre-up.d/ifenslave
debug: lo: up : running script /etc/network/if-up.d/ifenslave
info: executing /etc/network/if-up.d/ifenslave
debug: eth0: pre-up : running script /etc/network/if-pre-up.d/ifenslave
info: executing /etc/network/if-pre-up.d/ifenslave
debug: eth0: up : running script /etc/network/if-up.d/ifenslave
info: executing /etc/network/if-up.d/ifenslave
debug: tap0: pre-up : running script /etc/network/if-pre-up.d/ifenslave
info: executing /etc/network/if-pre-up.d/ifenslave
debug: tap0: up : running script /etc/network/if-up.d/ifenslave
info: executing /etc/network/if-up.d/ifenslave
[16:54:55] root:ifupdown2 #
...
apply patch
...
[16:55:16] root:ifupdown2 # ifreload -a -d &> /tmp/ifreload.log
[16:55:18] root:ifupdown2 # cat /tmp/ifreload.log | grep ifenslave
[16:55:19] root:ifupdown2 #

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoaddons: mstpctl: warning user when using portadminedge attr on bridge vlan aware
Julien Fortin [Mon, 26 Sep 2016 13:59:43 +0000 (15:59 +0200)]
addons: mstpctl: warning user when using portadminedge attr on bridge vlan aware

Ticket: CM-12478
Reviewed By: Roopa, Nikhil G

Roopa: "For vlan aware bridge, we don't support the port attributes under the
bridge. It was deliberately done when vlan aware bridge config was introduced
because people wanted to get rid of the legacy under the bridge way of decla-
-ring port attributes. It was supported for a bit for evorack...in limited
 form. we should probably just warn the user about this."

auto br100
iface br100
      bridge_ports swp3 swp4 swp5
      mstpctl-portadminedge swp3=yes swp4=yes swp5=yes
      bridge-vlan-aware yes

$ ifreload -a -s
warning: br100: unsupported use of keyword 'mstpctl-portadminedge' when bridge-vlan-aware is on
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdownmain: sending ifaceobj to syntax_check method
Julien Fortin [Mon, 26 Sep 2016 08:37:33 +0000 (10:37 +0200)]
ifupdownmain: sending ifaceobj to syntax_check method

Ticket: None
Reviewed By: Roopa, Nikhil G

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agoifupdown: scheduler: ignore errors generated by upperiface bring up
Roopa Prabhu [Wed, 21 Sep 2016 23:03:11 +0000 (16:03 -0700)]
ifupdown: scheduler: ignore errors generated by upperiface bring up

Ticket: CM-12923
Reviewed By: julien, nikhil
Testing Done: tested implicit upperiface bring up

upperiface bringup is best effort, so ignore errors.

$ifquery -c -a
..[snip]...
auto br0
iface br0
        bridge-vlan-aware yes                        [pass]
        bridge-ports vx-14 vx-11 vx-10 vx-13 vx-12   [pass]

$ifdown vx-10
$ifdown vx-11

before patch:
$ifup vx-10
..[snip]...
info: running upperifaces (parent interfaces) if available ..
info: br0: running ops ...
error: br0: bridge port vx-11 does not exist
....

After patch:
$ifup vx-10
..[snip]...
info: running upperifaces (parent interfaces) if available ..
info: br0: running ops ...
....

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: usercmds: add environment variables passed to user scripts
Julien Fortin [Tue, 20 Sep 2016 16:16:57 +0000 (09:16 -0700)]
addons: usercmds: add environment variables passed to user scripts

Ticket: github issue #14
Reviewed By: Roopa, Nikhil G
Testing Done:

$ cat /etc/network/interfaces
auto eth0
iface eth0 inet dhcp
      up /root/test.sh
$
$ cat /root/test.sh
echo 'IFACE=' $IFACE
echo 'LOGICAL=' $LOGICAL
echo 'METHOD=' $METHOD
echo 'ADDRFAM=' $ADDRFAM
$
$ ifreload -a
IFACE= eth0
LOGICAL= eth0
METHOD= dhcp
ADDRFAM= inet
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
7 years agodebian: changelog: fixup last released and unreleased versions
Roopa Prabhu [Mon, 19 Sep 2016 23:30:42 +0000 (16:30 -0700)]
debian: changelog: fixup last released and unreleased versions

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agodebian: changelog: add cumulus ticket-ids to changelog entries
Roopa Prabhu [Mon, 19 Sep 2016 17:15:47 +0000 (10:15 -0700)]
debian: changelog: add cumulus ticket-ids to changelog entries

Adhere to cumulus changelog policy.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agodebian: changelog: update version to 1.1-cl3u5
Roopa Prabhu [Fri, 16 Sep 2016 19:50:42 +0000 (12:50 -0700)]
debian: changelog: update version to 1.1-cl3u5

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoMerge branch 'staging3.1.1' into dev
Roopa Prabhu [Fri, 16 Sep 2016 19:41:06 +0000 (12:41 -0700)]
Merge branch 'staging3.1.1' into dev

7 years agofix for passing parameters to templateEngine() class
Marek Grzybowski [Thu, 15 Sep 2016 19:39:16 +0000 (21:39 +0200)]
fix for passing parameters to templateEngine() class

Signed-off-by: Marek Grzybowski <marek.grzybowski@rtbhouse.com>
7 years agoifupdownmain: dont catch link_up and link_down errors in ifupdownmain
Roopa Prabhu [Fri, 16 Sep 2016 18:29:27 +0000 (11:29 -0700)]
ifupdownmain: dont catch link_up and link_down errors in ifupdownmain

Ticket: CM-12843
Reviewed By: julien, nikhil
Testing Done: Tested the failing test case in the bug

The scheduler already has some checking for errors from
link_up and link_down introduced by
commit 61c4d7244735 ("Suppress 'Network down' warnings when
link_master_slave feature is on").

The above fix was removed by a recent commit
707aeb737882 ("netlink ip link set up/down may silently fail, adding
try/except statements"). The scheduler does catch these errors.
so we will need to figure out why the scheduler is not catching it.
Right now this is failing an automation test. So the best fix
is to make sure the previous behaviour is restored.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
7 years agoaddons: vrf: close sockets when vrf interface goes down
Roopa Prabhu [Thu, 15 Sep 2016 17:10:39 +0000 (10:10 -0700)]
addons: vrf: close sockets when vrf interface goes down

Ticket: CM-11393
Reviewed By: dsa, julien, nikhil
Testing Done: tested up and down of a vrf interface

$ifdown -v blue
..snip ..
info: executing /usr/lib/vrf/vrf-helper delete blue 1030
info: executing ip link del blue
info: executing /bin/ss -aK "dev == 54"
info: vrf: syncing table map to
/etc/iproute2/rt_tables.d/ifupdown2_vrf_map.conf

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>