X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Funtangle%2Funtangle.py;h=05df722334ed04e7908de50abe545fa8727a93eb;hb=dc15f33618704de8c13d56fdd3a1243ac7497593;hp=6a972804f0fe0a1afe0523a108b2c4ecce009b7e;hpb=b76e936f471c7c0c31652056fde8555ab3b913f2;p=untangle-https-backup.git diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py index 6a97280..05df722 100644 --- a/src/untangle/untangle.py +++ b/src/untangle/untangle.py @@ -18,11 +18,11 @@ class Untangle: self.host = s['host'] self.username = s.get('username', 'admin') self.password = s['password'] - self.version = int(s.get('version', '11')) + self.version = int(s.get('version', '12')) self.base_url = 'https://' + self.host + '/' # This never changes # Sanity check the numerical version. - if self.version not in [9, 11]: + if self.version not in [9, 10, 11, 12]: msg = 'Invalid version "' + str(self.version) + '" ' msg += 'in section "' + s.name + '"' raise configparser.ParsingError(msg) @@ -79,8 +79,9 @@ class Untangle: """ if self.version == 9: return self.get_backup_v9() - elif self.version == 11: - return self.get_backup_v11() + elif self.version in [10, 11, 12]: + # The procedure for v11 or v12 is the same as for v10. + return self.get_backup_v10() def get_backup_v9(self): @@ -101,9 +102,9 @@ class Untangle: return response.read() - def get_backup_v11(self): + def get_backup_v10(self): """ - Retrieve a backup from Untangle version 11. + Retrieve a backup from Untangle version 10. Returns the binary HTTPS response (i.e. the file). """