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

Some compat fixes + some stp precommit test fixes

Browse Source 
Ticket: CM-1438
Reviewed By:
Testing Done:
This commit is contained in:
roopa
2014-02-10 14:39:18 -08:00
parent d08d5f5478
commit 6ef5bfa291
5 changed files with 27 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,5 +1,9 @@
TODO:
====
- support for debian ifupdown methods: tunnel, v4tunnel, 6to4, ppp, wvdial, ipv4ll
- support for debian ifupdown ipv6 auto method
- support for debian ifupdown CAN address family
- Compat : support for LOGICAL interfaces
- dry-run improvement: It skips the cache completely. Which means It tells you the commands it would execute if the system is clean. Its not smart enought to say what it will really execute given the state of the system
- included gvgen in the package. Need to check if there are any license issues

310
man/interfaces.5
View File

@ -1,310 +0,0 @@
.\" -*- nroff -*-
.\" macros
.de EX \" Begin Example
. IP
. ft CW
. nf
. ne \\$1
..
.de EE \" End Example
. ft P
. fi
. PP
..
.TH INTERFACES 5 "5 April 2004" "ifupdown" "File formats"
.SH NAME
/etc/network/interfaces \- network interface configuration for ifup and ifdown
.SH DESCRIPTION
/etc/network/interfaces contains network interface configuration
information for the
.BR ifup (8)
and
.BR ifdown (8)
commands.
This is where you configure how your system is connected to the network.
.P
Lines starting with `#' are ignored. Note that end-of-line comments are
NOT supported, comments must be on a line of their own.
.P
A line may be extended across multiple lines by making the last character
a backslash.
.P
The file consists of zero or more "iface", "mapping", "auto", "allow-" and
"source" stanzas. Here is an example.
.EX
auto lo eth0
allow-hotplug eth1
iface lo inet loopback
source interfaces.d/machine\-dependent
mapping eth0
script /usr/local/sbin/map\-scheme
map HOME eth0\-home
map WORK eth0\-work
iface eth0\-home inet static
address 192.168.1.1
netmask 255.255.255.0
up flush\-mail
iface eth0\-work inet dhcp
iface eth1 inet dhcp
.EE
Lines beginning with the word "auto" are used to identify the physical
interfaces to be brought up when
.B ifup
is run with the
.B \-a
option. (This option is used by the system boot scripts.)
Physical interface names should follow the word "auto" on the same line.
There can be multiple "auto" stanzas.
.B ifup
brings the named interfaces up in the order listed.
.P
Lines beginning with "allow-" are used to identify interfaces that should
be brought up automatically by various subsytems. This may be done using
a command such as "ifup \-\-allow=hotplug eth0 eth1", which will only bring
up eth0 or eth1 if it is listed in an "allow-hotplug" line. Note that
"allow-auto" and "auto" are synonyms.
.P
Lines beginning with "source" are used to include stanzas from other files,
so configuration can be split into many files. The word "source" is
followed by the path of file to be sourced. Shell wildcards can be
used.
(See
.BR wordexp (3)
for details.)
.P
Stanzas beginning with the word "mapping" are used to determine how a
logical interface name is chosen for a physical interface that is to be
brought up. The first line of a mapping stanza consists of the word
"mapping" followed by a pattern in shell glob syntax. Each mapping stanza
must contain a
.BR script
definition. The named script is run with the physical interface name as
its argument and with the contents of all following "map" lines
(\fBwithout\fR the leading "map") in the
stanza provided to it on its standard input. The script must print a
string on its standard output before exiting. See
.IR /usr/share/doc/ifupdown/examples
for examples of what the script must print.
.P
Mapping a name consists of searching the remaining mapping
patterns and running the script corresponding to the first match;
the script outputs the name to which the original is mapped.
.P
.B ifup
is normally given a physical interface name as its first non\-option argument.
.B ifup
also uses this name as the initial logical name for the interface unless
it is accompanied by a suffix of the form \fI=LOGICAL\fR, in which case
ifup chooses \fILOGICAL\fR as the initial logical name for the interface.
It then maps this name, possibly more than once according to successive
mapping specifications, until no further mappings are possible. If the
resulting name is the name of some defined logical interface then
.B ifup
attempts to bring up the physical interface
as that logical interface. Otherwise
.B ifup
exits with an error.
.P
Stanzas defining logical interfaces start with a line consisting of the
word "iface" followed by the name of the logical interface.
In simple configurations without mapping stanzas this name should simply
be the name of the physical interface to which it is to be applied.
(The default mapping script is, in effect, the
.B echo
command.)
The interface name is followed by the name of the address family that the
interface uses. This will be "inet" for TCP/IP networking, but there is
also some support for IPX networking ("ipx"), and IPv6 networking ("inet6").
Following that is the name of the method used to configure the interface.
.P
Additional options can be given on subsequent lines in the stanza.
Which options are available depends on the family and method,
as described below.
Additional options can be made available by other Debian packages.
For example, the wireless\-tools package makes available a number of
options prefixed with "wireless\-" which can be used to configure the
interface using
.BR iwconfig (8) .
(See
.BR wireless (7)
for details.)
.P
Options are usually indented for clarity (as in the example above)
but are not required to be.
.P
.SH VLAN AND BRIDGE INTERFACES
To ease the configuration of VLAN interfaces, interfaces having
.B .
(full stop character) in the name are configured as 802.1q tagged
virtual LAN interface. For example, interface
.B eth0.1
is a virtual interface having
.B eth0
as physical link, with VLAN ID 1.
.P
For compatibility with
.B bridge-utils
package, if
.B bridge_ports
option is specified, VLAN interface configuration is
.B not
performed.
.SH IFACE OPTIONS
The following "command" options are available for every family and method.
Each of these options can be given multiple times in a single stanza,
in which case the commands are executed in the order in which they appear
in the stanza.
(You can ensure a command never fails by suffixing "|| true".)
.TP
.BI pre\-up " command"
Run
.I command
before bringing the interface up.
If this command fails then
.B ifup
aborts,
refraining from marking the interface as configured,
prints an error message,
and exits with status 0.
This behavior may change in the future.
.TP
.BI up " command"
.TP
.BI post\-up " command"
Run
.I command
after bringing the interface up.
If this command fails then
.B ifup
aborts,
refraining from marking the interface as configured
(even though it has really been configured),
prints an error message,
and exits with status 0.
This behavior may change in the future.
.TP
.BI down " command"
.TP
.BI pre\-down " command"
Run
.I command
before taking the interface down.
If this command fails then
.B ifdown
aborts,
marks the interface as deconfigured
(even though it has not really been deconfigured),
and exits with status 0.
This behavior may change in the future.
.TP
.BI post\-down " command"
Run
.I command
after taking the interface down.
If this command fails then
.B ifdown
aborts,
marks the interface as deconfigured,
and exits with status 0.
This behavior may change in the future.
.P
There exists for each of the above mentioned options a directory
.IR /etc/network/if\-\fB<option>\fI.d/
the scripts in which are run (with no arguments) using
.BR run\-parts (8)
after the option itself has been processed. Please note that as
.BI post\-up
and
.BI pre\-down
are aliases, no files in the corresponding directories are processed.
Please use
.IR if-up.d
and
.IR if-down.d
directories instead.
.P
All of these commands have access to the following environment variables.
.TP
.B IFACE
physical name of the interface being processed
.TP
.B LOGICAL
logical name of the interface being processed
.TP
.B ADDRFAM
address family of the interface
.TP
.B METHOD
method of the interface (e.g.,
.IR static )
.TP
.B MODE
.IR start " if run from ifup, " stop " if run from ifdown"
.TP
.B PHASE
as per MODE, but with finer granularity, distinguishing the
\fIpre-up\fR, \fIpost-up\fR, \fIpre-down\fR and \fIpost-down\fR phases.
.TP
.B VERBOSITY
indicates whether \fB\-\-verbose\fR was used; set to 1 if so, 0 if not.
.TP
.B PATH
the command search path:
.I /usr/local/sbin:\%/usr/local/bin:\%/usr/sbin:\%/usr/bin:\%/sbin:\%/bin
.P
Additionally, all options given in an interface definition stanza are
exported to the environment in upper case with "IF_" prepended and with
hyphens converted to underscores and non\-alphanumeric characters discarded.
.P
When ifupdown is being called with the \fB\-\-all\fR option, before doing anything
to interfaces, if calls all the hook scripts (\fIpre-up\fR or \fIdown\fR) with
\fBIFACE\fR set to "\-\-all", \fBLOGICAL\fR set to the current value of \-\-allow
parameter (or "auto" if it's not set), \fBADDRFAM\fR="meta" and \fBMETHOD\fR="none".
After all the interfaces have been brought up or taken down, the appropriate scripts
(\fIup\fR or \fIpost-down\fR) are executed.
##ADDRESSFAM##
.SH KNOWN BUGS/LIMITATIONS
The
.B ifup
and
.B ifdown
programs work with so-called "physical" interface names.
These names are assigned to hardware by the kernel.
Unfortunately it can happen that the kernel assigns different
physical interface names to the same hardware at different
times; for example, what was called "eth0" last time you booted
is now called "eth1" and vice versa.
This creates a problem if you want to configure the interfaces
appropriately.
A way to deal with this problem is to use mapping scripts that
choose logical interface names according to the properties of
the interface hardware.
See the
.B get-mac-address.sh
script in the examples directory for an example of such a mapping
script. See also Debian bug #101728.
.SH AUTHOR
The ifupdown suite was written by Anthony Towns <aj@azure.humbug.org.au>.
This manpage was contributed by Joey Hess <joey@kitenet.net>.
.SH "SEE ALSO"
.BR ifup (8),
.BR ip (8),
.BR ifconfig (8),
.BR run\-parts (8),
.BR resolvconf (8).
.P
For advice on configuring this package read the
.B Network Configuration
chapter of the \fIDebian Reference\fR manual,
available at
\fIhttp://www.debian.org/doc/manuals/debian-reference/ch05.en.html\fR
or in the \fBdebian-reference-en\fR package.
.P
Examples of how to set up interfaces can be found in
.BR /usr/share/doc/ifupdown/examples/network-interfaces.gz .

1
pkg/ifupdownbase.py
View File

@ -60,4 +60,3 @@ class ifupdownBase(object):
#raise Exception(str)
else:
pass

3
pkg/ifupdownmain.py
View File

@ -91,7 +91,6 @@ class ifupdownMain():
self.pp = pprint.PrettyPrinter(indent=4)
self.modules = OrderedDict({})
self.module_attrs = {}
self.load_addon_modules_config()
self.load_addon_modules(self.addon_modules_dir)
self.load_scripts(self.scripts_dir)
self.dependency_graph = OrderedDict({})
@ -412,7 +411,7 @@ class ifupdownMain():
"""
self.logger.info('loading builtin modules from %s' %modules_dir)
self.load_addon_modules_config()
if not modules_dir in sys.path:
sys.path.append(modules_dir)
try:

36
pkg/scheduler.py
View File

@ -103,14 +103,19 @@ class ifaceScheduler(ifupdownBase):
def run_iface_graph(self, ifupdownobj, ifacename, ops,
order=ifaceSchedulerFlags.POSTORDER,
followdependents=True):
""" runs interface by traversing its dependents first """
""" runs interface by traversing all nodes rooted at itself """
# minor optimization. If operation is 'down', proceed only
# if interface exists in the system
if ('down' in ops[0] and
not os.path.exists('/sys/class/net/%s' %ifacename)):
return
# Each ifacename can have a list of iface objects
ifaceobjs = ifupdownobj.get_iface_objs(ifacename)
if ifaceobjs is None:
raise Exception('%s: not found' %ifacename)
for ifaceobj in ifaceobjs:
if order == ifaceSchedulerFlags.INORDER:
# Run all sub operations sequentially
@ -121,7 +126,7 @@ class ifaceScheduler(ifupdownBase):
# Run dependents
dlist = ifaceobj.get_dependents()
if dlist and len(dlist):
self.logger.debug('%s:' %ifacename +
self.logger.info('%s:' %ifacename +
' found dependents: %s' %str(dlist))
try:
if not followdependents:
@ -131,12 +136,14 @@ class ifaceScheduler(ifupdownBase):
# up without dependents, but
new_dlist = [d for d in dlist
if ifupdownobj.is_iface_noconfig(d)]
if not new_dlist: continue
self.run_iface_list(ifupdownobj, new_dlist, ops,
order, followdependents)
if new_dlist:
self.run_iface_list(ifupdownobj, new_dlist, ops,
order, followdependents,
continueonfailure=False)
else:
self.run_iface_list(ifupdownobj, dlist, ops,
order, followdependents)
order, followdependents,
continueonfailure=False)
except Exception, e:
if (self.ignore_error(str(e))):
pass
@ -154,7 +161,7 @@ class ifaceScheduler(ifupdownBase):
def run_iface_list(self, ifupdownobj, ifacenames,
ops, order=ifaceSchedulerFlags.POSTORDER,
followdependents=True):
followdependents=True, continueonfailure=True):
""" Runs interface list """
for ifacename in ifacenames:
@ -162,12 +169,15 @@ class ifaceScheduler(ifupdownBase):
self.run_iface_graph(ifupdownobj, ifacename, ops,
order, followdependents)
except Exception, e:
if (self.ignore_error(str(e))):
if continueonfailure:
self.logger.error('%s : %s' %(ifacename, str(e)))
pass
else:
traceback.print_stack()
raise Exception('error running iface %s (%s)'
%(ifacename, str(e)))
if (self.ignore_error(str(e))):
pass
else:
raise Exception('error running iface %s (%s)'
%(ifacename, str(e)))
def run_iface_dependency_graphs(self, ifupdownobj,
dependency_graph, ops, indegrees=None,
@ -187,8 +197,6 @@ class ifaceScheduler(ifupdownBase):
of the graphs in the dependency_graph
"""
self.logger.debug('running dependency graph serially ..')
run_queue = []
# Build a list of ifaces that dont have any dependencies
if indegrees: