add IPv6 to IP_address, IP-manager and Server.add_IP

Author: Elias Nygren

upcloud/cloud_manager/ip_address_mixin.py

@@ -4,7 +4,7 @@ class IPManager():
 	"""
 	Functions for managing IP-addresses. Intended to be used as a mixin for CloudManager.
 	"""
-	
+
 	def get_IP(self, address):
 		"""
 		Get an IP_address object with the IP address (string) from the API.
@@ -21,7 +21,7 @@ def get_IPs(self):
 		IPs = IP_address._create_ip_address_objs( res["ip_addresses"], cloud_manager=self )
 		return IPs
 
-	def attach_IP(self, server):
+	def attach_IP(self, server, family="IPv4"):
 		"""
 		Attach a new (random) IP_address to the given server (object or UUID)
 		"""
@@ -31,7 +31,8 @@ def attach_IP(self, server):
 
 		body = {
 			"ip_address": {
-				"server": server
+				"server": server,
+				"family": family
 			}
 		}
 
@@ -40,13 +41,13 @@ def attach_IP(self, server):
 
 	def modify_IP(self, IP_addr, ptr_record):
 		"""
-		Modify an IP address' ptr-record (Reverse DNS). 
+		Modify an IP address' ptr-record (Reverse DNS).
 		Accepts an IP_address instance (object) or its address (string).
 		"""
 
 		if not isinstance(IP_addr, str):
 			IP_addr = IP_addr.address
-		
+
 		body = {
 			"ip_address": {
 				"ptr_record": ptr_record

upcloud/ip_address.py

@@ -2,33 +2,35 @@
 
 class IP_address(BaseAPI):
 	"""
-	Object representation of the IP-address. 
+	Object representation of the IP-address.
 
 	Attributes:
 	access -- "public" or "private"
 	address -- the actual IP_address (string)
 	ptr_record -- the reverse DNS name (string)
 	server -- the UUID of the server this IP is attached to (string)
-	
-	The only updateable field is the ptr_record. 
+
+	The only updateable field is the ptr_record.
 	ptr_record and server are present only if /server/uuid endpoint was used.
 	"""
 
-	def __init__(self, access, address, cloud_manager, ptr_record=None, server=None, *args, **kwargs):
+	def __init__(self, access, address, cloud_manager, family="IPv4",
+				 ptr_record=None, server=None, *args, **kwargs):
 		"""
 		ptr_record and server not returned by the API in every case (e.g. when IP is nested).
 		Only ptr_record is editable due to restrictions of the API.
 		"""
 		self._cloud_manager = cloud_manager
-		self.__reset(access, address, ptr_record, server)
+		self.__reset(access, address, family, ptr_record, server)
 
-	def __reset(self, access, address, ptr_record=None, server=None):
+	def __reset(self, access, address, family="IPv4", ptr_record=None, server=None):
 		"""
 		Reset after repopulating from API.
 		"""
 		# Always present
 		self._access = access
 		self._address = address
+		self._family = family
 
 		# Present when populated from /server/uuid endpoint
 		self._server_uuid = server
@@ -41,7 +43,7 @@ def save(self):
 		body = { "ip_address": { "ptr_record": self.ptr } }
 		data = self._cloud_manager.request("PUT", "/ip_address/" + self.address, body)
 		self.__reset(**data["ip_address"])
-	
+
 	def destroy(self):
 		"""
 		Release the IP_address. DELETE /ip_address/uuid
@@ -54,18 +56,23 @@ def __str__(self):
 	@property
 	def address(self):
 		return self._address
-	
+
 	@property
 	def access(self):
-		return self._access	
-	
+		return self._access
+
 	@property
 	def server_uuid(self):
 		return self._server_uuid
 
+	@property
+	def family(self):
+	    return self._family
+
+
 	@staticmethod
 	def _create_ip_address_objs(IP_addrs, cloud_manager):
 		IP_objs = list()
 		for IP_addr in IP_addrs["ip_address"]:
 			IP_objs.append( IP_address(cloud_manager = cloud_manager, **IP_addr) )
-		return IP_objs	
+		return IP_objs

upcloud/server.py

@@ -119,11 +119,11 @@ def restart(self):
 		self.cloud_manager.post_request("/server/" + self.uuid + "/restart" , body)
 		object.__setattr__(self, "state", "maintenance") # post_request already handles any errors from API
 
-	def add_IP(self):
+	def add_IP(self, family="IPv4"):
 		"""
 		Allocate a new (random) IP-address to the Server.
 		"""
-		IP = self.cloud_manager.attach_IP(self.uuid)
+		IP = self.cloud_manager.attach_IP(self.uuid, family)
 		self.ip_addresses.append(IP)
 		return IP