migrate entity type to adaptable entity interface

tools.descartes.dni.adaptation/model/DNIMM3AP.xcore

@@ -46,59 +46,49 @@ class NetworkInterfacePerformanceRepository {
 	contains NetworkInterfacePerformance[] networkInterfacePerformance
 }
 
-interface IAdaptableEntity {
+interface IAdaptableEntity<E> {
+	refers E entityType
 }
 
-class Node extends IAdaptableEntity {
+class Node extends IAdaptableEntity<tools.descartes.dni.dnimm3.NodeType> {
 	refers EndPerformance[] endPerformance
 	refers IntermediatePerformance[] intermediatePerformance
 	refers SdnNodePerformance[] sdnNodePerformance
 	refers NetworkInterface[] networkInterface
-	refers tools.descartes.dni.dnimm3.NodeType entityType
 }
 
-class Link extends IAdaptableEntity {
+class Link extends IAdaptableEntity<tools.descartes.dni.dnimm3.LinkType> {
 	refers LinkPerformance[] linkPerformance
 	refers NetworkInterface[] networkInterface
-	refers tools.descartes.dni.dnimm3.LinkType entityType
 }
 
-class LinkPerformance extends IAdaptableEntity {
+class LinkPerformance extends IAdaptableEntity<tools.descartes.dni.dnimm3.LinkPerformanceType> {
 	contains AlternativeVariable propagationDelay
 	contains AlternativeVariable maximalSupportedBandwidth
-	refers tools.descartes.dni.dnimm3.LinkPerformanceType entityType
 }
 
-class EndPerformance extends IAdaptableEntity {
+class EndPerformance extends IAdaptableEntity<tools.descartes.dni.dnimm3.EndPerformanceType> {
 	contains AlternativeVariable softwareLayersDelay
-	refers tools.descartes.dni.dnimm3.EndPerformanceType entityType
 }
 
-class IntermediatePerformance extends IAdaptableEntity {
+class IntermediatePerformance extends IAdaptableEntity<tools.descartes.dni.dnimm3.IntermediatePerformanceType> {
 	contains AlternativeVariable forwardingLatency
 	contains AlternativeVariable switchingCapacityPPS
 	contains AlternativeVariable forwardingBandwidthBPS
-	refers tools.descartes.dni.dnimm3.IntermediatePerformanceType entityType
 }
 
-class SdnNodePerformance extends IAdaptableEntity {
+class SdnNodePerformance extends IAdaptableEntity<tools.descartes.dni.dnimm3.SdnNodePerformanceType> {
 	refers IntermediatePerformance[] softwareSwitchingPerformance
 	refers IntermediatePerformance[] hardwareSwitchingPerformance
-	refers tools.descartes.dni.dnimm3.SdnNodePerformanceType entityType
 }
 
-class NetworkInterface extends IAdaptableEntity {
+class NetworkInterface extends IAdaptableEntity<tools.descartes.dni.dnimm3.NetworkInterfaceType> {
 	refers NetworkInterfacePerformance[] networkInterfacePerformance
-	refers tools.descartes.dni.dnimm3.NetworkInterfaceType entityType
 }
 
-class NetworkInterfacePerformance extends IAdaptableEntity {
+class NetworkInterfacePerformance extends IAdaptableEntity<tools.descartes.dni.dnimm3.NetworkInterfacePerformanceType> {
 	contains AlternativeVariable packetProcessingTime
 	contains AlternativeVariable interfaceThroughput
-	refers tools.descartes.dni.dnimm3.NetworkInterfacePerformanceType entityType
-}
-
-class ProtocolStack extends IAdaptableEntity {
 }
 
 interface AlternativeParameterSet<P> {

tools.descartes.dni.adaptation/plugin.properties

@@ -287,3 +287,4 @@ _UI_NetworkInterfacePerformanceRepository_networkInterfacePerformance_feature =
 _UI_SdnNodePerformance_softwareSwitchingPerformance_feature = Software Switching Performance
 _UI_SdnNodePerformance_intermediatePerformance_feature = Intermediate Performance
 _UI_SdnNodePerformance_hardwareSwitchingPerformance_feature = Hardware Switching Performance
+_UI_IAdaptableEntity_entityType_feature = Entity Type