allow multiple IP
This commit is contained in:
parent
3e7ae41061
commit
88f864cd2a
@ -52,7 +52,6 @@ class ServiceAnnotator:
|
||||
"""
|
||||
def __init__(self, objectspace):
|
||||
self.objectspace = objectspace
|
||||
self.uniq_ip = []
|
||||
self.uniq_overrides = []
|
||||
if 'network_type' not in self.objectspace.types:
|
||||
self.objectspace.types['network_type'] = self.objectspace.types['ip_type']
|
||||
@ -287,11 +286,6 @@ class ServiceAnnotator:
|
||||
ip,
|
||||
service_name,
|
||||
) -> None:
|
||||
if service_name in self.uniq_ip:
|
||||
msg = _('only one IP is allowed by service, '
|
||||
'please use a variable multiple if you want have more than one IP')
|
||||
raise DictConsistencyError(msg, 67, ip.xmlfiles)
|
||||
self.uniq_ip.append(service_name)
|
||||
variable = self.objectspace.paths.get_variable(ip.name, ip.xmlfiles)
|
||||
if variable.type not in ['ip', 'network', 'network_cidr']:
|
||||
msg = _(f'ip cannot be linked to "{variable.type}" variable "{ip.name}"')
|
||||
|
||||
@ -254,12 +254,15 @@ class RougailBaseTemplate:
|
||||
else:
|
||||
var = None
|
||||
func = f'_instance_{type}'
|
||||
filename, source, destfile, var = getattr(self, func)(filevar,
|
||||
filename,
|
||||
service_name,
|
||||
variable,
|
||||
idx,
|
||||
)
|
||||
data = getattr(self, func)(filevar,
|
||||
filename,
|
||||
service_name,
|
||||
variable,
|
||||
idx,
|
||||
)
|
||||
if data is None:
|
||||
continue
|
||||
filename, source, destfile, var = data
|
||||
destfilename = join(self.destinations_dir, destfile[1:])
|
||||
makedirs(dirname(destfilename), exist_ok=True)
|
||||
self.log.info(_(f"{filevar['engine']} processing: '{destfilename}'"))
|
||||
@ -307,6 +310,7 @@ class RougailBaseTemplate:
|
||||
self.instance_file(fill, type_, service_name)
|
||||
else:
|
||||
self.log.debug(_("Instantiation of file '{filename}' disabled"))
|
||||
self.post_instance_service(service_name)
|
||||
self.post_instance()
|
||||
chdir(ori_dir)
|
||||
|
||||
@ -315,6 +319,9 @@ class RougailBaseTemplate:
|
||||
):
|
||||
raise NotImplementedError(_('cannot desactivate a service'))
|
||||
|
||||
def post_instance_service(self, service_name): # pragma: no cover
|
||||
pass
|
||||
|
||||
def post_instance(self): # pragma: no cover
|
||||
pass
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
"""
|
||||
|
||||
from typing import Dict
|
||||
from typing import Dict, Any
|
||||
from os import makedirs, symlink
|
||||
from os.path import dirname, isfile, join
|
||||
from ipaddress import ip_network
|
||||
@ -62,6 +62,13 @@ z %%filename - - - - -
|
||||
|
||||
|
||||
class RougailSystemdTemplate(RougailBaseTemplate):
|
||||
def __init__(self, # pylint: disable=R0913
|
||||
config: 'Config',
|
||||
rougailconfig: 'RougailConfig'=None,
|
||||
) -> None:
|
||||
self.ip_per_service = None
|
||||
super().__init__(config, rougailconfig)
|
||||
|
||||
def _instance_files(self,
|
||||
filevar: Dict,
|
||||
destfile: str,
|
||||
@ -95,25 +102,22 @@ class RougailSystemdTemplate(RougailBaseTemplate):
|
||||
|
||||
def _instance_ip(self,
|
||||
filevar: Dict,
|
||||
destfile,
|
||||
ip,
|
||||
service_name: str,
|
||||
var: Any,
|
||||
idx: int,
|
||||
*args,
|
||||
) -> tuple:
|
||||
if self.ip_per_service is None:
|
||||
self.ip_per_service = []
|
||||
if 'netmask' in filevar:
|
||||
if isinstance(filevar['name'], list):
|
||||
variable = [str(ip_network(f'{net}/{mask}'))
|
||||
for net, mask in zip(filevar['name'], filevar['netmask'])]
|
||||
if isinstance(filevar["netmask"], list):
|
||||
netmask = filevar['netmask'][idx]
|
||||
else:
|
||||
variable = str(ip_network(f'{filevar["name"]}/{filevar["netmask"]}'))
|
||||
else:
|
||||
variable = filevar['name']
|
||||
if not isinstance(variable, list):
|
||||
if variable is None:
|
||||
variable = []
|
||||
else:
|
||||
variable = [variable]
|
||||
filevar['engine'] = 'creole'
|
||||
return None, ROUGAIL_IP_TEMPLATE, f'/systemd/system/{service_name}.service.d/rougail_ip.conf', variable
|
||||
netmask = filevar['netmask']
|
||||
self.ip_per_service.append(str(ip_network(f'{ip}/{netmask}')))
|
||||
elif ip:
|
||||
self.ip_per_service.append(ip)
|
||||
|
||||
def desactive_service(self,
|
||||
service_name: str,
|
||||
@ -122,6 +126,26 @@ class RougailSystemdTemplate(RougailBaseTemplate):
|
||||
makedirs(dirname(filename), exist_ok=True)
|
||||
symlink('/dev/null', filename)
|
||||
|
||||
def post_instance_service(self,
|
||||
service_name: str,
|
||||
) -> None: # pragma: no cover
|
||||
if self.ip_per_service is None:
|
||||
return
|
||||
destfile = f'/systemd/system/{service_name}.service.d/rougail_ip.conf'
|
||||
destfilename = join(self.destinations_dir, destfile[1:])
|
||||
makedirs(dirname(destfilename), exist_ok=True)
|
||||
self.log.info(_(f"creole processing: '{destfilename}'"))
|
||||
self.engines['creole'].process(filename=None,
|
||||
source=ROUGAIL_IP_TEMPLATE,
|
||||
true_destfilename=destfile,
|
||||
destfilename=destfilename,
|
||||
destdir=self.destinations_dir,
|
||||
variable=self.ip_per_service,
|
||||
rougail_variables_dict=self.rougail_variables_dict,
|
||||
eosfunc=self.eosfunc,
|
||||
)
|
||||
self.ip_per_service = None
|
||||
|
||||
def post_instance(self):
|
||||
destfile = '/tmpfiles.d/rougail.conf'
|
||||
destfilename = join(self.destinations_dir, destfile[1:])
|
||||
|
||||
@ -14,9 +14,5 @@
|
||||
"rougail.general1.leader.follower2": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
},
|
||||
"rougail.general1.leader.follower3": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,9 +14,5 @@
|
||||
"rougail.general1.leader.follower2": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
},
|
||||
"rougail.general1.leader.follower3": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,9 +14,5 @@
|
||||
"rougail.general1.leader.follower2": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
},
|
||||
"rougail.general1.leader.follower3": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,9 +14,5 @@
|
||||
"rougail.general1.leader.follower2": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
},
|
||||
"rougail.general1.leader.follower3": {
|
||||
"owner": [],
|
||||
"value": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<services>
|
||||
<service name='nut'>
|
||||
<ip>nut_monitor_host</ip>
|
||||
<ip>nut_monitor_host</ip>
|
||||
<ip>nut_monitor_host2</ip>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
<variable name="nut_monitor_host" type="ip" mandatory='True'>
|
||||
<value>192.168.0.1</value>
|
||||
</variable>
|
||||
<variable name="nut_monitor_host2" type="ip" mandatory='True'>
|
||||
<value>192.168.0.2</value>
|
||||
</variable>
|
||||
</variables>
|
||||
</rougail>
|
||||
<!-- vim: ts=4 sw=4 expandtab
|
||||
34
tests/dictionaries/70services_ip_twice/makedict/after.json
Normal file
34
tests/dictionaries/70services_ip_twice/makedict/after.json
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
"rougail.nut_monitor_host": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.1"
|
||||
},
|
||||
"rougail.nut_monitor_host2": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.2"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host.name": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.1"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host2.name": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.2"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host2.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.manage": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
}
|
||||
}
|
||||
10
tests/dictionaries/70services_ip_twice/makedict/base.json
Normal file
10
tests/dictionaries/70services_ip_twice/makedict/base.json
Normal file
@ -0,0 +1,10 @@
|
||||
{
|
||||
"rougail.nut_monitor_host": "192.168.0.1",
|
||||
"rougail.nut_monitor_host2": "192.168.0.2",
|
||||
"services.nut.ip.nut_monitor_host.name": "192.168.0.1",
|
||||
"services.nut.ip.nut_monitor_host.activate": true,
|
||||
"services.nut.ip.nut_monitor_host2.name": "192.168.0.2",
|
||||
"services.nut.ip.nut_monitor_host2.activate": true,
|
||||
"services.nut.activate": true,
|
||||
"services.nut.manage": true
|
||||
}
|
||||
34
tests/dictionaries/70services_ip_twice/makedict/before.json
Normal file
34
tests/dictionaries/70services_ip_twice/makedict/before.json
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
"rougail.nut_monitor_host": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.1"
|
||||
},
|
||||
"rougail.nut_monitor_host2": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.2"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host.name": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.1"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host2.name": {
|
||||
"owner": "default",
|
||||
"value": "192.168.0.2"
|
||||
},
|
||||
"services.nut.ip.nut_monitor_host2.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.activate": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
},
|
||||
"services.nut.manage": {
|
||||
"owner": "default",
|
||||
"value": true
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
[Service]
|
||||
IPAddressAllow=192.168.0.1
|
||||
IPAddressAllow=192.168.0.2
|
||||
IPAddressDeny=any
|
||||
28
tests/dictionaries/70services_ip_twice/tiramisu/base.py
Normal file
28
tests/dictionaries/70services_ip_twice/tiramisu/base.py
Normal file
@ -0,0 +1,28 @@
|
||||
from importlib.machinery import SourceFileLoader
|
||||
from importlib.util import spec_from_loader, module_from_spec
|
||||
loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
|
||||
spec = spec_from_loader(loader.name, loader)
|
||||
func = module_from_spec(spec)
|
||||
loader.exec_module(func)
|
||||
for key, value in dict(locals()).items():
|
||||
if key != ['SourceFileLoader', 'func']:
|
||||
setattr(func, key, value)
|
||||
try:
|
||||
from tiramisu3 import *
|
||||
except:
|
||||
from tiramisu import *
|
||||
option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
|
||||
option_3 = IPOption(name="nut_monitor_host2", doc="nut_monitor_host2", default="192.168.0.2", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
|
||||
option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
|
||||
option_8 = SymLinkOption(name="name", opt=option_2)
|
||||
option_9 = BoolOption(name="activate", doc="activate", default=True)
|
||||
option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
|
||||
option_11 = SymLinkOption(name="name", opt=option_3)
|
||||
option_12 = BoolOption(name="activate", doc="activate", default=True)
|
||||
option_10 = OptionDescription(name="nut_monitor_host2", doc="nut_monitor_host2", children=[option_11, option_12])
|
||||
option_6 = OptionDescription(name="ip", doc="ip", children=[option_7, option_10])
|
||||
option_13 = BoolOption(name="activate", doc="activate", default=True)
|
||||
option_14 = BoolOption(name="manage", doc="manage", default=True)
|
||||
option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_13, option_14])
|
||||
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
|
||||
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
|
||||
Loading…
Reference in New Issue
Block a user