Added support for WAPI 1.6

Taking advantage of newer WAPI where IP address in POST request for a
new host record can be supplied as “func:nextavailableip:network”. The
library call “create_host_record” can now accept either IP address or
NET address in CIDR format to allocate IP from.

Author: igor-feoktistov

README.md

@@ -40,16 +40,12 @@ Example:
 ```
 import infoblox
 
-iba_api = infoblox.Infoblox('10.10.20.32', 'admin', 'secret', '1.0', 'internal', 'default')
+iba_api = infoblox.Infoblox('10.10.20.32', 'admin', 'secret', '1.6', 'internal', 'default')
 
 try:
-    ip = iba_api.get_next_available_ip('192.168.0.0/24')
-    iba_api.create_host_record(ip, 'mytest.example.com')
+    ip = iba_api.create_host_record('192.168.0.0/24', 'mytest.example.com')
+    print ip
 except Exception as e:
     print e
 
 ```
-
-### Limitations
-
-Currently supports WAPI 1.0 only. 1.2.1 is coming soon.

infoblox.py

@@ -26,6 +26,9 @@ class InfobloxNoIPavailableException(Exception):
 class InfobloxGeneralException(Exception):
     pass
 
+class InfobloxBadInputParameter(Exception):
+    pass
+
 class Infoblox(object):
     """ Implements the following subset of Infoblox IPAM API via REST API
 	create_network
@@ -110,18 +113,26 @@ def get_next_available_ip(self, network):
 	except Exception:
 	    raise
 
-    def create_host_record(self, ip_v4, fqdn):
-	""" Implements IBA REST API call to add IBA host record
-	:param ip_v4: host IP v4 address
+    def create_host_record(self, address, fqdn):
+	""" Implements IBA REST API call to create IBA host record
+	Returns IP v4 address assigned to the host
+	:param address: IP v4 address or NET v4 address in CIDR format to get next_available_ip from
 	:param fqdn: hostname in FQDN
 	"""
-	rest_url = 'https://' + self.iba_host + '/wapi/v' + self.iba_wapi_version + '/record:host'
-	payload = '{"ipv4addrs": [{"configure_for_dhcp": false,"ipv4addr": "' + ip_v4 + '"}],"name": "' + fqdn + '","view": "' + self.iba_dns_view + '"}'
+	if re.match("^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\/[0-9]+$", address):
+	    ipv4addr = 'func:nextavailableip:' + address
+	else:
+	    if re.match("^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$", address):
+		ipv4addr = address
+	    else:
+		raise InfobloxBadInputParameter('Expected IP or NET address in CIDR format')
+	rest_url = 'https://' + self.iba_host + '/wapi/v' + self.iba_wapi_version + '/record:host' + '?_return_fields=ipv4addrs'
+	payload = '{"ipv4addrs": [{"configure_for_dhcp": false,"ipv4addr": "' + ipv4addr + '"}],"name": "' + fqdn + '","view": "' + self.iba_dns_view + '"}'
 	try:
 	    r = requests.post(url=rest_url, auth=(self.iba_user, self.iba_password), verify=self.iba_verify_ssl, data=payload)
 	    r_json = r.json()
 	    if r.status_code == 200 or r.status_code == 201:
-		return
+	    	return r_json['ipv4addrs'][0]['ipv4addr']
 	    else:
 		if 'text' in r_json:
 		    raise InfobloxGeneralException(r_json['text'])

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='infoblox',
-    version='1.0',
+    version='1.1',
     description='The module implements Infoblox IPAM API via REST API',
     long_description=README,
     license = 'Licensed under the Apache License, Version 2.0',