Merge branch 'master' into implement-livelog-call

Author: uroni

test/urbackup_api_test.py

@@ -16,6 +16,10 @@
 
 
 clients = server.get_status()
+usage = server.get_usage()
+
+if len(clients) != len(usage):
+    print("Failed to retreive usage or status information. Length of both lists is different.")
 
 # Uncomment to format time differently
 # locale.setlocale(locale.LC_TIME, "german")

urbackup_api/__init__.py

@@ -356,6 +356,20 @@ def get_livelog(self, clientid = 0):
         self._lastlogid = log["logdata"][-1]['id']
 
         return log["logdata"]
+      
+    def get_usage(self):
+        if not self.login():
+            return None
+
+        usage = self._get_json("usage")
+
+        if not usage:
+            return None
+
+        if not "usage" in usage:
+            return None
+
+        return usage["usage"]
 
     def get_extra_clients(self):
         if not self.login():