Bugfixes for samples with SPP 10.1.8

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

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()

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

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):

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)

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.")

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 = {}

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()

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()

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()