Commit de9842b5 authored by Samir Medjiah's avatar Samir Medjiah
Browse files

Multiple changes : 

- Inclusion of 3 simulations scenarios as long as multiple application
and CSE descriptors.
- Enhancement of module features
- Fixing of bugs
parent a189c088

.cproject

+1 −0
Original line number Diff line number Diff line
@@ -102,4 +102,5 @@ 
	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>

	<storageModule moduleId="scannerConfiguration"/>

	<storageModule moduleId="refreshScope"/>

</cproject>
 
 No newline at end of file

simulations/TestNet.ned→simulations/TestUseCaseNetwork.ned

+6 −2
Original line number Diff line number Diff line
@@ -52,12 +52,16 @@ network TestNetwork 
        Cellular: NetworkElement {

            @display("p=190,205");

        }

        device: IoTNode {

        device[5]: IoTNode {

            @display("p=123,91");

        }

    connections:

        mnNode.toNetwork[0] <--> CellularLink <--> Cellular.link++;

        device.toNetwork[0] <--> CellularLink <--> Cellular.link++;

        

        for i = 0..4 {

        	device[i].toNetwork[0] <--> CellularLink <--> Cellular.link++;

        }

        



        inNode.toNetwork[0] <--> FiberLink <--> FiberNet.link++;

        Cellular.internetLink <--> FiberLink <--> INTERNET.link++;

simulations/omnetpp_test.ini→simulations/TestUseCase_omnetpp.ini

+14 −11
Original line number Diff line number Diff line
@@ -6,34 +6,37 @@ 


network = onem2msimulator.simulations.TestNetwork



TestNetwork.device.appCount = 1

TestNetwork.device.application[0].name = "app1" 

TestNetwork.device.application[0].sensorCount = 1

TestNetwork.device.application[0].sensor[0].name = "intersectionState"

TestNetwork.device.application[0].actuatorCount = 1

TestNetwork.device.application[0].actuator[0].name = "threeLights"

TestNetwork.device[*].appCount = 1

TestNetwork.device[0..4].application[0].name = "app_" + string(index) 

TestNetwork.device[*].application[0].sensorCount = 1

TestNetwork.device[*].application[0].sensor[0].name = "intersectionState__" + string(index)

TestNetwork.device[*].application[0].actuatorCount = 1

TestNetwork.device[*].application[0].actuator[0].name = "threeLights__" + string(index)



TestNetwork.device[*].application[0].sensor[0].baseURL = "in-cse"

TestNetwork.device[*].application[0].remoteCSE = "mn-cse"



TestNetwork.mnNode.name = "mn-cse"

TestNetwork.inNode.name = "in-cse"



TestNetwork.inNode.nic[0].name = "eth0"

TestNetwork.mnNode.nic[0].name = "wlan0"

TestNetwork.device.nic[0].name = "wlan0"

TestNetwork.device[*].nic[0].name = "wlan0"



TestNetwork.FiberNet.subnetAddress = "10.0.1.0/24"

TestNetwork.inNode.nic[0].networkAddress = "10.0.1.11"



TestNetwork.Cellular.subnetAddress = "10.0.2.0/24"

TestNetwork.mnNode.nic[0].networkAddress = "10.0.2.10"

TestNetwork.device.nic[0].networkAddress = "10.0.2.11"

TestNetwork.device[*].nic[0].networkAddress = "10.0.2.11"





TestNetwork.device.application[0].remoteCSE = "mn-cse"

TestNetwork.mnNode.cse.remoteCSE = "in-cse"



TestNetwork.device.application[0].remoteCSEAddress = "10.0.2.10"

TestNetwork.device[*].application[0].remoteCSEAddress = "10.0.2.10"

TestNetwork.mnNode.cse.remoteCSEAddress = "10.0.1.11"



TestNetwork.device.application[0].sensor[0].cinGenerator = "data://{ \"type\": \"SimulatedEvent\",  \"eventDistribution\": {    \"type\": \"Exponential\",    \"lambda\": 0.1  },  \"dataSizeDistribution\": {    \"type\": \"Constant\",    \"constant\": 100  }}"  

TestNetwork.device[*].application[0].sensor[0].cinGenerator = "data://{ \"type\": \"SimulatedEvent\",  \"eventDistribution\": {    \"type\": \"Exponential\",    \"lambda\": 0.1  },  \"dataSizeDistribution\": {    \"type\": \"Constant\",    \"constant\": 100  }}"  



TestNetwork.mnNode.cse.performanceDescriptor = "data://{\"PerformanceDescriptor\":{\"name\": \"m2m-sample-stack\",\"product\": \"Sample oneM2M Stack\",\"version\": \"v1.0\",\"minProcessorUsage\": 5000,\"minMemoryUsage\": 200000.0,\"resourcePerformances\": {\"AE\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"CNT\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"CIN\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"LATEST\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"ACP\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"SUB\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}}}}}"

TestNetwork.mnNode.cse.localDB.performanceDescriptor = "data://{\"PerformanceDescriptor\":{\"name\": \"m2m-sample-stack\",\"product\": \"Sample oneM2M Stack\",\"version\": \"v1.0\",\"minProcessorUsage\": 5000,\"minMemoryUsage\": 200000.0,\"resourcePerformances\": {\"AE\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"CNT\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"CIN\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"LATEST\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"ACP\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}},\"SUB\": {\"processorUsage\": {\"createOperation\": 766,\"retreiveOperation\": 250,\"updateOperation\": 845,\"deleteOperation\": 124},\"memoryUsage\": {\"createOperation\": 26214,\"retreiveOperation\": 3540,\"updateOperation\": 18654,\"deleteOperation\": 21536},\"diskUsage\":{\"createOperation\": 580,\"retreiveOperation\": 150,\"updateOperation\": 680,\"deleteOperation\": 50}}}}}"