|
|
|
@ -530,11 +530,12 @@ class VariableOsInstallNetRoute(NetHelper,ReadonlyVariable):
|
|
|
|
|
DEV,IP,CIDR,NET = 0,1,2,1
|
|
|
|
|
return map(lambda x:performFunc(x[DEV],x[NET],routeMatrix),
|
|
|
|
|
# union ip and mask to ip/net
|
|
|
|
|
map(lambda x:(x[DEV],ip.getIpNet(x[IP],cidr=x[CIDR])),
|
|
|
|
|
filter(lambda x:x[IP] and x[CIDR],
|
|
|
|
|
map(lambda x:(x[DEV],ip.getIpNet(x[IP],cidr=x[CIDR])) \
|
|
|
|
|
if x[IP] and x[CIDR] else (x[DEV],""),
|
|
|
|
|
#filter(lambda x:x[IP] and x[CIDR],
|
|
|
|
|
zip(self.Get('os_install_net_interfaces'),
|
|
|
|
|
self.Get('os_install_net_ip'),
|
|
|
|
|
self.Get('os_install_net_cidr')))))
|
|
|
|
|
self.Get('os_install_net_cidr'))))
|
|
|
|
|
|
|
|
|
|
def get(self):
|
|
|
|
|
"""Route info for conf.d/net"""
|
|
|
|
|