From e4909a5196f03c981d07dbc0900f8ef6130491ba Mon Sep 17 00:00:00 2001 From: skiemann Date: Fri, 8 Oct 2021 09:55:07 +0200 Subject: [PATCH 1/3] Fixing SQL data structure for SPP 10.1.8 request --- samples/appassigntosla.py | 2 +- samples/sqladhocbackup.py | 2 +- samples/sqlcopies.py | 2 +- samples/sqlrestore.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/appassigntosla.py b/samples/appassigntosla.py index f1a6d8c..018d5a0 100644 --- a/samples/appassigntosla.py +++ b/samples/appassigntosla.py @@ -41,7 +41,7 @@ def get_db_info(): for db in options.dbs: dbdata = {} searchdata = {"name":db} - dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType="+options.type+"&from=hlo", data=searchdata)['databases'] + dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType="+options.type+"&from=hlo", data=searchdata)['contents'] if not dbsearch: logger.warning("Did not find database " + db) break diff --git a/samples/sqladhocbackup.py b/samples/sqladhocbackup.py index 93d77b7..d3ba4e9 100644 --- a/samples/sqladhocbackup.py +++ b/samples/sqladhocbackup.py @@ -34,7 +34,7 @@ def validate_input(): def find_db(): searchdata = {"name":options.db} - dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=hlo", data=searchdata)['databases'] + dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=hlo", data=searchdata)['contents'] if not dbsearch: logger.warning("Did not find db " + options.db) session.logout() diff --git a/samples/sqlcopies.py b/samples/sqlcopies.py index 888ad84..ae3d6e3 100644 --- a/samples/sqlcopies.py +++ b/samples/sqlcopies.py @@ -31,7 +31,7 @@ def validate_input(): def find_db(): searchdata = {"name":options.db} - dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=recovery", data=searchdata)['databases'] + dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=recovery", data=searchdata)['contents'] if not dbsearch: logger.warning("Did not find recoverable db " + options.db) session.logout() diff --git a/samples/sqlrestore.py b/samples/sqlrestore.py index d16ee86..4c7426a 100644 --- a/samples/sqlrestore.py +++ b/samples/sqlrestore.py @@ -54,7 +54,7 @@ def validate_input(): def find_db(): searchdata = {"name":options.db} - dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=recovery", data=searchdata)['databases'] + dbsearch = client.SppAPI(session, 'apiapp').post(path="/search?resourceType=database&applicationType=sql&from=recovery", data=searchdata)['contents'] if not dbsearch: logger.warning("Did not find recoverable db " + options.db) session.logout() From 3cf82355ed75915cc09189018a107f6fdc19eacb Mon Sep 17 00:00:00 2001 From: skiemann Date: Fri, 8 Oct 2021 09:58:11 +0200 Subject: [PATCH 2/3] Fixing VM data structure for SPP 10.1.8 request --- samples/sppvmbackupinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/sppvmbackupinfo.py b/samples/sppvmbackupinfo.py index ba8409b..d8008b4 100644 --- a/samples/sppvmbackupinfo.py +++ b/samples/sppvmbackupinfo.py @@ -47,7 +47,7 @@ def get_vm_backup_info(): def get_vm_version_info(vm): vmbuinfo = [] - urlpath = vm['config']['hypervisorKey'] + "/vm/" + vm['id'] + "/version?from=hlo" + urlpath = vm['hypervisorKey'] + "/vm/" + vm['id'] + "/version?from=hlo" versions = client.SppAPI(session, 'corehv').get(path=urlpath)['versions'] for version in versions: data = {} From eec1c6b1077505c1181e5d1950fd20cdedce9978 Mon Sep 17 00:00:00 2001 From: skiemann Date: Fri, 8 Oct 2021 09:58:59 +0200 Subject: [PATCH 3/3] Fixing bugs with python 3.8 --- samples/changeuserpassword.py | 5 ++--- samples/createsite.py | 2 +- samples/createslapolicy.py | 2 +- samples/deletesite.py | 2 +- samples/spplicinstall.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/samples/changeuserpassword.py b/samples/changeuserpassword.py index b85a368..9358e2c 100644 --- a/samples/changeuserpassword.py +++ b/samples/changeuserpassword.py @@ -44,10 +44,9 @@ def change_password(): print("Password changed for " + options.username) except requests.exceptions.HTTPError as err: errmsg = json.loads(err.response.content) - print errmsg['description'] + print(errmsg['description']) validate_input() session = client.SppSession(options.host, options.username, options.password) session.login() -change_password() -session.logout() +change_password() \ No newline at end of file diff --git a/samples/createsite.py b/samples/createsite.py index 867d4ac..00bc9cd 100644 --- a/samples/createsite.py +++ b/samples/createsite.py @@ -1,5 +1,5 @@ # Script to create a new vSnap site in SPP -# Use registervsnap.py -h for help +# Use createsite.py -h for help import json import logging diff --git a/samples/createslapolicy.py b/samples/createslapolicy.py index bec3057..dd7239d 100644 --- a/samples/createslapolicy.py +++ b/samples/createslapolicy.py @@ -106,7 +106,7 @@ def build_start_date(): sdt = datetime.datetime.strptime(options.starttime, '%m/%d/%Y %H:%M') sdt += datetime.timedelta(minutes=2.5) sdt -= datetime.timedelta(minutes=sdt.minute %5, seconds=sdt.second, microseconds=sdt.microsecond) - starttime = int(sdt.strftime("%s"))*1000 + starttime = int(sdt.strftime("%S"))*1000 return starttime def build_weekly_dowlist(adate): diff --git a/samples/deletesite.py b/samples/deletesite.py index 320e64d..cacd998 100644 --- a/samples/deletesite.py +++ b/samples/deletesite.py @@ -43,7 +43,7 @@ def delete_site(): print(options.sitename + " is deleted") except client.requests.exceptions.HTTPError as err: errmsg = json.loads(err.response.content) - print(errmsg['response']) + print(errmsg['description']) validate_input() session = client.SppSession(options.host, options.username, options.password) diff --git a/samples/spplicinstall.py b/samples/spplicinstall.py index 15dca23..0e64fbd 100644 --- a/samples/spplicinstall.py +++ b/samples/spplicinstall.py @@ -34,7 +34,7 @@ def install_license(): hdrs = {'Content-Type': 'application/json','Accept': 'application/json'} r = requests.post(options.host + '/api/endeavour/session?action=installLicense', auth=requests.auth.HTTPBasicAuth('admin','password'), verify=False, headers=hdrs) - if(r.status_code is 204): + if(r.status_code == 204): logger.info("License installed.") else: logger.info("Error installing license.")