ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-08 03:24:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 'directory_service' test failures

Browse Source 
New configuration schema.
This commit is contained in:
Andrew Bettison 2012-12-05 15:47:14 +10:30
parent 250fad71e8
commit b497c88d9d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
overlay_interface.c
View File

@ -167,11 +167,8 @@ overlay_interface * overlay_interface_find_name(const char *name){
for (i=0;i<OVERLAY_MAX_INTERFACES;i++){
if (overlay_interfaces[i].state!=INTERFACE_STATE_UP)
continue;
if (strcasecmp((*name=='>'?name+1:name),
(*overlay_interfaces[i].name=='>'?overlay_interfaces[i].name+1:overlay_interfaces[i].name)
)==0){
if (strcasecmp(name, overlay_interfaces[i].name) == 0)
return &overlay_interfaces[i];
}
}
return NULL;
}

25
tests/directory_service
View File

@ -79,7 +79,7 @@ test_publish() {
}
start_routing_instance() {
executeOk_servald config set interface.folder "$SERVALD_VAR"
executeOk_servald config set server.dummy_interface_dir "$SERVALD_VAR"
executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name"
executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name"
executeOk_servald config set log.show_pid on
@ -96,25 +96,26 @@ setup_routing() {
>$SERVALD_VAR/dummyB
>$SERVALD_VAR/dummyC
set_instance +A
executeOk_servald config set interfaces "+>dummyB,+>dummyC"
executeOk_servald config set mdp.dummyB.tick_ms 0
executeOk_servald config set mdp.dummyC.tick_ms 0
executeOk_servald config set interfaces.0.dummy dummyB
executeOk_servald config set interfaces.0.mdp_tick_ms 0
executeOk_servald config set interfaces.1.dummy dummyC
executeOk_servald config set interfaces.1.mdp_tick_ms 0
executeOk_servald config set dna.helper.executable "$servald_build_root/directory_service"
executeOk_servald config set debug.dnahelper on
start_routing_instance
set_instance +B
executeOk_servald config set interfaces "+>dummyB"
executeOk_servald config set mdp.dummyB.tick_ms 0
executeOk_servald config set interfaces.0.dummy dummyB
executeOk_servald config set interfaces.0.mdp_tick_ms 0
executeOk_servald config set directory.service $SIDA
executeOk_servald config set $SIDA.interface "dummyB"
executeOk_servald config set $SIDA.address 127.0.0.1
execute $servald config set hosts.$SIDA.address 127.0.0.1
executeOk_servald config set hosts.$SIDA.interface "dummyB"
start_routing_instance
set_instance +C
executeOk_servald config set interfaces "+>dummyC"
executeOk_servald config set mdp.dummyC.tick_ms 0
executeOk_servald config set interfaces.1.dummy dummyC
executeOk_servald config set interfaces.1.mdp_tick_ms 0
executeOk_servald config set directory.service $SIDA
executeOk_servald config set $SIDA.interface "dummyC"
executeOk_servald config set $SIDA.address 127.0.0.1
execute $servald config set hosts.$SIDA.address 127.0.0.1
executeOk_servald config set hosts.$SIDA.interface "dummyC"
start_routing_instance
}