Zabbix helper should return None if we don't have the requested property

in the result
dnaeon · Apr 6, 2014 · 25e9fce · 25e9fce
1 parent ab5314c
commit 25e9fce
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/vpoller/helpers/zabbix.py b/src/vpoller/helpers/zabbix.py
@@ -101,8 +101,9 @@ def zabbix_item_value(self):
 
         """
         property_name = self.msg['properties'][0]
-
-        return self.data['result'][0][property_name]
+        result = self.data['result'][0]
+
+        return result.get(property_name)
 
     def zabbix_vm_disk_get(self):
         """
@@ -116,8 +117,9 @@ def zabbix_vm_disk_get(self):
 
         """
         property_name = self.msg['properties'][0]
+        result = self.data['result']0['disk']
 
-        return self.data['result'][0]['disk'][property_name]
+        return result.get(property_name)
 
     def zabbix_vm_disk_discover(self):
         """