Merge commits with refactoring of some MEC modules and a new simulati…

…on example

simulations/NR/mec/multiMecHost/omnetpp.ini

@@ -135,6 +135,12 @@ network = simu5g.simulations.NR.mec.multiMecHost.MultiMecHost
 # MEC Services
 # MEC host 1 services configurations
 *.mecHost1.mecPlatform.numMecServices = 0
+*.mecHost1.mecPlatform.mecService[0].typename = "LocationService"
+*.mecHost1.mecPlatform.mecService[0].localAddress = "mecHost1.virtualisationInfrastructure" 
+*.mecHost1.mecPlatform.mecService[0].localPort = 10020
+*.mecHost1.mecPlatform.serviceRegistry.localAddress = "mecHost1.virtualisationInfrastructure" 
+*.mecHost1.mecPlatform.serviceRegistry.localPort = 10021
+
 
 # MEC host 2 services configurations
 *.mecHost2.mecPlatform.numMecServices = 1
@@ -154,6 +160,8 @@ network = simu5g.simulations.NR.mec.multiMecHost.MultiMecHost
 
 # MEC Orchestrator configuration
 *.mecOrchestrator.mecHostList = "mecHost1, mecHost2"              # MEC hosts associated to the MEC system
+*.mecOrchestrator.selectionPolicy = "MecHostBased"
+*.mecOrchestrator.mecHostIndex = 1
 *.mecOrchestrator.mecApplicationPackageList = "WarningAlertApp"   # List of MEC app descriptors to be onboarded at 
 *.mecHost*.mecPlatformManager.mecOrchestrator = "mecOrchestrator" # the MECPM needs to know the MEC orchestrator
 

simulations/NR/mec/requestResponseApp/ApplicationDescriptors/ResponseApp.json

@@ -0,0 +1,21 @@
+{
+"appDid" : "RESPONSEMECAPP",
+"appName" : "MECResponseApp",
+"appProvider" : "simu5g.apps.mec.MecRequestResponseApp.MECResponseApp",
+"appInfoName" : "appInfoName_",
+"appDescription" : "appDescription_",
+"virtualComputeDescriptor" :{
+    "virtualDisk": 10,
+    "virtualCpu" : 500,
+    "virtualMemory":10
+    },
+"appServiceRequired": [
+    {
+        "ServiceDependency" :{
+            "serName" : "RNIService",
+            "version" : "v1",
+            "serCategory": "Network"
+        }
+    }
+]
+}

simulations/NR/mec/requestResponseApp/MultiMecHost_delay.ned

@@ -0,0 +1,113 @@
+// 
+//                  Simu5G
+//
+// Authors: Giovanni Nardini, Giovanni Stea, Antonio Virdis (University of Pisa)
+// 
+// This file is part of a software released under the license included in file
+// "license.pdf". Please read LICENSE and README files before using it.
+// The above files and the present reference are part of the software itself, 
+// and cannot be removed from it.
+// 
+package simu5g.simulations.NR.mec.requestResponseApp;
+
+import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
+import inet.networklayer.ipv4.RoutingTableRecorder;
+import inet.node.ethernet.Eth10G;
+import inet.node.inet.Router;
+import inet.node.inet.StandardHost;
+import simu5g.common.binder.Binder;
+import simu5g.common.carrierAggregation.CarrierAggregation;
+import simu5g.nodes.Upf;
+import simu5g.nodes.mec.MECHost;
+import simu5g.nodes.mec.MECOrchestrator.MecOrchestrator;
+import simu5g.nodes.mec.UALCMP.UALCMP;
+import simu5g.nodes.NR.gNodeB;
+import simu5g.nodes.NR.NRUe;
+import simu5g.nodes.backgroundCell.BackgroundCell;
+import simu5g.world.radio.LteChannelControl;
+
+// MultiMecHost
+//
+// This network includes two gNBs and two MEC hosts
+//
+network MultiMecHost_delay
+{
+    parameters:
+        int numUe = default(1);
+        int numBgCells = default(0);
+        double routersDelay @unit(m) = default(0m);
+//        volatile double routersDelay @unit(m) = default(normal(2m, 0.8m));
+
+        @display("i=block/network2;bgb=1088.032,678.896;");//bgi=background/pisa");
+    submodules:
+        channelControl: LteChannelControl {
+            @display("p=50,25;is=s");
+        }
+        routingRecorder: RoutingTableRecorder {
+            @display("p=50,75;is=s");
+        }
+        configurator: Ipv4NetworkConfigurator {
+            @display("p=50,125");
+        }
+        binder: Binder {
+            @display("p=50,175;is=s");
+        }
+        carrierAggregation: CarrierAggregation {
+            @display("p=50.993748,258.7;is=s");
+        }
+        upf: Upf {
+            @display("p=495,132.405");
+        }
+        iUpf1: Upf {
+            @display("p=400,247.06499");
+        }
+        iUpf2: Upf {
+            @display("p=590,247.06499");
+        }
+        gnb1: gNodeB {
+            @display("p=283.91998,421.785;is=vl");
+        }
+        gnb2: gNodeB {
+            @display("p=749.385,397.215;is=vl");
+        }
+        bgCell[numBgCells]: BackgroundCell {
+            @display("p=79.17,576.02997;is=vl");
+        }
+        ue[numUe]: NRUe {
+            @display("p=353.535,481.845");
+        }
+
+        //# MEC modules
+        mecHost1: MECHost {
+            @display("p=248.43,247.06499");
+        }
+        mecHost2: MECHost {
+            @display("p=748.01996,247.06499");
+        }
+        mecOrchestrator: MecOrchestrator {
+            @display("p=749.385,132.405");
+        }
+        ualcmp: UALCMP {
+            @display("p=603.33,131.04");
+        }
+
+    connections:
+
+        //# 5G Core Network connections
+        upf.pppg++ <--> Eth10G <--> iUpf1.pppg++;
+        upf.pppg++ <--> Eth10G <--> iUpf2.pppg++;
+        iUpf1.pppg++ <--> Eth10G <--> gnb1.ppp;
+        iUpf2.pppg++ <--> Eth10G <--> gnb2.ppp;
+        iUpf2.pppg++ <--> Eth10G {  length = parent.routersDelay*2e5; } <--> iUpf1.pppg++;
+
+
+        //# MEC-related connections
+        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
+        ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
+        mecHost1.ppp++ <--> Eth10G <--> iUpf1.pppg++;
+        mecHost2.ppp++ <--> Eth10G <--> iUpf2.pppg++;
+
+
+
+}

simulations/NR/mec/requestResponseApp/demo.xml

@@ -0,0 +1,14 @@
+<config>
+    <!-- Assign to the wlan interface of all eNodeBs and UEs one address of type 10.x.x.x, since dynamic-created UEs will be assigned one such address -->
+    <interface hosts="eNodeB*" names="wlan" address="10.x.x.x" netmask="255.0.0.0"/>
+    <interface hosts="car*" names="wlan" address="10.x.x.x" netmask="255.0.0.0"/>
+    <interface hosts="ue*" names="wlan" address="10.x.x.x" netmask="255.0.0.0"/>
+
+
+    <!-- Assign 192.168.x.x addresses to all other interfaces -->
+    <interface hosts="**" address="192.168.x.x" netmask="255.255.255.0"/>
+
+
+    <!-- all D2D-capable UEs participate in the multicast group --> 
+    <multicast-group hosts="car*" interfaces="wlan" address="224.0.0.10"/>
+</config>