mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity
306 Commits 14 Branches 46 Tags
4c773918da3321b64a4423bed15b706710a9dbd9
Commit Graph

34 Commits

Author SHA1 Message Date
Sam Tannous
4c773918da ifupdown2 loses interfaces on second down of swp port 
Ticket: CM-5693
Reviewed By: roopa
Testing Done: tested bridge and bonds with interfaces with configs

Both bridge and mstpctl modules set priv_flags on interfaces
that have configs (like link-speed) even when used as bridge-ports.
And this collision causes statemanager.ifaceobj_sync() to never get called
because ifaceobj.priv_flags is 1 (we return immediately):
The fix was to create a new iface module_flags array to carry module info.
 2015-04-23 20:27:44 -04:00
Roopa Prabhu
45ca0b6d42 Add check for shared dependents during building dependency list 
Ticket: CM-5373
Reviewed By: sam
Testing Done: Tested with shared slaves in bridge and bonds
 2015-04-03 22:18:32 -07:00
Roopa Prabhu
f28e72e544 move link_set 'up' errors to debug 
Ticket: CM-5199
Reviewed By: trivial
Testing Done: tested with interfaces file in the bug
 2015-02-25 13:45:37 -08:00
Roopa Prabhu
5828d8c5f9 Check for zero address on bridge ports before enslaving it to the bridge 
Ticket: CM-4859, CM-4382
Reviewed By:
Testing Done: Tested with config which included bond bridge ports with
zero address on the bond.

The bridge driver rejects the port add with -EINVAL.
A bond with no slaves is one usecase where the bond interface
has a zero hw address and is rejected by the bridge.
EINVAL currently is very confusing.

This patch checks for a valid ether add before enslaving the port to the
bridge.
 2015-02-10 11:17:00 -08:00
Roopa Prabhu
a8f0880820 Moved warning to info level 
Ticket: CM-4622
Reviewed By:
Testing Done: Tested ifup/ifdown on a bridge

If the file is not present, we will just log it.
 2014-12-31 23:47:18 -08:00
Roopa Prabhu
f3b69969e3 Fix link_type flag for objects read from state file + fix link_type 
initializations in a few other places

Ticket: CM-4610
Reviewed By:
Testing Done: Tested with the failing sequence of events described in
the bug
 2014-12-31 14:10:45 -08:00
Roopa Prabhu
f6a0fa151b Added a few more try-except clauses during bridge config to continue on 
failures

Ticket: CM-4382
Reviewed By:
Testing Done: Tested with bridge port addition failure example in the
bug report
 2014-12-27 20:39:17 -08:00
Roopa Prabhu
a9ab1b4f10 Rework bridge upperiface handling (to fix some problems with the new 
bridge driver and svi config)

Ticket: CM-3346
Reviewed By:
Testing Done: Tested upper interface handling during ifup of
bonds/bridges/svis
 2014-12-26 09:53:51 -08:00
John Berezovik
97f4cff80c Merge branch 'release-2.5' into CumulusLinux-2.5_br 
Conflicts:
	build-config/make/local-pkgs.make
	packages/cafe/clobjects.py
	packages/cafe/clobjects_l3_quagga.py
	packages/cl-basefiles/etc/cumulus/datapath/traffic.conf
	packages/cl-utilities/etc/monit/monitrc.d/cumulus
	packages/clag/ifupdown/clagd.py
	packages/ifupdown2/addons/bridge.py
	packages/ifupdown2/addons/ifenslave.py
	packages/ifupdown2/ifupdown/iface.py
	packages/ifupdown2/ifupdown/ifupdownmain.py
	packages/ifupdown2/ifupdown/scheduler.py
	packages/portwd/portwd
	patches/bcm-sdk/series
	patches/iproute/bridge-increase-netlink-rcv-buf-size.patch
	patches/iproute/series
	patches/kernel/driver-support-sff-8436-eeprom.patch
	patches/kernel/network-bridge-dont-install-local-mac.patch
	patches/kernel/series
	patches/lldpd/series
	patches/mstpd/clag_port_fsm_reset.patch
	patches/mstpd/mstpd_init_system.patch
	patches/mstpd/series
	patches/quagga/series
	rootconf/default/etc/default/cron
	switchd/hal.c
	switchd/hal_bcm.c
	switchd/hal_bcm_config.c
	switchd/hal_bcm_config.h
	switchd/hal_config.c
	switchd/hal_config.h
	switchd/hal_int.h
	switchd/sync.c
	tests/tests/l3/bgp_alpm_test.py
	tests/tests/l3/bgp_path_hunting.py
	tests/tests/l3/bgp_smoke_test.py
	tests/tests/l3/l3_node.py
	tests/tests/l3/mc_snoop_test.py
	tests/tests/lib/decorators.py
	tests/tests/smoke/testifupdown2.py
	utilities/ci/pretest.yml
	utilities/distro-cmd
	utilities/packages/ssim2/setup.py
	utilities/packages/ssim2/ssim2/simlib.py
 2014-12-24 12:20:53 -08:00
Roopa Prabhu
a070c90ec3 Multiple fixes and cleanup 
Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown2 sanity

- moved 'admin up' delays that we introduced recently to be
configurable via two ifupdown2.conf attributes
    # Let link master (bridges, bonds) own the link state of slaves
    link_master_slave=1

    # Delay admin state change till the end
    delay_admin_state_change=0

- reduced some redundant traversal of dependency trees

- fixed a few bugs in query check
 2014-12-17 12:39:38 -08:00
Roopa Prabhu
ff3bdefff7 bring up bridge ports only after vlan config is done 
Ticket:
Reviewed By: wkok
Testing Done: unit testing + testing by wkok/purna
(cherry picked from commit 5af90b2893cd54bb21fedaf27ec6dd22de3f2802)

Conflicts:
	packages/ifupdown2/addons/bridge.py
 2014-12-14 12:44:53 -08:00
Roopa Prabhu
75cf99baa1 bring up bridge ports only after vlan config is done 
Ticket:
Reviewed By: wkok
Testing Done: unit testing + testing by wkok/purna
 2014-12-12 23:45:31 -08:00
Roopa Prabhu
a193f425f5 Make bridge module the owner of bridge port links (This is to delay 
bridge port up until bridge is up)

Ticket:
Reviewed By:
Testing Done:
 2014-12-11 19:06:21 -08:00
Roopa Prabhu
f59b5c656b Fix reserved vlan check + change switchd ifupdown reserved vlan script 
to return reserved vlan range from /etc/cumulus/switchd.conf

Ticket: CM-4367
Reviewed By: wkok
Testing Done: Tested using reserved vlans in old and new bridge
(cherry picked from commit 8626feb08703392b29e234b2f81f4df536ad7f7b)
 2014-12-03 14:06:57 -08:00
Roopa Prabhu
2708f9155f Fix reserved vlan check + change switchd ifupdown reserved vlan script 
to return reserved vlan range from /etc/cumulus/switchd.conf

Ticket: CM-4367
Reviewed By: wkok
Testing Done: Tested using reserved vlans in old and new bridge
 2014-12-03 14:03:34 -08:00
Roopa Prabhu
cd3059b82b Change case of check strings 
Ticket: CM-3346
Reviewed By: cosmetic
Testing Done: ifquery check sanity
(cherry picked from commit 556a078a7f551f1f895f0ddc71b6124d960ffb4e)
 2014-11-28 12:54:04 -08:00
Roopa Prabhu
a3b9ac1e99 Change case of check strings 
Ticket: CM-3346
Reviewed By: cosmetic
Testing Done: ifquery check sanity
 2014-11-28 12:48:01 -08:00
Roopa Prabhu
ad25e7bb98 Misc fixes. Add a --skip-upperifaces option to ifup (given the confusion 
over ifup handling of upperifaces by default) + some fixes in the
reserved vlan check

Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown sanity.
 2014-11-25 10:19:35 -08:00
Roopa Prabhu
11f3290e60 if 'bridge-vlan-aware yes' specified, explicitly set 1 in bridge sysfs 
vlan_filtering flags.

Ticket: CM-3346
Reviewed By:
Testing Done: Tested new bridge driver sanity
 2014-11-21 10:17:37 -08:00
Roopa Prabhu
16d854b461 Fix a few minor ifquery check failures 
Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown2 sanity and query check failures.
 2014-11-19 17:25:26 -08:00
Roopa Prabhu
4c39c7b84a Fix ordering of mstpctl attributes by moving to a OrderedDict 
Ticket: CM-3737
Reviewed By:
Testing Done: Tested with config given in the bug
 2014-11-19 14:42:14 -08:00
Roopa Prabhu
d8e3554dde minor fixes for ifquery and stp handling 
Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown2 sanity
 2014-11-15 15:42:52 -08:00
Roopa Prabhu
e8b4b06dc0 Add iface 'up' for method 'manual' in addon modules for logical devices 
Ticket: CM-4125
Reviewed By:
Testing Done: Tested inet manual for logical interfaces
 2014-11-12 10:51:07 -08:00
Roopa Prabhu
2da58137d8 Misc fixes + ifreload new option + cleanups + more ifquery support etc 
Ticket: CM-3346, CM-3784, CM-3841
Reviewed By:
Testing Done: various ifupdown2 tests
 2014-11-11 21:58:12 -08:00
Roopa Prabhu
da1eb143c2 Fix bridgevlan query check 
Ticket: CM-3346
Reviewed By:
Testing Done: tested bridge vlan query check
 2014-11-03 21:28:14 -08:00
Roopa Prabhu
8e113d6319 misc query and fdb/vlan add fixes 
Ticket: CM-3346
Reviewed By:
Testing Done: ifupdown2 sanity
 2014-11-03 17:55:51 -08:00
Roopa Prabhu
9e012f9e8a some more ifquery support (for vxlan devices etc) 
Ticket: CM-3784
Reviewed By:
Testing Done: Tested ifquery check/running and sanity
 2014-10-31 11:28:07 -07:00
Roopa Prabhu
98b5ee73fc misc fixes 
Ticket: CM-3346
Reviewed By:
Testing Done: ifupdown2 sanity with new bridge driver
 2014-10-29 12:51:21 -07:00
Roopa Prabhu
e160136944 Bug fixes and some query support 
Ticket: CM-3346
Reviewed By:
Testing Done: sanity testing and syntax testing for new bridge driver
 2014-10-28 16:10:00 -07:00
Roopa Prabhu
7baa2093ba Fix bridge port vid settings during ifup of a bridge port 
Ticket: CM-3346
Reviewed By:
Testing Done: ifupdown2 sanity test for the new bridge driver
 2014-10-24 20:43:50 -07:00
Roopa Prabhu
fe91c3484f remove code that makes a bridge port inherit stp/mstp/igmp attributes from bridge 
Ticket: CM-4035
Reviewed By:
Testing Done: Tested ifupdown2 sanity
 2014-10-24 14:21:54 -07:00
Roopa Prabhu
84ca006f82 First phase checkin for new format for vlan aware bridge 
Ticket: CM-3346
Reviewed By:
Testing Done: Sanity test + test new bridge format

There are a bunch of open issues with `vlan` interface handling.
Below is the format.

auto swp1
iface swp1
    bridge-access 300
    mstpctl-pathcost 0
    mstpctl-adminedge yes
    mstpctl-autoedge yes
    mstpctl-p2p yes
    mstpctl-bpduguard yes
    mstpctl-treeprio 64
    mstpctl-network yes
    mstpctl-bpdufilter yes

auto swp2
iface swp2
    bridge-vids 301
    bridge-pvid 302
    bridge-pathcost 10
    bridge-priority 10
    bridge-multicast-router 0
    bridge-multicast-fast-leave 1

auto br0
iface br0
    bridge-vlan-aware yes
    bridge-stp on
    bridge-ports swp1 swp2
    bridge-vids 2001

auto br0.2001
iface br0.2001
    address 10.0.14.2
    hwaddress 00:03:00:00:00:12
    address-virtual 00:00:5e:00:01:01 11.0.4.1/24

auto br0.2001
vlan br0.2001
    bridge-igmp-querier-src 172.16.101.1
 2014-10-24 10:11:07 -07:00
Roopa Prabhu
48ca05db88 Fix missing import due to merge 
Ticket:
Reviewed By:
Testing Done:
 2014-10-22 13:42:08 -07:00
Roopa Prabhu
15ef32ea14 Move ifupdown2addons into ifupdown2 pacakge 
Ticket: CM-3864
Reviewed By:
Testing Done: Tested build and install

open item:
- cleanup stale ifupdown2-addons package files
 2014-10-09 16:02:46 -07:00