updated json parsing
This commit is contained in:
36
app.py
36
app.py
@ -59,12 +59,26 @@ class UnifiAPI:
|
|||||||
def get_all_devices(self):
|
def get_all_devices(self):
|
||||||
url = f"{self.base_url}/v1/sites/{self.site_id}/devices"
|
url = f"{self.base_url}/v1/sites/{self.site_id}/devices"
|
||||||
response = self.session.get(url, headers=self.headers)
|
response = self.session.get(url, headers=self.headers)
|
||||||
|
response.raise_for_status()
|
||||||
return response.json()['data']
|
return response.json()['data']
|
||||||
|
|
||||||
def get_device_details(self, device_id):
|
def get_device_details(self, device_id):
|
||||||
url = f"{self.base_url}/v1/sites/{self.site_id}/devices/{device_id}"
|
url = f"{self.base_url}/v1/sites/{self.site_id}/devices/{device_id}"
|
||||||
response = self.session.get(url, headers=self.headers)
|
response = self.session.get(url, headers=self.headers)
|
||||||
return response.json()
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
return {
|
||||||
|
'state': data['state'],
|
||||||
|
'firmware': {
|
||||||
|
'version': data['firmwareVersion'],
|
||||||
|
'updatable': data.get('firmwareUpdatable', False)
|
||||||
|
},
|
||||||
|
'network': {
|
||||||
|
'ip': data['ipAddress'],
|
||||||
|
'mac': data['macAddress']
|
||||||
|
},
|
||||||
|
'interfaces': self._parse_interfaces(data.get('interfaces', {}))
|
||||||
|
}
|
||||||
|
|
||||||
def get_device_diagnostics(self, device):
|
def get_device_diagnostics(self, device):
|
||||||
details = self.get_device_details(device['ip'])
|
details = self.get_device_details(device['ip'])
|
||||||
@ -73,24 +87,15 @@ class UnifiAPI:
|
|||||||
|
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
'state': details['state'],
|
'state': details['state'],
|
||||||
'firmware': {
|
'firmware': details['firmware'],
|
||||||
'version': details['firmwareVersion'],
|
'network': details['network'],
|
||||||
'updatable': details.get('firmwareUpdatable', False)
|
|
||||||
},
|
|
||||||
'network': {
|
|
||||||
'ip': details['ipAddress'],
|
|
||||||
'mac': details['macAddress']
|
|
||||||
},
|
|
||||||
'uptime': {
|
'uptime': {
|
||||||
'adopted_at': details['adoptedAt'],
|
'adopted_at': details.get('adoptedAt'),
|
||||||
'provisioned_at': details['provisionedAt']
|
'provisioned_at': details.get('provisionedAt')
|
||||||
},
|
},
|
||||||
'interfaces': {}
|
'interfaces': details['interfaces']
|
||||||
}
|
}
|
||||||
|
|
||||||
if 'interfaces' in details:
|
|
||||||
diagnostics['interfaces'] = self._parse_interfaces(details['interfaces'])
|
|
||||||
|
|
||||||
return diagnostics
|
return diagnostics
|
||||||
|
|
||||||
def _parse_interfaces(self, interfaces):
|
def _parse_interfaces(self, interfaces):
|
||||||
@ -117,7 +122,6 @@ class UnifiAPI:
|
|||||||
}
|
}
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
# Monitoring functions
|
# Monitoring functions
|
||||||
def run_diagnostics(device):
|
def run_diagnostics(device):
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user