From 97c32a1ef1a91d9c8251154a7b15eba2605d5018 Mon Sep 17 00:00:00 2001 From: SteveAtSentosa Date: Fri, 2 Oct 2015 15:46:08 -0600 Subject: add CoS Metrics and BW Profiles to UML model Change-Id: I826a30313427001eba1ba166c8ea5858cfde7e19 Signed-off-by: SteveAtSentosa --- model/MEF-Classes.png | Bin 268103 -> 444368 bytes model/README.md | 6 +- model/cl-mef-uml/model.notation | 1377 +++++++++++++++++++++++++++++---------- model/cl-mef-uml/model.uml | 585 +++++++++++++---- 4 files changed, 1483 insertions(+), 485 deletions(-) diff --git a/model/MEF-Classes.png b/model/MEF-Classes.png index 2e726c8..41779de 100644 Binary files a/model/MEF-Classes.png and b/model/MEF-Classes.png differ diff --git a/model/README.md b/model/README.md index 1e4596f..f0475b6 100644 --- a/model/README.md +++ b/model/README.md @@ -7,8 +7,8 @@ 4. After these components are installed, create a Papyrus perspective by clicking on the “+” sigh in the perspective bar near the upper right (there will already be a Java Perspective created”) - Select “Papyrus” and hit “OK” 5. Assuming that your eclipse working is ~/workspace: - - make a copy of the the folder “cl-mef-uml”, and (it contents) from the attached zip file in ~/workspace (so that you end up with a ~/workspace/cl-mef_uml” directory” + - make a copy of the the folder “cl-mef-uml”, and (it contents) in ~/workspace (so that you end up with a ~/workspace/cl-mef_uml” directory” 6. Activate the Papyrus perspective in eclipse, and goto the menu “File/New/Papyrus Project” - give the new project the name “cl-mef-uml” and the files that you placed into your workspace directory will automatically be imported into the new project. -7. In the “Model” pane on the left, expand the “>Model” tree to see all of the the model components - - To view the detailed UML class digram click on “Diagram Data Model - Foundational Components” and the UML diagrams will become visible in the main pane. +7. In the “Model Explorer” pane on the left, expand the “>Model” tree to see all of the the model components +8. To view the UML class digram click on “Show Diagrams” icon withing In the “Model Explorer” pane on the left, and select the "MEF Classes" diagram. diff --git a/model/cl-mef-uml/model.notation b/model/cl-mef-uml/model.notation index e79af4b..4f9e3cd 100644 --- a/model/cl-mef-uml/model.notation +++ b/model/cl-mef-uml/model.notation @@ -1,6 +1,26 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -20,6 +40,22 @@ + + + + + + + + + + + + + + + + @@ -46,7 +82,7 @@ - + @@ -69,7 +105,7 @@ - + @@ -92,72 +128,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -196,6 +169,10 @@ + + + + @@ -222,7 +199,7 @@ - + @@ -239,9 +216,9 @@ - + - + @@ -442,35 +419,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -538,7 +486,7 @@ - + @@ -646,7 +594,7 @@ - + @@ -665,9 +613,9 @@ - + - + @@ -688,7 +636,7 @@ - + @@ -711,9 +659,9 @@ - + - + @@ -734,9 +682,9 @@ - + - + @@ -757,9 +705,9 @@ - + - + @@ -780,7 +728,7 @@ - + @@ -808,49 +756,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -873,7 +782,7 @@ - + @@ -896,7 +805,7 @@ - + @@ -919,7 +828,7 @@ - + @@ -942,7 +851,7 @@ - + @@ -965,9 +874,9 @@ - + - + @@ -988,7 +897,698 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -996,31 +1596,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1028,8 +1603,8 @@ - - + + @@ -1038,8 +1613,8 @@ - - + + @@ -1049,7 +1624,7 @@ - + @@ -1063,8 +1638,8 @@ - - + + @@ -1088,8 +1663,8 @@ - - + + @@ -1116,56 +1691,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1193,8 +1718,8 @@ - - + + @@ -1218,8 +1743,8 @@ - - + + @@ -1242,9 +1767,9 @@ - - - + + + @@ -1268,8 +1793,7 @@ - - + @@ -1293,8 +1817,8 @@ - - + + @@ -1307,18 +1831,19 @@ - + - + - + + @@ -1327,8 +1852,8 @@ - - + + @@ -1337,8 +1862,8 @@ - - + + @@ -1347,83 +1872,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1472,6 +1922,8 @@ + + @@ -1495,6 +1947,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model/cl-mef-uml/model.uml b/model/cl-mef-uml/model.uml index 8477c40..e27e9c5 100644 --- a/model/cl-mef-uml/model.uml +++ b/model/cl-mef-uml/model.uml @@ -3,20 +3,124 @@ + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope + + Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope + + + + EVC Attributes +captured in this class + + EVC Attributes +captured in this class + + + + OVC Attributes +captured in this class + + OVC Attributes +captured in this class + + + UNI Attributes +captured in this class + + + OVC EP Per ENNI Attributes +captured in this class + + + EVC per UNI Attributes +captured in this class + + + OVC EP Per ENNI Attributes +captured in this class + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Maps ranges of CoS IDs (PCP or DSCP values) to a CoSName +(If dataSvcFrameCosId = EVC, only 1 entry in this map, and cosIDStart=cosIDEnd=-1) + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Note: "BW Profile" and "Envelope" are analagous terms in 6.2/10.3 + + + + Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair + + + Note: Was CoSMgr in phase 1. +Changing to SLSMgr upon addition of BWProfiles + + + ENNI Attributes +captured in this class + + + Needs to be fleshed out + - - + + + + + + + + + + + - + - + - + + + + + @@ -30,41 +134,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -92,17 +161,6 @@ - - - - - - - - - - - @@ -118,11 +176,11 @@ - + - + @@ -157,9 +215,13 @@ - - - + + + + + + + @@ -179,23 +241,24 @@ - + - - + + + + + + + + + - - - - - - - - - + + + @@ -226,10 +289,6 @@ - - - - @@ -238,9 +297,9 @@ - - - + + + @@ -251,7 +310,7 @@ - + @@ -292,7 +351,7 @@ - + @@ -311,10 +370,6 @@ - - - - @@ -343,40 +398,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -406,7 +438,7 @@ - + @@ -416,20 +448,6 @@ - - - - - - - - - - - - - - @@ -505,27 +523,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -548,6 +545,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg