dnstr = str(msg.dn)
# already loaded
- if dnstr in self.connect_table.keys():
+ if dnstr in self.connect_table:
continue
connect = NTDSConnection(dnstr)
def add_connection(self, dnstr, connect):
- assert dnstr not in self.connect_table.keys()
+ assert dnstr not in self.connect_table
self.connect_table[dnstr] = connect
def get_connection_by_from_dnstr(self, from_dnstr):
:param from_dnstr: search for this from server entry
"""
- for dnstr, connect in self.connect_table.items():
+ #XXX is this connection always unique?
+ for connect in self.connect_table.values():
if connect.get_from_dnstr() == from_dnstr:
return connect
return None
:return: None if DSA doesn't exist
"""
- if dnstr in self.dsa_table.keys():
+ if dnstr in self.dsa_table:
return self.dsa_table[dnstr]
return None
:param dsa: dsa with a dnstr equivalent to his graph node
"""
- for dnstr, connect in dsa.connect_table.items():
+ for connect in dsa.connect_table.values():
self.add_edge_from(connect.from_dnstr)
transport.load_transport(self.samdb)
# already loaded
- if str(transport.guid) in self.transport_table.keys():
+ if str(transport.guid) in self.transport_table:
continue
# Assign this transport to table
dnstr = str(msg.dn)
# already loaded
- if dnstr in self.sitelink_table.keys():
+ if dnstr in self.sitelink_table:
continue
sitelink = SiteLink(dnstr)
site.load_site(self.samdb)
# already loaded
- if str(site.site_guid) in self.site_table.keys():
+ if str(site.site_guid) in self.site_table:
continue
self.site_table[str(site.site_guid)] = site
partstr = str(msg.dn)
# already loaded
- if partstr in self.part_table.keys():
+ if partstr in self.part_table:
continue
part = Partition(partstr)
else:
cn_conn.load_connection(self.samdb)
- for cn_dnstr, cn_conn in mydsa.connect_table.items():
+ for cn_conn in mydsa.connect_table.values():
s_dnstr = cn_conn.get_from_dnstr()
if s_dnstr is None:
# fulfills the previous criteria
lesser = False
- for cn2_dnstr, cn2_conn in mydsa.connect_table.items():
+ for cn2_conn in mydsa.connect_table.values():
if cn2_conn is cn_conn:
continue
if mydsa.is_ro() or opts.readonly:
- for dnstr, connect in mydsa.connect_table.items():
+ for connect in mydsa.connect_table.values():
if connect.to_be_deleted:
DEBUG_GREEN("TO BE DELETED:\n%s" % connect)
if connect.to_be_added:
# We have a transport type but its not an
# object in the database
- if cn_conn.transport_guid not in self.transport_table.keys():
+ if cn_conn.transport_guid not in self.transport_table:
raise Exception("Missing inter-site transport - (%s)" %
cn_conn.transport_dnstr)
# Now perform the scan of replicas we'll need
# and compare any current repsFrom against the
# connections
- for dnstr, n_rep in needed_rep_table.items():
+ for n_rep in needed_rep_table.values():
# load any repsFrom and fsmo roles as we'll
# need them during connection translation
# Loop thru connections and add implied repsFrom tuples
# for each NTDSConnection under our local DSA if the
# repsFrom is not already present
- for cn_dnstr, cn_conn in self.my_dsa.connect_table.items():
+ for cn_conn in self.my_dsa.connect_table.values():
implied, s_dsa = self.is_repsFrom_implied(n_rep, cn_conn)
if not implied:
# to ri is less than n+2, the KCC adds that edge to the graph.
for vertex in graph_list:
dsa = self.my_site.dsa_table[vertex.dsa_dnstr]
- for dnstr, connect in dsa.connect_table.items():
+ for connect in dsa.connect_table.values():
remote = connect.from_dnstr
if remote in self.my_site.dsa_table:
vertex.add_edge_from(remote)