diff --git a/freenas_network_unlock.py b/freenas_network_unlock.py index 5a62cd8..feb47e1 100644 --- a/freenas_network_unlock.py +++ b/freenas_network_unlock.py @@ -41,20 +41,20 @@ def request(resource, method='GET', data=None): if r.ok: try: logging.debug('Request Returned JSON: {}'.format(r.json())) - return [r.ok, r.status_code, r.json()] + return ['ok': r.ok, 'status_code': r.status_code, 'response': r.json()] except: logging.debug('Request Returned Text: {}'.format(r.text)) - return [r.ok, r.status_code, r.text] + return ['ok': r.ok, 'status_code': r.status_code, 'response':, r.text] raise ValueError(r) #if ping(config.HOSTNAME): POOLS = request('storage/volume/', 'GET') -for pool in POOLS: +for pool in POOLS['response']: if pool['is_decrypted'] == False: logging.info('Pool {} is locked'.format(pool['name'])) response = request('storage/volume/{}/unlock/'.format(pool['name']), 'POST', {'passphrase': '{}'.format(config.POOLS[pool['name']])}) - if response[0]: + if response['ok']: logging.info('Pool {} was unlocked successfully'.format(pool['name'])) else: logging.error('Pool {} was NOT unlocked successfully'.format(pool['name']))