nexedi / slapos.core

/cc @tomo @alain.takoudjou

added 1 commit

• 32adf831 - format: Support environments with netmask with /

Compare with previous version

I merge because it seems ok...

mentioned in commit 18ee7dad

merged

@rafael @luke can you double check this is not causing test failures ?

I see on test history that since 18ee7dad we have:

======================================================================
ERROR: test_construct_prepared_no_alter_user (slapos.tests.test_slapformat.TestComputer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/tests/test_slapformat.py", line 481, in test_construct_prepared_no_alter_user
    computer.format(alter_user=False)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/format.py", line 623, in format
    ipv6_dict = self.interface.addIPv6Address(tap=partition.tap)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/format.py", line 1204, in addIPv6Address
    netmask_len = lenNetmaskIpv6(netmask)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/util.py", line 133, in lenNetmaskIpv6
    return len(binFromIpv6(netmask).rstrip('0'))
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/util.py", line 115, in binFromIpv6
    return binFromRawIpv6(socket.inet_pton(socket.AF_INET6, ip))
error: illegal IP address string passed to inet_pton

======================================================================
ERROR: test_construct_prepared_tap_no_alter_user (slapos.tests.test_slapformat.TestComputer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/tests/test_slapformat.py", line 538, in test_construct_prepared_tap_no_alter_user
    computer.format(alter_user=False)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/format.py", line 623, in format
    ipv6_dict = self.interface.addIPv6Address(tap=partition.tap)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/format.py", line 1204, in addIPv6Address
    netmask_len = lenNetmaskIpv6(netmask)
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/util.py", line 133, in lenNetmaskIpv6
    return len(binFromIpv6(netmask).rstrip('0'))
  File "/srv/slapgrid/slappart0/srv/testnode/ij/inst/test0-0/parts/slapos.core/slapos/util.py", line 115, in binFromIpv6
    return binFromRawIpv6(socket.inet_pton(socket.AF_INET6, ip))
error: illegal IP address string passed to inet_pton

@luke please double check :)

I'm on it.

mentioned in merge request !107

I reverted this patch for now...