Merge remote-tracking branch 'origin/master'

PVE-Zabbix.py

@@ -5,8 +5,8 @@ from VM import VM
 from Storage import Storage
 
 USERNAME = "zabbix@pve"
-PASSWORD = "zabbix"
-HOST = "172.16.3.11:8006"
+PASSWORD = "KbCurGdt82NTgBye"
+HOST = "localhost:8006"
 
 conn = PVEApi(HOST, USERNAME, PASSWORD)
 nodelist = conn.get_node_list()

PVEApi.py

@@ -113,7 +113,10 @@ class PVEApi(object):
         vmlist = list()
         for node in nodelist:
             url = self.url + '/nodes/' + node.name + '/qemu'
-            response = json.load(urllib2.urlopen(self.get_request(url), context=ssl._create_unverified_context()))
+            try:
+            	response = json.load(urllib2.urlopen(self.get_request(url), context=ssl._create_unverified_context()))
+            except Exception as e:
+              	pass
             resources = response['data']
             for machine in resources:
                 name = machine[u'name']
@@ -175,7 +178,10 @@ class PVEApi(object):
                 active = storage[u'active']
                 enabled = storage[u'enabled']
                 avail = storage[u'avail']
-                used_fraction = storage[u'used_fraction']
+                try:
+                    used_fraction = storage[u'used_fraction']
+                except KeyError:
+                    used_fraction = "Error getting value"
                 stor = Storage(node, name, total, used, active, enabled, avail, used_fraction)
                 storagelist.append(stor)
         return storagelist