Fix IP address class, methods & tests

Author: Nurfet Becirevic

packet/IPAddress.py

@@ -5,8 +5,10 @@
 
 
 class IPAddress:
-    def __init__(self, data):
-        self.ip = data["id"]
+    def __init__(self, data, manager):
+        self.manager = manager
+
+        self.id = data["id"]
         self.address_family = data["address_family"]
         self.netmask = data["netmask"]
         self.created_at = data["created_at"]
@@ -35,8 +37,11 @@ def __init__(self, data):
         if "gateway" in data:
             self.gateway = data["gateway"]
 
-        def __str__(self):
-            return "%s" % self.code
+    def delete(self):
+        return self.manager.call_api("ips/%s" % self.id, type="DELETE")
+
+    def __str__(self):
+        return "%s" % self.code
 
-        def __repr__(self):
-            return "{}: {}".format(self.__class__.__name__, self.id)
+    def __repr__(self):
+        return "{}: {}".format(self.__class__.__name__, self.id)

packet/Manager.py

@@ -302,13 +302,13 @@ def list_device_ips(self, device_id):
         data = self.call_api("devices/%s/ips" % device_id, type="GET")
         ips = list()
         for jsoned in data["ip_addresses"]:
-            ip = IPAddress(jsoned)
+            ip = IPAddress(jsoned, self)
             ips.append(ip)
         return ips
 
     def get_ip(self, ip_id):
         data = self.call_api("ips/%s" % ip_id)
-        return IPAddress(data)
+        return IPAddress(data, self)
 
     def delete_ip(self, ip_id):
         self.call_api("ips/%s" % ip_id, type="DELETE")
@@ -319,7 +319,7 @@ def list_project_ips(self, project_id, params={}):
                              params=params)
         ips = list()
         for jsoned in data["ip_addresses"]:
-            ip = IPAddress(jsoned)
+            ip = IPAddress(jsoned, self)
             ips.append(ip)
         return ips
 
@@ -338,7 +338,7 @@ def create_device_ip(self, device_id, address,
 
         data = self.call_api("/devices/%s/ips" % device_id,
                              params=params, type="POST")
-        return IPAddress(data)
+        return IPAddress(data, self)
 
     def reserve_ip_address(self, project_id, type, quantity, facility,
                            details=None, comments=None, tags=list()):
@@ -351,12 +351,9 @@ def reserve_ip_address(self, project_id, type, quantity, facility,
             "tags": tags
         }
 
-        data = self.call_api("/projects/%s/ips" % project_id, params=request)
-        ips = list()
-        for i in data["ip_addresses"]:
-            ip = IPAddress(i)
-            ips.append(ip)
-        return ips
+        data = self.call_api("/projects/%s/ips" % project_id,
+                             params=request, type="POST")
+        return IPAddress(data, self)
 
     # Batches
     def create_batch(self, project_id, params):

test/test_ips.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import time
 import unittest
 import packet
@@ -14,14 +15,14 @@ def setUpClass(cls):
         org_id = cls.manager.list_organizations()[0].id
         cls.project = cls.manager.create_organization_project(
             org_id=org_id,
-            name="Int-Tests-IPs_{}".format(datetime.utcnow().timestamp())
+            name="Int-Tests-IPs_{}".format(datetime.utcnow().strftime("%Y%m%dT%H%M%S.%f")[:-3])
         )
 
-        cls.ipaddresses = cls.manager\
+        cls.ip_block = cls.manager \
             .reserve_ip_address(project_id=cls.project.id,
-                                type="global_ipv4",
+                                type="public_ipv4",
                                 quantity=1,
-                                facility="EWR1",
+                                facility="ewr1",
                                 details="delete me",
                                 tags=["deleteme"])
 
@@ -34,34 +35,26 @@ def setUpClass(cls):
                 break
             time.sleep(2)
 
-        cls.manager.reserve_ip_address(project_id=cls.project.id,
-                                       type="global_ipv4",
-                                       quantity=1,
-                                       facility="ewr1")
+    def test_reserve_ip_address(self):
+        self.assertEqual(32, self.ip_block.cidr)
+        self.assertEqual("delete me", self.ip_block.details)
 
-    def list_project_ips(self):
+    def test_list_project_ips(self):
         ips = self.manager.list_project_ips(self.project.id)
-
-        self.assertIsNotNone(ips)
+        self.assertGreater(len(ips), 0)
 
     def test_create_device_ip(self):
-        ip = None
-        params = {
-            "include": ["facility"]
-        }
-        ips = self.manager.list_project_ips(self.project.id,
-                                            params=params)
-        for i in ips:
-            if i.facility.code == "ewr1" \
-                    and i.address_family == 4:
-                ip = i
-                break
-
-        ipaddress = self.manager.create_device_ip(self.device.id,
-                                                  address=ip.address)
-        self.assertIsNotNone(ipaddress)
+        ip = self.manager.create_device_ip(self.device.id,
+                                           address=self.ip_block.address)
+        self.assertIsNotNone(ip)
+        self.assertEqual(ip.address, self.ip_block.address)
 
     @classmethod
     def tearDownClass(cls):
         cls.device.delete()
+        cls.ip_block.delete()
         cls.project.delete()
+
+
+if __name__ == "__main__":
+    sys.exit(unittest.main())