From 3d7a2f31be3f8224287165b1f292ca9039fe89b7 Mon Sep 17 00:00:00 2001 From: Stefan Herrnleben <s.herrnleben@syslex.de> Date: Tue, 8 Aug 2017 23:08:51 +0200 Subject: [PATCH] fix mutal exclusion of packet processing time and interface throughput in network interface performance --- tools.descartes.dni.core/model/DNIMM3.xcore | 4 ++-- .../descartes/dni/dnimm3/PerformanceNetworkInterface.java | 4 ++-- .../src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools.descartes.dni.core/model/DNIMM3.xcore b/tools.descartes.dni.core/model/DNIMM3.xcore index 81dcf00d..2115b581 100644 --- a/tools.descartes.dni.core/model/DNIMM3.xcore +++ b/tools.descartes.dni.core/model/DNIMM3.xcore @@ -284,8 +284,8 @@ class PerformanceLink extends PerformanceSpecification { class PerformanceNetworkInterface extends PerformanceSpecification { boolean isUp = "true" int[1] MTU = "1500" - contains Dependency[1] packetProcessingTime - contains Variable[1] interfaceThroughput + contains Dependency packetProcessingTime + contains Variable interfaceThroughput refers NetworkInterfacePerformanceType entityType opposite entities } diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java index 0c7b58d3..c22a0356 100644 --- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java +++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java @@ -89,7 +89,7 @@ public interface PerformanceNetworkInterface extends PerformanceSpecification { * @return the value of the '<em>Packet Processing Time</em>' containment reference. * @see #setPacketProcessingTime(Dependency) * @see tools.descartes.dni.dnimm3.DNIPackage#getPerformanceNetworkInterface_PacketProcessingTime() - * @model containment="true" required="true" + * @model containment="true" * @generated */ Dependency getPacketProcessingTime(); @@ -115,7 +115,7 @@ public interface PerformanceNetworkInterface extends PerformanceSpecification { * @return the value of the '<em>Interface Throughput</em>' containment reference. * @see #setInterfaceThroughput(Variable) * @see tools.descartes.dni.dnimm3.DNIPackage#getPerformanceNetworkInterface_InterfaceThroughput() - * @model containment="true" required="true" + * @model containment="true" * @generated */ Variable getInterfaceThroughput(); diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java index 9fe7ab2c..1932d41e 100644 --- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java +++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java @@ -3265,8 +3265,8 @@ public class DNIPackageImpl extends EPackageImpl implements DNIPackage { initEClass(performanceNetworkInterfaceEClass, PerformanceNetworkInterface.class, "PerformanceNetworkInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPerformanceNetworkInterface_IsUp(), theEcorePackage.getEBoolean(), "isUp", "true", 0, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getPerformanceNetworkInterface_MTU(), theEcorePackage.getEInt(), "MTU", "1500", 1, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPerformanceNetworkInterface_PacketProcessingTime(), this.getDependency(), null, "packetProcessingTime", null, 1, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPerformanceNetworkInterface_InterfaceThroughput(), this.getVariable(), null, "interfaceThroughput", null, 1, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPerformanceNetworkInterface_PacketProcessingTime(), this.getDependency(), null, "packetProcessingTime", null, 0, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPerformanceNetworkInterface_InterfaceThroughput(), this.getVariable(), null, "interfaceThroughput", null, 0, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getPerformanceNetworkInterface_EntityType(), this.getNetworkInterfacePerformanceType(), this.getNetworkInterfacePerformanceType_Entities(), "entityType", null, 0, 1, PerformanceNetworkInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(sdnFlowRuleEClass, SdnFlowRule.class, "SdnFlowRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); -- GitLab