services: removed no longer relevant service arouted and associated logic, fixed nrlsmf to put the flood command before configured interfaces
This commit is contained in:
parent
0a0248d8b2
commit
fe0bc2b405
4 changed files with 2 additions and 98 deletions
|
@ -118,12 +118,6 @@ class NrlSmf(NrlService):
|
|||
ifaces = node.get_ifaces(control=False)
|
||||
if len(ifaces) == 0:
|
||||
return ""
|
||||
|
||||
if "arouted" in servicenames:
|
||||
comments += "# arouted service is enabled\n"
|
||||
cmd += " tap %s_tap" % (node.name,)
|
||||
cmd += " unicast %s" % cls.firstipv4prefix(node, 24)
|
||||
cmd += " push lo,%s resequence on" % ifaces[0].name
|
||||
if len(ifaces) > 0:
|
||||
if "NHDP" in servicenames:
|
||||
comments += "# NHDP service is enabled\n"
|
||||
|
@ -586,46 +580,3 @@ class MgenActor(NrlService):
|
|||
return ""
|
||||
cfg += comments + cmd + " < /dev/null > /dev/null 2>&1 &\n\n"
|
||||
return cfg
|
||||
|
||||
|
||||
class Arouted(NrlService):
|
||||
"""
|
||||
Adaptive Routing
|
||||
"""
|
||||
|
||||
name: str = "arouted"
|
||||
executables: Tuple[str, ...] = ("arouted",)
|
||||
configs: Tuple[str, ...] = ("startarouted.sh",)
|
||||
startup: Tuple[str, ...] = ("bash startarouted.sh",)
|
||||
shutdown: Tuple[str, ...] = ("pkill arouted",)
|
||||
validate: Tuple[str, ...] = ("pidof arouted",)
|
||||
|
||||
@classmethod
|
||||
def generate_config(cls, node: CoreNode, filename: str) -> str:
|
||||
"""
|
||||
Return the Quagga.conf or quaggaboot.sh file contents.
|
||||
"""
|
||||
cfg = (
|
||||
"""
|
||||
#!/bin/sh
|
||||
for f in "/tmp/%s_smf"; do
|
||||
count=1
|
||||
until [ -e "$f" ]; do
|
||||
if [ $count -eq 10 ]; then
|
||||
echo "ERROR: nrlmsf pipe not found: $f" >&2
|
||||
exit 1
|
||||
fi
|
||||
sleep 0.1
|
||||
count=$(($count + 1))
|
||||
done
|
||||
done
|
||||
|
||||
"""
|
||||
% node.name
|
||||
)
|
||||
cfg += "ip route add %s dev lo\n" % cls.firstipv4prefix(node, 24)
|
||||
cfg += "arouted instance %s_smf tap %s_tap" % (node.name, node.name)
|
||||
# seconds to consider a new route valid
|
||||
cfg += " stability 10"
|
||||
cfg += " 2>&1 > /var/log/arouted.log &\n\n"
|
||||
return cfg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue