From 410aad0c3e967f4a4217364ac39cb23cacac741c Mon Sep 17 00:00:00 2001 From: Sebastian Luna-Valero Date: Fri, 12 Jul 2024 16:56:20 +0200 Subject: [PATCH] check public IP address properly: thanks Enol ;) --- fedcloud_vm_monitoring/site_monitor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedcloud_vm_monitoring/site_monitor.py b/fedcloud_vm_monitoring/site_monitor.py index a36ff6a..9ff9de8 100644 --- a/fedcloud_vm_monitoring/site_monitor.py +++ b/fedcloud_vm_monitoring/site_monitor.py @@ -4,6 +4,7 @@ from datetime import datetime, timezone import click +import ipaddress import ldap3 import paramiko from dateutil.parser import parse @@ -129,7 +130,7 @@ def get_user_email(self, egi_user): def get_public_ip(self, ip_addresses): result = "" for ip in ip_addresses: - if not ip.startswith("192.168") and not ip.startswith("172.16"): + if ipaddress.ip_address(ip).is_global: result = ip return result @@ -151,6 +152,7 @@ def process_vm(self, vm): vm_info = self.get_vm(vm) flv = self.get_flavor(vm["Flavor"]) vm_ips = [] + sshd_version = "N/A" for net, addrs in vm["Networks"].items(): vm_ips.extend(addrs) sshd_version = self.get_sshd_version(addrs)