X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fgetsshkeys.py;h=686252bcb4859a9be9c4579e70ae1240d1525f87;hb=3f4df5945bbfb4592a164d929cf22c31d5fba50e;hp=1068c5ff1cead0ce50f274cd91eb95d577ba200f;hpb=7e1b0434bd1f865f7e9d8dff1cebd87d07a8d65d;p=monitor.git diff --git a/monitor/getsshkeys.py b/monitor/getsshkeys.py index 1068c5f..686252b 100755 --- a/monitor/getsshkeys.py +++ b/monitor/getsshkeys.py @@ -135,27 +135,27 @@ class SSHKnownHosts: if type(host) == type(""): host = [host] # get the node(s) info - nodes = self.api.GetNodes(self.auth,host,["hostname","ssh_rsa_key","nodenetwork_ids"]) + nodes = self.api.GetNodes(self.auth,host,["hostname","ssh_rsa_key","interface_ids"]) # for each node's node network, update the self.nodenetworks cache nodenetworks = [] for node in nodes: - for net in node["nodenetwork_ids"]: + for net in node["interface_ids"]: nodenetworks.append(net) - plcnodenetworks = self.api.GetNodeNetworks(self.auth,nodenetworks,["nodenetwork_id","ip"]) + plcnodenetworks = self.api.GetInterfaces(self.auth,nodenetworks,["interface_id","ip"]) for n in plcnodenetworks: - self.nodenetworks[n["nodenetwork_id"]]=n + self.nodenetworks[n["interface_id"]]=n return nodes def _record_from_node(self, node, nokey_list=None): host = node['hostname'] key = node['ssh_rsa_key'] - nodenetworks = node['nodenetwork_ids'] + nodenetworks = node['interface_ids'] if len(nodenetworks)==0: return (host, None, None, None) - # the [0] subscript to node['nodenetwork_ids'] means + # the [0] subscript to node['interface_ids'] means # that this function wont work with multihomed nodes l_nw = self.nodenetworks.get(nodenetworks[0],None) if l_nw is None: return (host, None, None, None)