Skip to content

Commit 96a13e3

Browse files
authored
Merge pull request #23 from cmeissner/release/v0.1.4
release v0.1.4
2 parents b10f3be + 33bb271 commit 96a13e3

File tree

4 files changed

+101
-1
lines changed

4 files changed

+101
-1
lines changed

phpypam/core/exceptions.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def __init__(self, *args, **kwargs):
1212
_NOT_FOUND_MESSAGES = {
1313
'No subnets found',
1414
'Address not found',
15+
'Vlan not found',
1516
}
1617

1718
if (self._code == 200 and self._message in _NOT_FOUND_MESSAGES) or self._code == 404:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="phpypam",
8-
version="0.1.3",
8+
version="0.1.4",
99
author="Christian Meißner",
1010
author_email="Christian Meißner <[email protected]>",
1111
description="Python API client library for phpIPAM installation",

tests/ensure_nameserver.py

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env python
2+
3+
import phpypam
4+
import json
5+
import yaml
6+
7+
with open('tests/vars/server.yml') as c:
8+
server = yaml.safe_load(c)
9+
10+
from phpypam import PHPyPAMEntityNotFoundException
11+
12+
13+
if __name__ == '__main__':
14+
pi = phpypam.api(
15+
url=server['url'],
16+
app_id=server['app_id'],
17+
username=server['username'],
18+
password=server['password'],
19+
ssl_verify=True
20+
)
21+
22+
my_nameserver = dict(
23+
name='my dns',
24+
namesrv1='127.0.01',
25+
permissions=1,
26+
)
27+
28+
try:
29+
entity = pi.get_entity(controller='tools/nameservers', params={'filter_by': 'name', 'filter_value': my_nameserver['name']})
30+
except PHPyPAMEntityNotFoundException:
31+
print('create entity')
32+
entity = pi.create_entity(controller='tools/nameservers', data=my_nameserver)
33+
entity = pi.get_entity(controller='tools/nameservers', params={'filter_by': 'name', 'filter_value': my_nameserver['name']})
34+
35+
entity = pi.get_entity(controller='tools/nameservers', params={'filter_by': 'name', 'filter_value': my_nameserver['name']})
36+
print(json.dumps(entity, indent=4, sort_keys=True))
37+
38+
my_nameserver = {
39+
'id': entity[0]['id'],
40+
'description': 'description added',
41+
}
42+
43+
print('update entity')
44+
pi.update_entity(controller='tools/nameservers', controller_path=entity[0]['id'], data=my_nameserver)
45+
46+
entity = pi.get_entity(controller='tools/nameservers', params={'filter_by': 'name', 'filter_value': my_nameserver['name']})
47+
print(json.dumps(entity, indent=4, sort_keys=True))
48+
49+
print('delete entity')
50+
pi.delete_entity(controller='tools/nameservers', controller_path=entity[0]['id'])

tests/ensure_vlan.py

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env python
2+
3+
import phpypam
4+
import json
5+
import yaml
6+
7+
with open('tests/vars/server.yml') as c:
8+
server = yaml.safe_load(c)
9+
10+
from phpypam import PHPyPAMEntityNotFoundException
11+
12+
13+
if __name__ == '__main__':
14+
pi = phpypam.api(
15+
url=server['url'],
16+
app_id=server['app_id'],
17+
username=server['username'],
18+
password=server['password'],
19+
ssl_verify=True
20+
)
21+
22+
my_vlan = dict(
23+
name='my vlan',
24+
number='1337',
25+
)
26+
27+
try:
28+
entity = pi.get_entity(controller='vlan', params={'filter_by': 'name', 'filter_value': 'my vlan'})
29+
except PHPyPAMEntityNotFoundException:
30+
print('create entity')
31+
entity = pi.create_entity(controller='vlan', data=my_vlan)
32+
33+
entity = pi.get_entity(controller='vlan', params={'filter_by': 'name', 'filter_value': 'my vlan'})
34+
print(json.dumps(entity, indent=4, sort_keys=True))
35+
36+
my_vlan = {
37+
'vlanId': entity[0]['vlanId'],
38+
'name': 'my vlan',
39+
'description': 'description added',
40+
}
41+
42+
print('update entity')
43+
pi.update_entity(controller='vlan', controller_path=entity[0]['vlanId'], data=my_vlan)
44+
45+
entity = pi.get_entity(controller='vlan', params={'filter_by': 'name', 'filter_value': 'my vlan'})
46+
print(json.dumps(entity, indent=4, sort_keys=True))
47+
48+
print('delete entity')
49+
pi.delete_entity(controller='vlan', controller_path=entity[0]['vlanId'])

0 commit comments

Comments
 (0)