From 8533b224c9f6f1f23eec8d660fe232dcb017b145 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Thu, 25 Aug 2016 16:59:19 +0200 Subject: [PATCH] Update to comply with pristine-1.5 branch This updates the configurator to comply with the configuration in the pristine-1.5 branch of the IRATI stack. There are also some minor changes to the distcloud scenario, as well as an enrollment script. --- src/Makefile.am | 1 + src/confgen.in | 3 ++- src/inputs/2nodes/vwall.ini | 4 +-- src/inputs/distcloud/backbone.dif | 19 ++++++++------ src/inputs/distcloud/cloud.dif | 19 ++++++++------ src/inputs/distcloud/enroll_cloud.sh | 37 ++++++++++++++++++++++++++++ src/inputs/distcloud/ipcps.xml | 4 +-- src/inputs/distcloud/vwall.ini | 6 ++--- 8 files changed, 69 insertions(+), 24 deletions(-) create mode 100755 src/inputs/distcloud/enroll_cloud.sh diff --git a/src/Makefile.am b/src/Makefile.am index 4e6e995..a0fe1f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,7 @@ edit = $(SED) \ -e 's|@pkgpythondir[@]|$(pkgpythondir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' confgen: confgen.in Makefile diff --git a/src/confgen.in b/src/confgen.in index 4db3f9d..c0dff76 100644 --- a/src/confgen.in +++ b/src/confgen.in @@ -235,7 +235,7 @@ def gen_ipcm_configs(): "installationPath" : "@prefix@/bin", "libraryPath" : "@libdir@", "logPath" : "@localstatedir@/log", - "consolePort" : 32766, + "consoleSocket" : "@localstatedir@/run/ipcm-console.sock", "pluginsPaths" : ["@libdir@/rinad/ipcp"] } @@ -321,6 +321,7 @@ def gen_ipcm_configs(): dif_confs.append(dif_dic) complete_file = { + "configFileVersion" : "1.4.1", "localConfiguration" : local_conf, "applicationToDIFMappings" : app_to_dif, "ipcProcessesToCreate" : ipcps, diff --git a/src/inputs/2nodes/vwall.ini b/src/inputs/2nodes/vwall.ini index 97bf4c8..d11174d 100644 --- a/src/inputs/2nodes/vwall.ini +++ b/src/inputs/2nodes/vwall.ini @@ -3,5 +3,5 @@ wall = wall1.ilabt.iminds.be username = sander password = proj_name = PRISTINE -exp_name = test001 -image = DEB77-64-STD \ No newline at end of file +exp_name = test003 +image = PRISTINE-DRCN2 \ No newline at end of file diff --git a/src/inputs/distcloud/backbone.dif b/src/inputs/distcloud/backbone.dif index 7a92e7a..e975fae 100644 --- a/src/inputs/distcloud/backbone.dif +++ b/src/inputs/distcloud/backbone.dif @@ -1,14 +1,17 @@ { "difType" : "normal-ipc", "dataTransferConstants" : { - "addressLength" : 2, - "cepIdLength" : 2, - "lengthLength" : 2, - "portIdLength" : 2, - "qosIdLength" : 2, - "sequenceNumberLength" : 4, - "maxPduSize" : 10000, - "maxPduLifetime" : 60000 + "addressLength" : 2, + "cepIdLength" : 2, + "lengthLength" : 2, + "portIdLength" : 2, + "qosIdLength" : 2, + "rateLength" : 4, + "frameLength" : 4, + "sequenceNumberLength" : 4, + "ctrlSequenceNumberLength" : 4, + "maxPduSize" : 10000, + "maxPduLifetime" : 60000 }, "qosCubes" : [ { "name" : "unreliablewithflowcontrol", diff --git a/src/inputs/distcloud/cloud.dif b/src/inputs/distcloud/cloud.dif index 7a92e7a..e975fae 100644 --- a/src/inputs/distcloud/cloud.dif +++ b/src/inputs/distcloud/cloud.dif @@ -1,14 +1,17 @@ { "difType" : "normal-ipc", "dataTransferConstants" : { - "addressLength" : 2, - "cepIdLength" : 2, - "lengthLength" : 2, - "portIdLength" : 2, - "qosIdLength" : 2, - "sequenceNumberLength" : 4, - "maxPduSize" : 10000, - "maxPduLifetime" : 60000 + "addressLength" : 2, + "cepIdLength" : 2, + "lengthLength" : 2, + "portIdLength" : 2, + "qosIdLength" : 2, + "rateLength" : 4, + "frameLength" : 4, + "sequenceNumberLength" : 4, + "ctrlSequenceNumberLength" : 4, + "maxPduSize" : 10000, + "maxPduLifetime" : 60000 }, "qosCubes" : [ { "name" : "unreliablewithflowcontrol", diff --git a/src/inputs/distcloud/enroll_cloud.sh b/src/inputs/distcloud/enroll_cloud.sh new file mode 100755 index 0000000..e21d1ae --- /dev/null +++ b/src/inputs/distcloud/enroll_cloud.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +PROJECT="distcloud.pristine.wall2.ilabt.iminds.be" + +enroll () { + CMD="enroll-to-dif $2 $3 $4 $5 1" + ssh $1.$PROJECT "echo $CMD | sudo socat - UNIX:/usr/local/irati/var/run/ipcm-console.sock" +} + +# r1n1 r1n2 r1n3 r1n4 r1b1 r2n1 r2n2 r2b1 r3n1 r3n2 r3n3 r3b1 br1 br2 br3 br4 + +#enroll name ipcp_id dif_name n_1_dif neighbor + +#backbone +enroll br4 4 backbone 16 br2 1 +enroll br2 4 backbone 17 br3 1 +enroll br3 4 backbone 18 br1 1 +enroll r3b1 3 backbone 15 br3 1 +enroll r1b1 4 backbone 13 br4 1 +enroll r2b1 4 backbone 14 br2 1 + +#cloud +enroll r3n2 3 cloud 9 r3n1 1 +enroll r3n2 3 cloud 10 r3n3 1 +enroll r3n3 3 cloud 11 r3n1 1 +enroll r3n1 4 cloud 12 r3b1.cloud 1 + +enroll r2b1 5 cloud 8 r2n2 1 +enroll r2b1 5 cloud 7 r2n1 1 +enroll r2b1 5 cloud backbone r3b1.cloud 1 + +enroll r1n1 3 cloud 2 r1n2 1 +enroll r1n1 3 cloud 3 r1n4 1 +enroll r1n4 3 cloud 4 r1n3 1 +enroll r1n2 3 cloud 6 r1b1.cloud 1 +enroll r1n3 3 cloud 5 r1b1.cloud 1 +enroll r1b1 5 cloud backbone r2b1.cloud 1 diff --git a/src/inputs/distcloud/ipcps.xml b/src/inputs/distcloud/ipcps.xml index f4c1e70..044cf95 100644 --- a/src/inputs/distcloud/ipcps.xml +++ b/src/inputs/distcloud/ipcps.xml @@ -49,13 +49,13 @@ - + - + diff --git a/src/inputs/distcloud/vwall.ini b/src/inputs/distcloud/vwall.ini index e85b7df..bd967a9 100644 --- a/src/inputs/distcloud/vwall.ini +++ b/src/inputs/distcloud/vwall.ini @@ -1,7 +1,7 @@ [vwall_config] -wall = wall1.ilabt.iminds.be +wall = wall2.ilabt.iminds.be username = sander password = proj_name = PRISTINE -exp_name = distcloud2 -image = PRISTINE-6 \ No newline at end of file +exp_name = distcloud +image = PRISTINE-1.5-4 \ No newline at end of file