diff options
| author | John Eckersberg <jeckersb@redhat.com> | 2009-03-01 20:34:01 -0500 |
|---|---|---|
| committer | John Eckersberg <jeckersb@redhat.com> | 2009-03-13 13:52:34 -0400 |
| commit | 0807e952ef2882e37d8d76e0c611ae02b1540d4a (patch) | |
| tree | 591826ad7f0340060514cb3e61c0e84387da4e0d | |
| parent | 2b444e6b29033ec76c89e74dde890bef0c155a25 (diff) | |
| download | cobbler-0807e952ef2882e37d8d76e0c611ae02b1540d4a.tar.gz cobbler-0807e952ef2882e37d8d76e0c611ae02b1540d4a.tar.xz cobbler-0807e952ef2882e37d8d76e0c611ae02b1540d4a.zip | |
fix serialization
| -rw-r--r-- | cobbler/item_network.py | 27 | ||||
| -rw-r--r-- | installer_templates/modules.conf.template | 1 |
2 files changed, 20 insertions, 8 deletions
diff --git a/cobbler/item_network.py b/cobbler/item_network.py index 3d83680a..4303a9f1 100644 --- a/cobbler/item_network.py +++ b/cobbler/item_network.py @@ -116,6 +116,7 @@ class Network(item.Item): def _remove_from_free(self, addr): self.free_addresses = self._subtract_and_flatten(self.free_addresses, [addr]) + self.free_addresses.sort() def _add_to_used(self, used_dict): if self.used_addresses != []: @@ -215,16 +216,26 @@ class Network(item.Item): return True def to_datastruct(self): + def convert_used_addresses(l): + """ + used_addresses is a bit more involved... + """ + stringified = [] + for item in l: + item['ip'] = str(item['ip']) + stringified.append(item) + return stringified + return { 'name' : self.name, - 'cidr' : self.cidr, - 'address' : self.address, - 'gateway' : self.gateway, - 'broadcast' : self.broadcast, - 'nameservers' : self.nameservers, - 'reserved' : self.reserved, - 'used_addresses' : self.used_addresses, - 'free_addresses' : self.free_addresses, + 'cidr' : str(self.cidr), + 'address' : str(self.address), + 'gateway' : str(self.gateway), + 'broadcast' : str(self.broadcast), + 'nameservers' : [str(i) for i in self.nameservers], + 'reserved' : [str(i) for i in self.reserved], + 'used_addresses' : convert_used_addresses(self.used_addresses), + 'free_addresses' : [str(i) for i in self.free_addresses], 'comment' : self.comment } diff --git a/installer_templates/modules.conf.template b/installer_templates/modules.conf.template index c38178ae..4fe86c56 100644 --- a/installer_templates/modules.conf.template +++ b/installer_templates/modules.conf.template @@ -25,6 +25,7 @@ profile = serializer_catalog system = serializer_catalog repo = serializer_catalog image = serializer_catalog +network = serializer_catalog # authentication: # what users can log into the WebUI and Read-Write XMLRPC? |