moved attr 'ip_addresses' from HostingService to Service

finoex/__init__.py

@@ -380,6 +380,7 @@ class Service(Item):
 
     def __init__(self,
                  duration=None,
+                 ip_addresses=None,
                  location=None,
                  period=None,
                  state=None,
@@ -390,6 +391,10 @@ class Service(Item):
         if duration:
             assert isinstance(duration, ioex.datetimeex.Duration)
             self.duration = duration
+        if ip_addresses:
+            assert isinstance(ip_addresses, list)
+            assert all([isinstance(a, str) for a in ip_addresses])
+            self.ip_addresses = ip_addresses
         if location:
             assert isinstance(location, str)
             self.location = location
@@ -406,15 +411,10 @@ class HostingService(Service):
     yaml_tag = u'!hosting-service'
 
     def __init__(self,
-                 ip_addresses=None,
                  operating_system=None,
                  **kwargs
                  ):
         super(HostingService, self).__init__(**kwargs)
-        if ip_addresses:
-            assert isinstance(ip_addresses, list)
-            assert all([isinstance(a, str) for a in ip_addresses])
-            self.ip_addresses = ip_addresses
         if operating_system:
             assert isinstance(operating_system, str)
             self.operating_system = operating_system

setup.py

@@ -4,7 +4,7 @@ import glob
 
 setup(
     name = 'finoex',
-    version = '0.7.1',
+    version = '0.8.0',
     # description = '',
     author = 'Fabian Peter Hammerle',
     author_email = 'fabian.hammerle@gmail.com',

tests/test_yaml.py

@@ -38,6 +38,7 @@ def get_item_b():
 def get_service_a():
     return finoex.Service(
         duration = ioex.datetimeex.Duration(years = 2),
+        ip_addresses = ['::1'],
         location = 'vienna',
         name = u'service',
         price_brutto = finoex.Sum(1.0, u'EUR'),
@@ -285,6 +286,8 @@ website_url: http://campaign.com
     [get_service_a(), u"""!service
 duration: !duration
   years: 2
+ip_addresses:
+- ::1
 location: vienna
 name: service
 price_brutto: !sum '1.0 EUR'
@@ -468,6 +471,8 @@ website_url: http://campaign.com
     [get_service_a(), u"""!service
 duration: !duration
   years: 2
+ip_addresses:
+- ::1
 location: vienna
 name: service
 price_brutto: !sum '1.0 EUR'