sys.path.insert(1,"/usr/share/secnet")
import ipaddrset
+from argparseactionnoyes import ActionNoYes
+
VERSION="0.1.18"
from sys import version_info
assert(self._ok is not True)
self._ok=False
complain('bad parameter: %s: %s' % (what, why))
- return self
+ return False
def _max_ok(self,what,maxlen):
if len(self._s) > maxlen:
- self._bad(what,'too long (max %d)' % maxlen)
- return self
+ return self._bad(what,'too long (max %d)' % maxlen)
+ return True
def _re_ok(self,bad,what,maxlen=None):
if maxlen is None: maxlen=max[what]
self._max_ok(what,maxlen)
- if self._ok is False: return self
+ if self._ok is False: return False
if bad.search(self._s): return self._bad(what,'bad syntax')
- return self
+ return True
def _rtnval(self, is_ok, ifgood, ifbad=''):
if is_ok:
global group
global user
global of
+ global prefix
+ global key_prefix
ap = argparse.ArgumentParser(description='process secnet sites files')
ap.add_argument('--userv', '-u', action='store_true',
help='userv service fragment update mode')
+ ap.add_argument('--conf-key-prefix', action=ActionNoYes,
+ default=True,
+ help='prefix conf file key names derived from sites data')
ap.add_argument('--prefix', '-P', nargs=1,
help='set prefix')
ap.add_argument('arg',nargs=argparse.REMAINDER)
av = ap.parse_args()
#print(repr(av), file=sys.stderr)
service = 1 if av.userv else 0
+ prefix = '' if av.prefix is None else av.prefix[0]
+ key_prefix = av.conf_key_prefix
if service:
if len(av.arg)!=4:
print("Wrong number of arguments")
def prop_out(self,n):
return self.allow_properties[n](n,str(self.properties[n]))
def output_props(self,w,ind):
- for i in self.properties.keys():
+ for i in sorted(self.properties.keys()):
if self.allow_properties[i]:
self.indent(w,ind)
w.write("%s"%self.prop_out(i))
+ def kname(self):
+ return ((self.type[0].upper() if key_prefix else '')
+ + self.name)
def output_data(self,w,path):
ind = 2*len(path)
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ w.write("%s {\n"%(self.kname()))
self.output_props(w,ind+2)
if self.depth==1: w.write("\n");
- for c in self.children.values():
+ for k in sorted(self.children.keys()):
+ c=self.children[k]
c.output_data(w,path+(c,))
self.indent(w,ind)
w.write("};\n")
"Output flattened list of site names for this VPN"
ind=2*(len(path)+1)
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ w.write("%s {\n"%(self.kname()))
for i in self.children.keys():
self.children[i].output_vpnflat(w,path+(self,))
w.write("\n")
self.indent(w,ind+2)
w.write("all-sites %s;\n"%
- ','.join(self.children.keys()))
+ ','.join(map(lambda i: i.kname(),
+ self.children.values())))
self.indent(w,ind)
w.write("};\n")
# Python didn't support nested_scopes until version 2.1
#
#"/"+self.name+"/"+i
- w.write("%s %s;\n"%(self.name,','.join(
+ w.write("%s %s;\n"%(self.kname(),','.join(
map(lambda x,path=path,self=self:
'/'.join([prefix+"vpn-data"] + list(map(
- lambda i: i.name,
+ lambda i: i.kname(),
path+(self,x)))),
self.children.values()))))
ind=2*len(path)
np='/'.join(map(lambda i: i.name, path))
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ w.write("%s {\n"%(self.kname()))
self.indent(w,ind+2)
w.write("name \"%s\";\n"%(np,))
self.output_props(w,ind+2)
# (depth,properties)
levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
-# Reserved vpn/location/site names
-reserved={'all-sites':None}
-reserved.update(keywords)
-reserved.update(levels)
-
def complain(msg):
"Complain about a particular input line"
global complaints
# All vpns are children of this node
obstack=[root]
allow_defs=0 # Level above which new definitions are permitted
-prefix=''
def set_property(obj,w):
"Set a property on a configuration node"
# Flattened list of sites
w.write(prefix+"all-sites %s;\n"%",".join(
- map(lambda x:"%svpn/%s/all-sites"%(prefix,x),
- root.children.keys())))
+ map(lambda x:"%svpn/%s/all-sites"%(prefix,x.kname()),
+ root.children.values())))
line=0
file=None