Merge pull request #18 from UpCloudLtd/0.3.5-devel

0.3.5 devel

Author: Elias Nygren

setup.py

@@ -4,15 +4,15 @@
 
 setup(
     name='upcloud-api',
-    version='0.3.4',
+    version='0.3.5',
     description='UpCloud API Client',
     author='Elias Nygren',
     author_email='[email protected]',
     maintainer='Elias Nygren',
     maintainer_email='[email protected]',
     url='https://github.com/UpCloudLtd/upcloud-python-api',
     packages=['upcloud_api', 'upcloud_api.cloud_manager'],
-    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.3',
+    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.5',
     license='MIT',
     install_requires=[
     	'future==0.14.3',

upcloud_api/__init__.py

@@ -9,7 +9,7 @@
 from future import standard_library
 standard_library.install_aliases()
 
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 __author__ = "Elias Nygren"
 __author_email__ = "[email protected]"
 __license__ = "MIT"

upcloud_api/firewall.py

@@ -18,6 +18,7 @@ class FirewallRule(object):
         'action': 'drop',
         'direction': 'in',
         'family': 'IPv4',
+        'comment': '',
         'destination_address_end': None,
         'destination_address_start': None,
         'destination_port_end': None,
@@ -40,9 +41,6 @@ def __init__(self, **kwargs):
 
         # set object attributes from params
         for key in kwargs:
-            if key not in self.attributes:
-                self._invalid_key_err(key)
-
             setattr(self, key, kwargs[key])
 
         # set defaults (if need be) where the default is not None
@@ -82,16 +80,6 @@ def destroy(self):
         )
 
 
-    def _invalid_key_err(self, key):
-        """
-        Raise exception on invalid parameters given to __init__.
-        """
-        attr_list = list(self.attributes.keys())
-        raise Exception(
-            "invalid parameter to FirewallRule, '{key}' is not in {attributes}"
-            .format(key=key, attributes=attr_list)
-        )
-
     def _associate_with_server(self, server):
         """
         Internal function used by Server to associate itself with the FirewallRule.