Merge pull request #82 from TechConsult/ansible-support

Ansible support

Author: Trdls

setup.cfg

@@ -11,17 +11,18 @@ packages=['upcloud_api', 'upcloud_api.cloud_manager']
 license = MIT
 
 [options]
-python_requires = >=3.6
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4
 setup_requires =
     setuptools
     pytest-runner
 install_requires =
     python-dateutil
     requests
     six
+    python-dateutil
 tests_require =
     pytest==4.0.2
-packages = 
+packages =
     upcloud_api
     upcloud_api.cloud_manager
 

upcloud_api/cloud_manager/ip_address_mixin.py

@@ -22,12 +22,12 @@ def get_ip(self, address):
         res = self.get_request('/ip_address/' + address)
         return IPAddress(cloud_manager=self, **res['ip_address'])
 
-    def get_ips(self):
+    def get_ips(self, ignore_ips_without_server=False):
         """
         Get all IPAddress objects from the API.
         """
         res = self.get_request('/ip_address')
-        IPs = IPAddress._create_ip_address_objs(res['ip_addresses'], cloud_manager=self)
+        IPs = IPAddress._create_ip_address_objs(res['ip_addresses'], self, ignore_ips_without_server)
         return IPs
 
     def attach_ip(self, server, family='IPv4'):

upcloud_api/ip_address.py

@@ -16,7 +16,7 @@ class IPAddress(UpCloudResource):
 
     The only updateable field is the ptr_record.
 
-    Note that all of the fields are not always available depending on the API call, 
+    Note that all of the fields are not always available depending on the API call,
     consult the official API docs for details.
     """
 
@@ -26,7 +26,7 @@ class IPAddress(UpCloudResource):
         'family': 'IPv4',
         'part_of_plan': None,
         'ptr_record': None,
-        'server': None,
+        'server': None
     }
 
     def save(self):
@@ -51,7 +51,7 @@ def __str__(self):
         return self.address
 
     @staticmethod
-    def _create_ip_address_objs(ip_addresses, cloud_manager):
+    def _create_ip_address_objs(ip_addresses, cloud_manager, ignore_ips_without_server=False):
         """
         Create IPAddress objects from API response data.
         Also associates CloudManager with the objects.
@@ -65,7 +65,14 @@ def _create_ip_address_objs(ip_addresses, cloud_manager):
         if 'ip_address' in ip_addresses:
             ip_addresses = ip_addresses['ip_address']
 
+        filtered_ip_addresses = [] if ignore_ips_without_server else ip_addresses
+
+        if ignore_ips_without_server:
+            for ip_addr in ip_addresses:
+                if ip_addr.get('server'):
+                    filtered_ip_addresses.append(ip_addr)
+    
         return [
             IPAddress(cloud_manager=cloud_manager, **ip_addr)
-            for ip_addr in ip_addresses
+            for ip_addr in filtered_ip_addresses
         ]