subnet/address controllers

3 files changed, 22 insertions, 2 deletions

diff --git a/README.md b/README.md
index a13115c..985068d 100644
--- a/README.md
+++ b/README.md
@@ -35,12 +35,16 @@ If an error is encountered, an exception is raised.
 
 * `search(search=<query>)` search for subnet by CIDR
 * `getIP(subnet_id=<subnet id>, ip=<ip>)` get address object from subnet by IP
+* `getAddresses(subnet_id=<subnet id>)` get all addresses in subnet
 
 ### addresses
 
 * `getByIP(subnet_id=<subnet id>, ip=<ip>)`
+* `getByTag(tag_id=<tag id>)`
 * `search(ip=<ip>)`
 * `getFirstFree(subnet_id=<subnet id>)`
+* `getTags()`
+* `getTag(tag_id=<tag id>)`
 * `createFirstFree(subnet_id=<subnet id>)`
 
 ### vlan
diff --git a/phpipam/resources.py b/phpipam/resources.py
index 5ad1c78..35e9d43 100755
--- a/phpipam/resources.py
+++ b/phpipam/resources.py
@@ -15,7 +15,11 @@ resource_types = {
         },
         'getIP':{
             'method':'GET',
-            'requests':'/subnets/{subnet_id}/addresses/{ip}/'
+            'request':'/subnets/{subnet_id}/addresses/{ip}/'
+        },
+        'getAddresses':{
+            'method':'GET',
+            'request':'/subnets/{subnet_id}/addresses/'
         },
     },
     'addresses' : {
@@ -23,6 +27,10 @@ resource_types = {
             'method':'GET',
             'request':'/addresses/{ip}/{subnet_id}/'
         },
+        'getByTag':{
+            'method':'GET',
+            'request':'/addresses/tags/{tag_id}/addresses/'
+        },
         'search':{
             'method':'GET',
             'request':'/addresses/search/{ip}/'
@@ -31,6 +39,14 @@ resource_types = {
             'method':'GET',
             'request':'/addresses/first_free/{subnet_id}/'
         },
+        'getTags':{
+            'method':'GET',
+            'request':'/addresses/tags/'
+        },
+        'getTag':{
+            'method':'GET',
+            'request':'/addresses/tags/{tag_id}/'
+        },
         'createFirstFree':{
             'method':'POST',
             'request':'/addresses/first_free/{subnet_id}/'
diff --git a/setup.py b/setup.py
index 68441e1..f8fcafb 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import setuptools
 
 setup(
     name='phpipam',
-    version='0.1.0',
+    version='0.2.0',
     author="Jonas Gunz",
     description="phpIPAM API implementation",
     packages=['phpipam'],