update project

agent_based/checkpoint_vsx_system.py

@@ -87,7 +87,7 @@
 # }
 #
 
-import re
+import ipaddress
 import time
 from dataclasses import dataclass
 from typing import List, Dict, Optional, Tuple
@@ -189,12 +189,13 @@ def check_checkpoint_vsx_system(item, params, section: Dict[str, CheckpointVsx])
         yield Result(state=State(params['state_sic_not_established']), notice='SIC not established')
 
     if vsx.vsxStatusVsType.lower() in ['virtual system', 'vsx gateway']:
-        ipv4 = re.compile('^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}')
         yield Result(state=State.OK, notice=f'System name: {item}')
-        if ipv4.match(vsx.vsxStatusMainIP):
+        try:
+            ipaddress.ip_address(vsx.vsxStatusMainIP)
             yield Result(state=State.OK, summary=f'Main IP: {vsx.vsxStatusMainIP}')
-        else:
+        except ValueError:
             yield Result(state=State.OK, notice=f'Main IP: {vsx.vsxStatusMainIP}')
+
         yield Result(state=State.OK, summary=f'VS ID: {vsx.vsxStatusVSId}',
                      details=f'Virtual system ID: {vsx.vsxStatusVSId}')
         yield Result(state=State.OK, notice=f'System type: {vsx.vsxStatusVsType}')