430b0896f2
KCC: fix the polarity of bridges_required option
...
If one of the *_BRIDGES_REQUIRED flags is set, bridges_required is
True.
We ignore this option anyway.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
229165553a
KCC: remove a TODO with seemingly no basis in specification
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
534dfb08fb
KCC: clarify setup-vertices docstring, remove TODO
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
218baa67ca
KCC: note about the meaning of None in schedule types
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
957e9b0278
KCC: combine_repl_info() returns the combined replinfo
...
Previously it returned False if there was no intersections (i.e,
the new repl_info duration was 0). Now the same check can be performed
by checking the duration directly.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
Conflicts:
python/samba/kcc/graph.py
2015-06-12 06:57:17 +02:00
d662cc7519
KCC: remove unnecessary comment
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
7fc108bcb3
KCC: reword comment, removing unwarranted XXX
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
69488c85c1
KCC: remove an unwarranted XXX comment
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
b5a294eb50
KCC: let kcc.graph.ReplInfo know its duration
...
This is going to lead to a few simplifications.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
27e08cdead
KCC: docstring for kcc.graph.InternalEdge
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
0f438acd8c
KCC: docstring for kcc.graph.MultiEdge
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:17 +02:00
5a3cb71d0b
KCC: docstring for kcc.graph.Vertex
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
ea48c8f2b6
KCC: docstring for kcc.graph.VertexColour()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
7663951112
KCC: docstring for kcc.graph.setup_graph()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
2331161a4a
KCC: docstring for kcc.graph.add_edge_out()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
3a5a516ce3
KCC: docstring for kcc.graph.find_component()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
f019fea947
KCC: some rearrangement in kcc.graph.add_int_edge()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
6c760c1a0d
KCC: docstring for kcc.graph.kruskal()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
84fb4afe87
KCC: docstring for kcc.graph.add_int_edge()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
61c1d8ad39
KCC: docstring for kcc.graph.process_edge()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
a75b874902
KCC: docstring for kcc.graph.process_edge_set()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
7c62a85851
KCC: docstring for kcc.graph.undemote_vertex()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
90aa7f12e1
KCC: docstring for kcc.graph.check_demote_vertex()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
490eb10023
KCC: pep8 line length in plot all connections
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
5ea0dfb46f
KCC: pep8 -- remove an extra line in graph_utils
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
f3600102ea
KCC: pep8 remove a line
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
316fa2ee8a
KCC: samba.kcc formatting fixes for pep8
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
68a0f131fb
KCC: remove XXX scare comments around guid comparisons.
...
The guid comparisons are settled. We use ndrpack.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
af1a307f8d
KCC: setup_dijkstra() creates its own empty queue
...
It needs to operate on an empty list, which is something the caller
really shouldn't have to worry about.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
4a9b9b23f0
KCC: Add graph.InternalEdge.__lt__ docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
b59666c36d
KCC: Add graph.try_new_path docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
3069fba6e5
KCC: Add graph.dijkstra and setup_dijkstra() docstrings
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
a0fea23811
KCC: Add graph.setup_vertices() docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:16 +02:00
aeda7f4c61
KCC: don't pretend graph.create_edge_set() is useful
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
a49cd69642
KCC: Add s.k.g.create_auto_edge_set() docstring, improve variable name
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
f86620edc7
KCC: Add samba.kcc.graph.create_edge() docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
86004daff5
KCC: improve samba.kcc.graph.get_spanning_tree_edges() docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
79f2c71709
KCC: Add ReplInfo docstring
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
99f07fa695
KCC: use logger functions rather than print in create_connections
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
004a9ba6b1
KCC: shift ReplInfo, MAX_DWORD from kcc.kcc_utils to kcc.graph
...
They are only used in graph.py.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
a6b7a9abc3
KCC: Don't pretend to "load_all_transports"
...
Samba doesn't do SMTP, so nor does Samba KCC. Because we were
following the spec, we have had special cases for non-IP transports
in numerous places. This removes a few more of those.
The gains are a loss of complexity and the removal of untestable code.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
Conflicts:
python/samba/kcc/__init__.py
2015-06-12 06:57:15 +02:00
12de3dfe6a
KCC: ignore SMTP transport and warn about unknown ones
...
An info line is enough for SMTP. Warn about other as yet unknown
transports, because we want to know if they turn up.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
e6d8a8ec2a
KCC: remove "forest_of_rings" verification check
...
Because it didn't actually check anything.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
f8a68af6ff
KCC: improve docstring for kcc.graph.get_spanning_tree_edges()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
9af0a067f0
KCC: improve docstring for kcc.graph.combine_repl_info()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
4376f1aa1d
KCC: improve documentation for KCC.export_ldif()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
a811df892b
KCC: improve documentation for KCC.import_ldif()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
303c2c028d
KCC: print error messages to stderr, not stdout
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
ce9d1d5b27
KCC: improve documentation for KCC.intrasite_max_node_edges()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00
9ff5a38566
KCC: improve documentation for KCC.intersite() and KCC.intrasite()
...
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz >
Reviewed-by: Garming Sam <garming@catalyst.net.nz >
Reviewed-by: Andrew Bartlett <abartlet@samba.org >
2015-06-12 06:57:15 +02:00