john/phpIPAM-for-vRA8
1
0
Fork 0
mirror of https://github.com/jbowdre/phpIPAM-for-vRA8.git synced 2024-11-21 22:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

code cleanup

Browse source
This commit is contained in:
John Bowdre 2021-01-15 14:55:54 -06:00
parent b31e96d42b
commit 62ec0b89ad
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/python/allocate_ip/source.py
View file

@ -82,7 +82,6 @@ def auth_session(uri, auth, cert):
req = requests.post(auth_uri, auth=auth, verify=cert) req = requests.post(auth_uri, auth=auth, verify=cert)
if req.status_code != 200: if req.status_code != 200:
raise requests.exceptions.RequestException('Authentication Failure!') raise requests.exceptions.RequestException('Authentication Failure!')
print('Auth success.')
token = {"token": req.json()['data']['token']} token = {"token": req.json()['data']['token']}
return token return token

8
src/main/python/get_ip_ranges/source.py
View file

@ -44,7 +44,6 @@ def auth_session(uri, auth, cert):
req = requests.post(auth_uri, auth=auth, verify=cert) req = requests.post(auth_uri, auth=auth, verify=cert)
if req.status_code != 200: if req.status_code != 200:
raise requests.exceptions.RequestException('Authentication Failure!') raise requests.exceptions.RequestException('Authentication Failure!')
print('Auth success.')
token = {"token": req.json()['data']['token']} token = {"token": req.json()['data']['token']}
return token return token
@ -63,8 +62,8 @@ def do_get_ip_ranges(self, auth_credentials, cert):
# Request list of subnets # Request list of subnets
subnet_uri = f'{uri}/subnets/' subnet_uri = f'{uri}/subnets/'
ipRanges = [] ipRanges = []
subnet_req = requests.get(f'{subnet_uri}?filter_by=isPool&filter_value=1', headers=token, verify=cert) subnets = requests.get(f'{subnet_uri}?filter_by=isPool&filter_value=1', headers=token, verify=cert)
subnets = subnet_req.json()['data'] subnets = subnets.json()['data']
for subnet in subnets: for subnet in subnets:
ipRange = {} ipRange = {}
ipRange['id'] = str(subnet['id']) ipRange['id'] = str(subnet['id'])
@ -79,7 +78,8 @@ def do_get_ip_ranges(self, auth_credentials, cert):
ipRange['dnsServerAddresses'] = [server.strip() for server in str(subnet['nameservers']['namesrv1']).split(';')] ipRange['dnsServerAddresses'] = [server.strip() for server in str(subnet['nameservers']['namesrv1']).split(';')]
gw_req = requests.get(f"{subnet_uri}/{subnet['id']}/addresses/?filter_by=is_gateway&filter_value=1", headers=token, verify=cert) gw_req = requests.get(f"{subnet_uri}/{subnet['id']}/addresses/?filter_by=is_gateway&filter_value=1", headers=token, verify=cert)
if gw_req.status_code == 200: if gw_req.status_code == 200:
ipRange['gatewayAddress'] = gw_req.json()['data'][0]['ip'] gateway = gw_req.json()['data'][0]['ip']
ipRange['gatewayAddress'] = gateway
logging.debug(ipRange) logging.debug(ipRange)
ipRanges.append(ipRange) ipRanges.append(ipRange)