Fix ipv4 netmask error when run slapformat in the Cygwin

06ebfdb7 · Jondy Zhao · Marco Mariani · 0c552d82 · 06ebfdb7
Commit 06ebfdb7 authored Jun 24, 2013 by Jondy Zhao Committed by Marco Mariani Aug 15, 2013
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

slapos/format.py slapos/format.py +2 -2

No files found.
--- a/slapos/format.py
+++ b/slapos/format.py
@@ -844,8 +844,8 @@ class Interface(object):

  def addIPv4LocalAddress(self, addr=None):
    """Adds local IPv4 address in ipv4_local_network"""
-    netmask = self.ipv4_local_network if sys.platform == 'cygwin' \
-              else '255.255.255.255'
+    netmask = str(netaddr.IPNetwork(self.ipv4_local_network).netmask) \
+              if sys.platform == 'cygwin' else '255.255.255.255'
    local_address_list = self.getIPv4LocalAddressList()
    if addr is None:
      return self._generateRandomIPv4Address(netmask)