From ddf5bfeb18bad3fd81206ff8f1689e6ab863f421 Mon Sep 17 00:00:00 2001 From: asamoukin Date: Fri, 27 Mar 2009 14:17:20 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=83=D0=BF=D0=BD=D1=8B=D1=85=20=D1=81=D0=B5=D1=82=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B2=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5=20=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=B8=D1=85=20=D1=81=D0=B5?= =?UTF-8?q?=D1=82=D0=B5=D0=B2=D1=8B=D1=85=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D1=84=D0=B5=D0=B9=D1=81=D0=BE=D0=B2=20-=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8F=20os=5Fnet=5Fallow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@1133 c91db197-33c1-4113-bf15-f8a5c547ca64 --- pym/cl_fill.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pym/cl_fill.py b/pym/cl_fill.py index 9ef1620..579aaab 100755 --- a/pym/cl_fill.py +++ b/pym/cl_fill.py @@ -78,39 +78,38 @@ class fillVars(object, cl_base.glob_attr): # Разрешенные сети (в данном случае все сети) def get_os_net_allow(self): - """Разрешенные сети""" + """Разрешенные сети разделитель запятая""" net={'255.255.0.0':'/16', '255.255.255.0':'/24', '255.255.255.128':'/25', '255.255.255.252':'/30', '255.255.255.255':''} - networks="" + networks=[] netInterfaces=cl_utils.getdirlist("/sys/class/net/") for i in netInterfaces: res=self._runos("/sbin/ifconfig %s"%i) for j in res: - s_ip=re.search('addr:([0-9\.]+).+Bcast:.+Mask:([0-9\.]+)'\ - ,j) + s_ip=re.search('addr:([0-9\.]+).+Bcast:.+Mask:([0-9\.]+)' ,j) if s_ip: ip, netmask=s_ip.groups() - ip=ip.split('.'); + ip=ip.split('.') if ip[0]=='10' or\ - (ip[0]=='172' and int(ip[1])>=16 and int(ip[1])<=31)or\ - (ip[0]=='192' and ip[1]=='168'): + (ip[0]=='172' and int(ip[1])>=16 and int(ip[1])<=31)or\ + (ip[0]=='192' and ip[1]=='168'): if netmask=='255.255.255.255': - networks+=ip+" " + networks.append(ip) elif netmask=='255.255.255.252': - networks+=ip[0]+"."+ip[1]+"."+ip[2]+"."+"252"+\ - net[netmask] + networks.append(ip[0]+"."+ip[1]+"."+ip[2]+"."+\ + "252"+net[netmask]) elif netmask=='255.255.255.128': - networks+=ip[0]+"."+ip[1]+"."+ip[2]+"."+"128"+\ - net[netmask] + networks.append(ip[0]+"."+ip[1]+"."+ip[2]+"."+\ + "128"+net[netmask]) elif netmask=='255.255.255.0': - networks+=ip[0]+"."+ip[1]+"."+ip[2]+"."+"0"+\ - net[netmask] + networks.append(ip[0]+"."+ip[1]+"."+ip[2]+"."+"0"+\ + net[netmask]) elif netmask=='255.255.0.0': - networks+=ip[0]+"."+ip[1]+".0.0"+net[netmask] - return networks + networks.append(ip[0]+"."+ip[1]+".0.0"+net[netmask]) + return ",".join(networks) def get_os_locale_locale(self): """локаль (прим: ru_RU.UTF-8)"""