Check now supports multiple ranges of VLANs (#10)

- #CCCP-1837
CSCfi · Oct 25, 2017 · 7b62694 · 7b62694
1 parent 8ffc311
commit 7b62694
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/files/nrpe/check_openstack.py b/files/nrpe/check_openstack.py
@@ -609,8 +609,12 @@ def check_vlan_capacity(self):
 
     # The 'network_vlan_ranges' parameter looks like: 'default:80:89'
     # the 2nd number is the lower vlan id, the 3rd is the higher id
-    vlan_range = config['network_vlan_ranges'].split(':')
-    vlans_total = int(vlan_range[2]) - int(vlan_range[1])
+    # It can also look like 'default:80:89,default:65:75' so we loop over it.
+    vlan_ranges = config['network_vlan_ranges'].split(',')
+    vlans_total = 0
+    for vrange in vlan_ranges:
+      vlan_range = vrange.split(':')
+      vlans_total = int(vlans_total) + (int(vlan_range[2]) - int(vlan_range[1]))
 
     return { 'vlans_used': vlans_in_use, 'vlans_total': vlans_total }