Commit 34dde4bb authored by Alain Takoudjou's avatar Alain Takoudjou

tap network information should not cause incompatibility with old SR

parent eb76d6cc
...@@ -1428,6 +1428,7 @@ class SlapTool(BaseTool): ...@@ -1428,6 +1428,7 @@ class SlapTool(BaseTool):
timestamp = newtimestamp timestamp = newtimestamp
ip_list = [] ip_list = []
full_ip_list = []
for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'): for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'):
# XXX - There is new values, and we must keep compatibility # XXX - There is new values, and we must keep compatibility
address_tuple = ( address_tuple = (
...@@ -1439,6 +1440,8 @@ class SlapTool(BaseTool): ...@@ -1439,6 +1440,8 @@ class SlapTool(BaseTool):
internet_protocol_address.getGatewayIpAddress().decode("UTF-8"), internet_protocol_address.getGatewayIpAddress().decode("UTF-8"),
internet_protocol_address.getNetmask().decode("UTF-8"), internet_protocol_address.getNetmask().decode("UTF-8"),
internet_protocol_address.getNetworkAddress('').decode("UTF-8")) internet_protocol_address.getNetworkAddress('').decode("UTF-8"))
full_ip_list.append(address_tuple)
else:
ip_list.append(address_tuple) ip_list.append(address_tuple)
slave_instance_list = [] slave_instance_list = []
...@@ -1480,6 +1483,7 @@ class SlapTool(BaseTool): ...@@ -1480,6 +1483,7 @@ class SlapTool(BaseTool):
software_instance.getUrlString().decode("UTF-8"), software_instance.getUrlString().decode("UTF-8"),
'slave_instance_list': slave_instance_list, 'slave_instance_list': slave_instance_list,
'ip_list': ip_list, 'ip_list': ip_list,
'full_ip_list': full_ip_list,
'timestamp': "%i" % timestamp, 'timestamp': "%i" % timestamp,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment