diff options
| author |   Hui Deng <denghui12@huawei.com> | 2018-09-19 02:37:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 02:37:59 +0000 |
| commit | 85454c3c4099b980cbc1e89eb3b2153192ac74f1 (patch) | |
| tree | 5eac5056ab4c7a57025fcdfe8765b891c3b9f248 /papyrus/ONAP Information Model | |
| parent | 1bc9858c35527c634da32f2af4fc523e22072bd3 (diff) | |
| parent | 2042ed80a33edc3ffc22419275d5717d12fa8fe5 (diff) | |
Merge "Updates to Vnf and Common Models" into R3workingbranch
Diffstat (limited to 'papyrus/ONAP Information Model')
| -rw-r--r-- | papyrus/ONAP Information Model/Common.notation | 19 | ||||
| -rw-r--r-- | papyrus/ONAP Information Model/Common.uml | 224 | ||||
| -rw-r--r-- | papyrus/ONAP Information Model/Vnf.notation | 153 | ||||
| -rw-r--r-- | papyrus/ONAP Information Model/Vnf.uml | 23 |
4 files changed, 319 insertions, 100 deletions
diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation index a9d74ce..780bd90 100644 --- a/papyrus/ONAP Information Model/Common.notation +++ b/papyrus/ONAP Information Model/Common.notation @@ -2687,7 +2687,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X21skonbEeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Common.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="40" y="360"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" y="280"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_X27MIInbEeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_X27MIYnbEeiOe-BKGdv_Yg"/>
@@ -3153,7 +3153,7 @@ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_Y2HKsIn7EeiOe-BKGdv_Yg" type="PapyrusUMLClassDiagram" name="Event Domain Types" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_wQ6BMIn7EeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="32768">
+ <children xmi:type="notation:Shape" xmi:id="_wQ6BMIn7EeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="12615680">
<children xmi:type="notation:DecorationNode" xmi:id="_wQ6oQYn7EeiOe-BKGdv_Yg" type="DataType_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_wQ6oQon7EeiOe-BKGdv_Yg" type="DataType_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_wQ6oQ4n7EeiOe-BKGdv_Yg" y="15"/>
@@ -4015,9 +4015,9 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lKKfOZGvEeiUeLUnFxb3Bg"/>
</children>
<element xmi:type="uml:DataType" href="Common.uml#_0fwW0H7wEeifJIHxnlj6Cg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lKJ4IZGvEeiUeLUnFxb3Bg" x="860" y="600"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lKJ4IZGvEeiUeLUnFxb3Bg" x="800" y="600"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_l34g0JGvEeiUeLUnFxb3Bg" type="DataType_Shape">
+ <children xmi:type="notation:Shape" xmi:id="_l34g0JGvEeiUeLUnFxb3Bg" type="DataType_Shape" fillColor="32768">
<children xmi:type="notation:DecorationNode" xmi:id="_l34g0pGvEeiUeLUnFxb3Bg" type="DataType_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_l34g05GvEeiUeLUnFxb3Bg" type="DataType_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_l34g1JGvEeiUeLUnFxb3Bg" y="15"/>
@@ -4264,7 +4264,7 @@ <element xmi:type="uml:DataType" href="Common.uml#_2Hi0AH7wEeifJIHxnlj6Cg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_nJyNkZGvEeiUeLUnFxb3Bg" x="300" y="940"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_oRYu0JGvEeiUeLUnFxb3Bg" type="DataType_Shape">
+ <children xmi:type="notation:Shape" xmi:id="_oRYu0JGvEeiUeLUnFxb3Bg" type="DataType_Shape" fillColor="32768">
<children xmi:type="notation:DecorationNode" xmi:id="_oRZV4JGvEeiUeLUnFxb3Bg" type="DataType_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_oRZV4ZGvEeiUeLUnFxb3Bg" type="DataType_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_oRZV4pGvEeiUeLUnFxb3Bg" y="15"/>
@@ -4329,7 +4329,7 @@ <element xmi:type="uml:DataType" href="Common.uml#_2XJ9UH7wEeifJIHxnlj6Cg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oRYu0ZGvEeiUeLUnFxb3Bg" x="620" y="940"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_pRsVQJGvEeiUeLUnFxb3Bg" type="DataType_Shape">
+ <children xmi:type="notation:Shape" xmi:id="_pRsVQJGvEeiUeLUnFxb3Bg" type="DataType_Shape" fillColor="32768">
<children xmi:type="notation:DecorationNode" xmi:id="_pRsVQpGvEeiUeLUnFxb3Bg" type="DataType_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_pRsVQ5GvEeiUeLUnFxb3Bg" type="DataType_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_pRsVRJGvEeiUeLUnFxb3Bg" y="15"/>
@@ -4680,7 +4680,12 @@ <children xmi:type="notation:Shape" xmi:id="_L3br0JzVEeiLvPKMh61-Bg" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_L3cS4JzVEeiLvPKMh61-Bg" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Common.uml#_L3adsJzVEeiLvPKMh61-Bg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3br0ZzVEeiLvPKMh61-Bg" x="840" y="1120"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3br0ZzVEeiLvPKMh61-Bg" x="540" y="1220"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_41vKwLtYEeiq-o0aE00M6w" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_4114cLtYEeiq-o0aE00M6w" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Common.uml#_41HfsLtYEeiq-o0aE00M6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41vKwbtYEeiq-o0aE00M6w" x="980" y="60"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_Y2HKsYn7EeiOe-BKGdv_Yg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_Y2HKson7EeiOe-BKGdv_Yg"/>
diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml index 3b07618..c4b1134 100644 --- a/papyrus/ONAP Information Model/Common.uml +++ b/papyrus/ONAP Information Model/Common.uml @@ -6,6 +6,9 @@ <ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sT2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sD2pEeiu6I5JfRTxxQ">
<body>Common part of the various VLDs.</body>
</ownedComment>
+ <generalization xmi:type="uml:Generalization" xmi:id="_tmOdULeSEeiq7vtzCAMDQQ">
+ <general xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+ </generalization>
<ownedAttribute xmi:type="uml:Property" xmi:id="_Tw79sj2pEeiu6I5JfRTxxQ" name="virtualLinkDescId" type="_AuYtcDkBEeiWMf5FLWfdLA">
<ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sz2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sj2pEeiu6I5JfRTxxQ">
<body>Uniquely identifies a VLD in the parent descriptor.
@@ -367,6 +370,12 @@ Editor's note: the attribute "layerProtocol" still needs further discu <ownedComment xmi:type="uml:Comment" xmi:id="_BTKPcLCXEeix4eA61SHRMQ">
<body>Why not boolean in spec?</body>
</ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_41HfsLtYEeiq-o0aE00M6w">
+ <body>Legend
+Blue - Review Complete
+Green - Ready for Review
+White - Not Ready for Review</body>
+ </ownedComment>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_Uu_4IDOHEei5Af8DcjrhIQ" name="Interfaces"/>
<packagedElement xmi:type="uml:Package" xmi:id="_W8GB0DOHEei5Af8DcjrhIQ" name="TypeDefinitions">
@@ -958,9 +967,11 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__LaKwH78EeifJIHxnlj6Cg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__LgRYH78EeifJIHxnlj6Cg" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_iviyoH7yEeifJIHxnlj6Cg" name="heartbeat" type="_r_TYsH7wEeifJIHxnlj6Cg">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_iviyoH7yEeifJIHxnlj6Cg" name="heartbeat" type="_suey4H7wEeifJIHxnlj6Cg">
<ownedComment xmi:type="uml:Comment" xmi:id="_76Xl4H7-EeifJIHxnlj6Cg" annotatedElement="_iviyoH7yEeifJIHxnlj6Cg">
- <body>Fields specific to fault events.</body>
+ <body>Fields specific to heartbeat events.
+
+Note: For heardbeat events, an event body is not required.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DOeXkH79EeifJIHxnlj6Cg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DOj3IH79EeifJIHxnlj6Cg" value="1"/>
@@ -1786,40 +1797,110 @@ For example: "inService", "outOfService", "maintenance& </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_1spnwH7wEeifJIHxnlj6Cg" name="PnfRegistration">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_wTZ74Jc-Eeis0eUbsDSw0w" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ"/>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_cZs5QLbJEeiWgvNHCpdNlg" annotatedElement="_1spnwH7wEeifJIHxnlj6Cg">
+ <body>The pnfRegistrationFields datatype defines fields for events belonging to the 'pnfRegistration' domain of the commonEventHeader domain enumeration; it consists of the following fields:</body>
+ </ownedComment>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_wTZ74Jc-Eeis0eUbsDSw0w" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_iLbK0LbKEeiWgvNHCpdNlg" annotatedElement="_wTZ74Jc-Eeis0eUbsDSw0w">
+ <body>Additional pnfRegistration fields if needed</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lfW2MLbJEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lfdj4LbJEeiWgvNHCpdNlg" value="1"/>
+ </ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_w5-MoJc-Eeis0eUbsDSw0w" name="lastServiceDate">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_lDaEkLbKEeiWgvNHCpdNlg" annotatedElement="_w5-MoJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 dateOfLastService = date of last service; e.g. 15022017</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dlHuELbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dlObwLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_xjg44Jc-Eeis0eUbsDSw0w" name="macAddress">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_n3sxILbKEeiWgvNHCpdNlg" annotatedElement="_xjg44Jc-Eeis0eUbsDSw0w">
+ <body>MAC address of OAM interface of the unit</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dlUiYLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dlapALbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_yI76IJc-Eeis0eUbsDSw0w" name="manufactureDate">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_qKtVkLbKEeiWgvNHCpdNlg" annotatedElement="_yI76IJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dlgIkLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dlm2QLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_1YuP4Jc-Eeis0eUbsDSw0w" name="modelNumber">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_uVLK4LbKEeiWgvNHCpdNlg" annotatedElement="_1YuP4Jc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02. Maps to AAI equip-model</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dls84LbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dlzDgLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_19gX8Jc-Eeis0eUbsDSw0w" name="oamV4lpAddress">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_wOn_0LbKEeiWgvNHCpdNlg" annotatedElement="_19gX8Jc-Eeis0eUbsDSw0w">
+ <body>IPv4 m-plane IP address to be used by the manager to contact the PNF</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dl5KILbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dl_QwLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_2ocLUJc-Eeis0eUbsDSw0w" name="oamV6lpAddress">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yV084LbKEeiWgvNHCpdNlg" annotatedElement="_2ocLUJc-Eeis0eUbsDSw0w">
+ <body>IPv6 m-plane IP address to be used by the manager to contact the PNF</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dmFXYLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dmLeALbKEeiWgvNHCpdNlg" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3mxb0Jc-Eeis0eUbsDSw0w" name="pnfRegistrationFieldsVersion" type="_p3EKoDm0EeiWMf5FLWfdLA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_0hlCwLbKEeiWgvNHCpdNlg" annotatedElement="_3mxb0Jc-Eeis0eUbsDSw0w">
+ <body>Version of the registrationFields block as “#.#” where # is a digit; see section 1 for the correct digits to use.</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dmRkoLbKEeiWgvNHCpdNlg" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dmYSULbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_3mxb0Jc-Eeis0eUbsDSw0w" name="pnfRegistrationFieldsVersion" type="_p3EKoDm0EeiWMf5FLWfdLA"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_4D4OkJc-Eeis0eUbsDSw0w" name="serialNumber">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_5A674LbKEeiWgvNHCpdNlg" annotatedElement="_4D4OkJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dmdx4LbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dmjRcLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_4lixMJc-Eeis0eUbsDSw0w" name="softwareVersion">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_6x0RwLbKEeiWgvNHCpdNlg" annotatedElement="_4lixMJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dmp_ILbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dmxT4LbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_5BEPkJc-Eeis0eUbsDSw0w" name="unitFamily">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_8fQrALbKEeiWgvNHCpdNlg" annotatedElement="_5BEPkJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dm3agLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dnBLgLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_7YTzwJc-Eeis0eUbsDSw0w" name="unitType">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_-JcU4LbKEeiWgvNHCpdNlg" annotatedElement="_7YTzwJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dnH5MLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dnOm4LbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_7_o5gJc-Eeis0eUbsDSw0w" name="vendorName">
+ <ownedComment xmi:type="uml:Comment" xmi:id="__x12ELbKEeiWgvNHCpdNlg" annotatedElement="_7_o5gJc-Eeis0eUbsDSw0w">
+ <body>TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dnXJwLbKEeiWgvNHCpdNlg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dndQYLbKEeiWgvNHCpdNlg" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_NcX08IEsEeieQ4zKGFzYtQ" name="EventSeverity">
@@ -1839,7 +1920,7 @@ For example: "inService", "outOfService", "maintenance& </ownedComment>
<ownedAttribute xmi:type="uml:Property" xmi:id="_VL2WIJpnEeidy9iGT_F5-w" name="additionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_Kuns0JpoEeidy9iGT_F5-w" annotatedElement="_VL2WIJpnEeidy9iGT_F5-w">
- <body>additionalInformation - Additional sipSignalling fields.
+ <body>zdditionalInformation - Additional sipSignalling fields.
</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SkSokJpoEeidy9iGT_F5-w"/>
@@ -1920,7 +2001,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad </packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_2XJ9UH7wEeifJIHxnlj6Cg" name="StateChangeFields">
<ownedComment xmi:type="uml:Comment" xmi:id="_JcpEYJzVEeiLvPKMh61-Bg" annotatedElement="_2XJ9UH7wEeifJIHxnlj6Cg">
- <body>stateChangeFields - Fields specific to state change events.</body>
+ <body>Fields specific to state change events.</body>
</ownedComment>
<ownedAttribute xmi:type="uml:Property" xmi:id="_JYYzUJzREeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_FjUJwJzSEeiLvPKMh61-Bg" annotatedElement="_JYYzUJzREeiLvPKMh61-Bg">
@@ -1954,50 +2035,173 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad </packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_7F_D8H7wEeifJIHxnlj6Cg" name="SyslogFields">
<ownedComment xmi:type="uml:Comment" xmi:id="_GBKcAJzVEeiLvPKMh61-Bg" annotatedElement="_7F_D8H7wEeifJIHxnlj6Cg">
- <body>syslogFields - Fields specific to syslog events.</body>
+ <body>The syslogFields datatype consists of the following fields:</body>
</ownedComment>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_fX1bQJzTEeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_fX1bQJzTEeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_tMbUkLt0Eeiq-o0aE00M6w" annotatedElement="_fX1bQJzTEeiLvPKMh61-Bg">
+ <body>Additional syslog fields if needed Ex: {“name1”: ”value1”, “name2: “value2” … }</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vK-BsLtwEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vLKO8LtwEeiq-o0aE00M6w" value="*"/>
+ </ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_f54_cJzTEeiLvPKMh61-Bg" name="eventSourceHost">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_uuwC8Lt0Eeiq-o0aE00M6w" annotatedElement="_f54_cJzTEeiLvPKMh61-Bg">
+ <body>Hostname of the device</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_gaDGMJzTEeiLvPKMh61-Bg" name="eventSourceType">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_xFMV4Lt0Eeiq-o0aE00M6w" annotatedElement="_gaDGMJzTEeiLvPKMh61-Bg">
+ <body>Examples: ‘other’, ‘router’, ‘switch’, ‘host’, ‘card’, ‘port’, ‘slotThreshold’, ‘portThreshold’, ‘virtualMachine’, ‘virtualNetworkFunction’</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jdPScLt0Eeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jdS80Lt0Eeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_hwG6MJzTEeiLvPKMh61-Bg" name="syslogFacilty">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_zk6goLt0Eeiq-o0aE00M6w" annotatedElement="_hwG6MJzTEeiLvPKMh61-Bg">
+ <body>Numeric code from 0 to 23 for facility: 
+ 0 kernel messages
+ 1 user-level messages
+ 2 mail system
+ 3 system daemons
+ 4 security/authorization messages
+ 5 messages generated internally by syslogd
+ 6 line printer subsystem
+ 7 network news subsystem
+ 8 UUCP subsystem
+ 9 clock daemon
+ 10 security/authorization messages
+ 11 FTP daemon
+ 12 NTP subsystem
+ 13 log audit
+ 14 log alert
+ 15 clock daemon (note 2)
+ 16 local use 0 (local0)
+ 17 local use 1 (local1)
+ 18 local use 2 (local2)
+ 19 local use 3 (local3)
+ 20 local use 4 (local4)
+ 21 local use 5 (local5)
+ 22 local use 6 (local6)
+ 23 local use 7 (local7 )
+</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SH3yALuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SH7cYLuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_iWVzwJzTEeiLvPKMh61-Bg" name="syslogFieldVersion">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_jID8kLuIEeiq-o0aE00M6w" annotatedElement="_iWVzwJzTEeiLvPKMh61-Bg">
+ <body>Version of the syslogFields block as “#.#” where # is a digit; see section 1 for the correct digits to use.</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_jV7BcJzTEeiLvPKMh61-Bg" name="syslogMsg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_lBwpILuIEeiq-o0aE00M6w" annotatedElement="_jV7BcJzTEeiLvPKMh61-Bg">
+ <body>Syslog message</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_kgWNMJzTEeiLvPKMh61-Bg" name="syslogMsgHost">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_mzfFcLuIEeiq-o0aE00M6w" annotatedElement="_kgWNMJzTEeiLvPKMh61-Bg">
+ <body>Hostname parsed from non-VES syslog message</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YptuYLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YpzN8LuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_lKBcUJzTEeiLvPKMh61-Bg" name="syslogPri">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_o80JcLuIEeiq-o0aE00M6w" annotatedElement="_lKBcUJzTEeiLvPKMh61-Bg">
+ <body>0-192
+Combined Severity and Facility (see rfc5424)
+</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yp4GcLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yp-0ILuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_lxdPwJzTEeiLvPKMh61-Bg" name="syslogProc">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_qm9XELuIEeiq-o0aE00M6w" annotatedElement="_lxdPwJzTEeiLvPKMh61-Bg">
+ <body>Identifies the application that originated the message</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YqDsoLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YqLocLuIEeiq-o0aE00M6w" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_mYnWYJzTEeiLvPKMh61-Bg" name="syslogProcId" type="_p3EKoDm0EeiWMf5FLWfdLA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_sNaXgLuIEeiq-o0aE00M6w" annotatedElement="_mYnWYJzTEeiLvPKMh61-Bg">
+ <body>The process number assigned by the OS when the application was started</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YqTkQLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YqbgELuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_mYnWYJzTEeiLvPKMh61-Bg" name="syslogProcId" type="_p3EKoDm0EeiWMf5FLWfdLA"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_nBDPYJzTEeiLvPKMh61-Bg" name="syslogSData">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_vZi8ULuIEeiq-o0aE00M6w" annotatedElement="_nBDPYJzTEeiLvPKMh61-Bg">
+ <body>A <space> separated list of key=”value” pairs following the rfc5424 standard for SD-ELEMENT.
+
+Deprecated 
+The entire rfc5424 syslogSData object, including square brackets [ ], SD-ID and list of SD-PARAMs
+</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yqg_oLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YqlRELuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_nhhfMJzTEeiLvPKMh61-Bg" name="sysllogSdId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_xuWQgLuIEeiq-o0aE00M6w" annotatedElement="_nhhfMJzTEeiLvPKMh61-Bg">
+ <body>0-32 char in format name@number, 
+i.e., ourSDID@32473
+</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YqqJkLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YqvCELuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_oCtgsJzTEeiLvPKMh61-Bg" name="syslogSev">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_z_YfALuIEeiq-o0aE00M6w" annotatedElement="_oCtgsJzTEeiLvPKMh61-Bg">
+ <body>Level-of-severity text enumeration defined below: 
+Text Sev Description
+Emergency 0 system is unusable
+Alert 1 action must be taken immediately
+Critical 2 critical conditions
+Error 3 error conditions
+Warning 4 warning conditions
+Notice 5 normal but significant condition
+Info 6 Informational messages
+Debug 7 debug-level messages
+</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yqz6kLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yq5aILuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_oiiQQJzTEeiLvPKMh61-Bg" name="syslogTag">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_2IOa0LuIEeiq-o0aE00M6w" annotatedElement="_oiiQQJzTEeiLvPKMh61-Bg">
+ <body>Also known as MsgId. Brief non-spaced text indicating the type of message such as ‘TCPOUT’ or ‘BGP_STATUS_CHANGE’; ‘NILVALUE’ should be used when no other value can be provided</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yq-5sLuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YrFAULuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_pFelQJzTEeiLvPKMh61-Bg" name="syslogTs">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_4CZBcLuIEeiq-o0aE00M6w" annotatedElement="_pFelQJzTEeiLvPKMh61-Bg">
+ <body>Timestamp parsed from non-VES syslog message</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YrJ40LuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YrR0oLuIEeiq-o0aE00M6w" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_pucpwJzTEeiLvPKMh61-Bg" name="syslogVer" type="_p3EKoDm0EeiWMf5FLWfdLA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_7EncULuIEeiq-o0aE00M6w" annotatedElement="_pucpwJzTEeiLvPKMh61-Bg">
+ <body>IANA assigned version of the syslog protocol specification:
+ 0: VES
+ 1: IANA RFC5424
+</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YrWGELuIEeiq-o0aE00M6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YrbloLuIEeiq-o0aE00M6w" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_pucpwJzTEeiLvPKMh61-Bg" name="syslogVer" type="_p3EKoDm0EeiWMf5FLWfdLA"/>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_8IBvwH7wEeifJIHxnlj6Cg" name="ThresholdCrossingAlertFields">
<ownedAttribute xmi:type="uml:Property" xmi:id="_RRq8IKJVEeibfLkXoC-lBg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation index b27b339..a92e7a9 100644 --- a/papyrus/ONAP Information Model/Vnf.notation +++ b/papyrus/ONAP Information Model/Vnf.notation @@ -8628,7 +8628,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCDEppXEeidy9iGT_F5-w"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-t78cZpXEeidy9iGT_F5-w" x="260" y="660" width="121" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-t78cZpXEeidy9iGT_F5-w" x="200" y="660" width="121" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_-uGUg5pXEeidy9iGT_F5-w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_-uGUhJpXEeidy9iGT_F5-w"/>
@@ -8751,7 +8751,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5Ds5JssEeiPBvbfaqSLYg"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_O385oJssEeiPBvbfaqSLYg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4DnUZssEeiPBvbfaqSLYg" x="240" y="520" width="158" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4DnUZssEeiPBvbfaqSLYg" x="180" y="520" width="158" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_O5GJIJssEeiPBvbfaqSLYg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_O5GJIZssEeiPBvbfaqSLYg"/>
@@ -8790,7 +8790,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8jyIpssEeiPBvbfaqSLYg"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8dEcZssEeiPBvbfaqSLYg" x="720" y="520" width="161" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8dEcZssEeiPBvbfaqSLYg" x="700" y="520" width="161" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Y8sVA5ssEeiPBvbfaqSLYg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Y8sVBJssEeiPBvbfaqSLYg"/>
@@ -8803,7 +8803,7 @@ <children xmi:type="notation:Shape" xmi:id="_X5Q9kJs2EeiPBvbfaqSLYg" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_X5RkoJs2EeiPBvbfaqSLYg" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Vnf.uml#_X5PIYJs2EeiPBvbfaqSLYg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5Q9kZs2EeiPBvbfaqSLYg" x="1120" y="180" width="201" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5Q9kZs2EeiPBvbfaqSLYg" x="1020" y="180" width="201" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_xVcnkJs3EeiPBvbfaqSLYg" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_xVcnkps3EeiPBvbfaqSLYg" type="Class_NameLabel"/>
@@ -8834,7 +8834,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NDj-0qY4Eeily5uFlujj3Q"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_xVaLUJs3EeiPBvbfaqSLYg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVcnkZs3EeiPBvbfaqSLYg" x="100" y="660" width="121" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVcnkZs3EeiPBvbfaqSLYg" x="40" y="660" width="121" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_xVj8W5s3EeiPBvbfaqSLYg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_xVj8XJs3EeiPBvbfaqSLYg"/>
@@ -8844,11 +8844,6 @@ <element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVj8XZs3EeiPBvbfaqSLYg" x="200"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_V37bIJs6EeiPBvbfaqSLYg" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_V37bIps6EeiPBvbfaqSLYg" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Vnf.uml#_V35l8Js6EeiPBvbfaqSLYg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V37bIZs6EeiPBvbfaqSLYg" x="1120" y="320" width="199"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_r77iYKLQEeiz_K9hWIugxQ" type="Class_Shape" fillColor="14538691">
<children xmi:type="notation:DecorationNode" xmi:id="_r7_z0KLQEeiz_K9hWIugxQ" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_r7_z0aLQEeiz_K9hWIugxQ" type="Class_FloatingNameLabel">
@@ -8917,7 +8912,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0Licqe2Eeixw5Ke5QD1pQ"/>
</children>
<element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz-HEae2Eeixw5Ke5QD1pQ" x="420" y="660" width="121" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz-HEae2Eeixw5Ke5QD1pQ" x="360" y="660" width="121" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_T0UFUKe2Eeixw5Ke5QD1pQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_T0UFUae2Eeixw5Ke5QD1pQ"/>
@@ -8951,7 +8946,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamg7IKEeid-vjMcczUWA"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_mcXjILIKEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamcbIKEeid-vjMcczUWA" x="620" y="660" width="121" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamcbIKEeid-vjMcczUWA" x="600" y="660" width="121" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_mc3SYLIKEeid-vjMcczUWA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mc3SYbIKEeid-vjMcczUWA"/>
@@ -8961,44 +8956,54 @@ <element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mc3SYrIKEeid-vjMcczUWA" x="200"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_uMTDQLIKEeid-vjMcczUWA" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_uMTDQrIKEeid-vjMcczUWA" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_uMTDQ7IKEeid-vjMcczUWA" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uMTDRLIKEeid-vjMcczUWA" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uMTDRbIKEeid-vjMcczUWA" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uMTDRrIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uMTDR7IKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uMTDSLIKEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uMTDSbIKEeid-vjMcczUWA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uMTDSrIKEeid-vjMcczUWA" visible="false" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uMTDS7IKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uMTDTLIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uMTDTbIKEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uMTDTrIKEeid-vjMcczUWA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uMTDT7IKEeid-vjMcczUWA" visible="false" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uMTDULIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uMTDUbIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uMTDUrIKEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uMTDU7IKEeid-vjMcczUWA"/>
+ <children xmi:type="notation:Shape" xmi:id="_U8i5cLIOEeid-vjMcczUWA" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_U8i5crIOEeid-vjMcczUWA" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Vnf.uml#_U8hrULIOEeid-vjMcczUWA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U8i5cbIOEeid-vjMcczUWA" x="600" y="720" width="161" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HdVy4LavEeiWgvNHCpdNlg" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_HdZdQLavEeiWgvNHCpdNlg" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Vnf.uml#_HdKzwLavEeiWgvNHCpdNlg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HdVy4bavEeiWgvNHCpdNlg" x="880" y="540"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pyftALeSEeiq7vtzCAMDQQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_pyjXYLeSEeiq7vtzCAMDQQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pyj-cLeSEeiq7vtzCAMDQQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_pyj-cbeSEeiq7vtzCAMDQQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pyj-creSEeiq7vtzCAMDQQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pyklgLeSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pyklgbeSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pyklgreSEeiq7vtzCAMDQQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pyklg7eSEeiq7vtzCAMDQQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pyklhLeSEeiq7vtzCAMDQQ" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pyklhbeSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pyklhreSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pyklh7eSEeiq7vtzCAMDQQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pykliLeSEeiq7vtzCAMDQQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pyklibeSEeiq7vtzCAMDQQ" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pyklireSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pykli7eSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pykljLeSEeiq7vtzCAMDQQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pykljbeSEeiq7vtzCAMDQQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pyxZ0LeSEeiq7vtzCAMDQQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_pyxZ0beSEeiq7vtzCAMDQQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pyxZ0reSEeiq7vtzCAMDQQ"/>
</children>
- <element xmi:type="uml:Class" href="Vnf.uml#_uMR1ILIKEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uMTDQbIKEeid-vjMcczUWA" x="860" y="660" width="125" height="81"/>
+ <element xmi:type="uml:Class" href="Common.uml#_Tw79sD2pEeiu6I5JfRTxxQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pyftAbeSEeiq7vtzCAMDQQ" x="840" y="660" width="141" height="81"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_uMZw9bIKEeid-vjMcczUWA" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uMZw9rIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uMZw-LIKEeid-vjMcczUWA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_uMR1ILIKEeid-vjMcczUWA"/>
+ <children xmi:type="notation:Shape" xmi:id="_py25YLeSEeiq7vtzCAMDQQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_py25YbeSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_py25Y7eSEeiq7vtzCAMDQQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_Tw79sD2pEeiu6I5JfRTxxQ"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uMZw97IKEeid-vjMcczUWA" x="200"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_U8i5cLIOEeid-vjMcczUWA" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_U8i5crIOEeid-vjMcczUWA" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Vnf.uml#_U8hrULIOEeid-vjMcczUWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U8i5cbIOEeid-vjMcczUWA" x="640" y="720" width="161" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_py25YreSEeiq7vtzCAMDQQ" x="200"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_9U7NAZpVEeidy9iGT_F5-w" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_9U7NAppVEeidy9iGT_F5-w"/>
@@ -9036,7 +9041,7 @@ </children>
<styles xmi:type="notation:FontStyle" xmi:id="_JDQKcZpYEeidy9iGT_F5-w"/>
<element xmi:type="uml:Generalization" href="Vnf.uml#_JDHAgJpYEeidy9iGT_F5-w"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JDQKcppYEeidy9iGT_F5-w" points="[320, 660, -643984, -643984]$[320, 640, -643984, -643984]$[340, 601, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JDQKcppYEeidy9iGT_F5-w" points="[260, 660, -643984, -643984]$[260, 640, -643984, -643984]$[280, 601, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDgpIJpYEeidy9iGT_F5-w" id="(0.49586776859504134,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDhQMJpYEeidy9iGT_F5-w" id="(0.5063291139240507,1.0)"/>
</edges>
@@ -9173,11 +9178,11 @@ <edges xmi:type="notation:Connector" xmi:id="_uoUT8JssEeiPBvbfaqSLYg" type="Generalization_Edge" source="_O4DnUJssEeiPBvbfaqSLYg" target="_HMZzAJpXEeidy9iGT_F5-w">
<children xmi:type="notation:DecorationNode" xmi:id="_uoUT85ssEeiPBvbfaqSLYg" type="Generalization_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_vlqtAJssEeiPBvbfaqSLYg" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uoUT9JssEeiPBvbfaqSLYg" x="-1" y="38"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uoUT9JssEeiPBvbfaqSLYg" x="-61" y="38"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_uoUT8ZssEeiPBvbfaqSLYg"/>
<element xmi:type="uml:Generalization" href="Vnf.uml#_ujjIsJssEeiPBvbfaqSLYg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoUT8pssEeiPBvbfaqSLYg" points="[320, 520, -643984, -643984]$[320, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 440, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoUT8pssEeiPBvbfaqSLYg" points="[260, 520, -643984, -643984]$[260, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 440, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxXiQJssEeiPBvbfaqSLYg" id="(0.5063291139240507,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxXiQZssEeiPBvbfaqSLYg" id="(0.4979253112033195,1.0)"/>
</edges>
@@ -9188,7 +9193,7 @@ </children>
<styles xmi:type="notation:FontStyle" xmi:id="_xhSFIZssEeiPBvbfaqSLYg"/>
<element xmi:type="uml:Generalization" href="Vnf.uml#_xcr5AJssEeiPBvbfaqSLYg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xhSFIpssEeiPBvbfaqSLYg" points="[800, 520, -643984, -643984]$[800, 480, -643984, -643984]$[633, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 440, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xhSFIpssEeiPBvbfaqSLYg" points="[780, 520, -643984, -643984]$[780, 480, -643984, -643984]$[633, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 440, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0JssEeiPBvbfaqSLYg" id="(0.4968944099378882,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0ZssEeiPBvbfaqSLYg" id="(0.4979253112033195,1.0)"/>
</edges>
@@ -9209,7 +9214,7 @@ </children>
<styles xmi:type="notation:FontStyle" xmi:id="_7NS2cZs3EeiPBvbfaqSLYg"/>
<element xmi:type="uml:Generalization" href="Vnf.uml#_7DhPYJs3EeiPBvbfaqSLYg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7NS2cps3EeiPBvbfaqSLYg" points="[160, 660, -643984, -643984]$[160, 640, -643984, -643984]$[320, 640, -643984, -643984]$[320, 601, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7NS2cps3EeiPBvbfaqSLYg" points="[100, 660, -643984, -643984]$[100, 640, -643984, -643984]$[260, 640, -643984, -643984]$[260, 601, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7g2EkJs3EeiPBvbfaqSLYg" id="(0.49586776859504134,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7g2EkZs3EeiPBvbfaqSLYg" id="(0.5063291139240507,1.0)"/>
</edges>
@@ -9236,11 +9241,11 @@ </children>
<children xmi:type="notation:DecorationNode" xmi:id="_e3ea-ps4EeiPBvbfaqSLYg" type="Association_TargetMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_gtL_YJs4EeiPBvbfaqSLYg" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_e3ea-5s4EeiPBvbfaqSLYg" x="-56" y="27"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_e3ea-5s4EeiPBvbfaqSLYg" x="-55" y="66"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_e3dz4Zs4EeiPBvbfaqSLYg"/>
<element xmi:type="uml:Association" href="Vnf.uml#_etib0Js4EeiPBvbfaqSLYg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e3dz4ps4EeiPBvbfaqSLYg" points="[440, 240, -643984, -643984]$[400, 240, -643984, -643984]$[120, 240, -643984, -643984]$[120, 680, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e3dz4ps4EeiPBvbfaqSLYg" points="[440, 240, -643984, -643984]$[400, 240, -643984, -643984]$[60, 240, -643984, -643984]$[60, 660, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fLVyIJs4EeiPBvbfaqSLYg" id="(0.0,0.25)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fLVyIZs4EeiPBvbfaqSLYg" id="(0.1652892561983471,0.0)"/>
</edges>
@@ -9302,7 +9307,7 @@ </children>
<styles xmi:type="notation:FontStyle" xmi:id="_lyx2Aae2Eeixw5Ke5QD1pQ"/>
<element xmi:type="uml:Generalization" href="Resource.uml#_lh0B0Ke2Eeixw5Ke5QD1pQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lyx2Aqe2Eeixw5Ke5QD1pQ" points="[480, 660, -643984, -643984]$[480, 640, -643984, -643984]$[319, 640, -643984, -643984]$[319, 601, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lyx2Aqe2Eeixw5Ke5QD1pQ" points="[420, 660, -643984, -643984]$[420, 640, -643984, -643984]$[259, 640, -643984, -643984]$[259, 601, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRsmoKe2Eeixw5Ke5QD1pQ" id="(0.49586776859504134,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRsmoae2Eeixw5Ke5QD1pQ" id="(0.5,1.0)"/>
</edges>
@@ -9316,16 +9321,6 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mc35c7IKEeid-vjMcczUWA"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mc35dLIKEeid-vjMcczUWA"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_uMZw-bIKEeid-vjMcczUWA" type="StereotypeCommentLink" source="_uMTDQLIKEeid-vjMcczUWA" target="_uMZw9bIKEeid-vjMcczUWA">
- <styles xmi:type="notation:FontStyle" xmi:id="_uMZw-rIKEeid-vjMcczUWA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uMZw_rIKEeid-vjMcczUWA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_uMR1ILIKEeid-vjMcczUWA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uMZw-7IKEeid-vjMcczUWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uMZw_LIKEeid-vjMcczUWA"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uMZw_bIKEeid-vjMcczUWA"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_lS0rsLILEeid-vjMcczUWA" type="Generalization_Edge" source="_mcamcLIKEeid-vjMcczUWA" target="_Y8dEcJssEeiPBvbfaqSLYg">
<children xmi:type="notation:DecorationNode" xmi:id="_lS1SwLILEeid-vjMcczUWA" type="Generalization_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_nueOwLILEeid-vjMcczUWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9333,20 +9328,30 @@ </children>
<styles xmi:type="notation:FontStyle" xmi:id="_lS0rsbILEeid-vjMcczUWA"/>
<element xmi:type="uml:Generalization" href="Vnf.uml#_lFpyYLILEeid-vjMcczUWA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lS0rsrILEeid-vjMcczUWA" points="[680, 660, -643984, -643984]$[680, 640, -643984, -643984]$[800, 640, -643984, -643984]$[800, 601, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lS0rsrILEeid-vjMcczUWA" points="[660, 660, -643984, -643984]$[660, 640, -643984, -643984]$[780, 640, -643984, -643984]$[780, 601, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ls5_oLILEeid-vjMcczUWA" id="(0.49586776859504134,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ls5_obILEeid-vjMcczUWA" id="(0.4968944099378882,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_q9zRgLILEeid-vjMcczUWA" type="Generalization_Edge" source="_uMTDQLIKEeid-vjMcczUWA" target="_Y8dEcJssEeiPBvbfaqSLYg">
- <children xmi:type="notation:DecorationNode" xmi:id="_q9zRg7ILEeid-vjMcczUWA" type="Generalization_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sGXcELILEeid-vjMcczUWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_q9zRhLILEeid-vjMcczUWA" x="-2" y="37"/>
+ <edges xmi:type="notation:Connector" xmi:id="_py3gcLeSEeiq7vtzCAMDQQ" type="StereotypeCommentLink" source="_pyftALeSEeiq7vtzCAMDQQ" target="_py25YLeSEeiq7vtzCAMDQQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_py3gcbeSEeiq7vtzCAMDQQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_py4HgLeSEeiq7vtzCAMDQQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_Tw79sD2pEeiu6I5JfRTxxQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_py3gcreSEeiq7vtzCAMDQQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_py3gc7eSEeiq7vtzCAMDQQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_py3gdLeSEeiq7vtzCAMDQQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_t3OtwLeSEeiq7vtzCAMDQQ" type="Generalization_Edge" source="_pyftALeSEeiq7vtzCAMDQQ" target="_Y8dEcJssEeiPBvbfaqSLYg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_t3PU0LeSEeiq7vtzCAMDQQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fq3gQLeTEeiq7vtzCAMDQQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_t3PU0beSEeiq7vtzCAMDQQ" x="-1" y="38"/>
</children>
- <styles xmi:type="notation:FontStyle" xmi:id="_q9zRgbILEeid-vjMcczUWA"/>
- <element xmi:type="uml:Generalization" href="Vnf.uml#_qwsCkLILEeid-vjMcczUWA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q9zRgrILEeid-vjMcczUWA" points="[920, 660, -643984, -643984]$[920, 640, -643984, -643984]$[800, 640, -643984, -643984]$[800, 620, -643984, -643984]$[800, 601, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rXgK8LILEeid-vjMcczUWA" id="(0.48,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rXgK8bILEeid-vjMcczUWA" id="(0.4968944099378882,1.0)"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_t3OtwbeSEeiq7vtzCAMDQQ"/>
+ <element xmi:type="uml:Generalization" href="Common.uml#_tmOdULeSEeiq7vtzCAMDQQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t3OtwreSEeiq7vtzCAMDQQ" points="[900, 660, -643984, -643984]$[900, 640, -643984, -643984]$[780, 640, -643984, -643984]$[780, 601, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uYVPsLeSEeiq7vtzCAMDQQ" id="(0.425531914893617,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uYVPsbeSEeiq7vtzCAMDQQ" id="(0.4968944099378882,1.0)"/>
</edges>
</notation:Diagram>
</xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml index 4b75752..e8ce9e3 100644 --- a/papyrus/ONAP Information Model/Vnf.uml +++ b/papyrus/ONAP Information Model/Vnf.uml @@ -481,12 +481,14 @@ A virtual link is a resource
 A license is not a resource
A Cp is not a resource</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_V35l8Js6EeiPBvbfaqSLYg">
- <body>Need to assess need for service topology for the internal model from a design view.</body>
- </ownedComment>
<ownedComment xmi:type="uml:Comment" xmi:id="_U8hrULIOEeid-vjMcczUWA">
<body>Add relationship from Anl to ServiceDescAtomic</body>
</ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_HdKzwLavEeiWgvNHCpdNlg">
+ <body>ONAP has VirtualLinkDesc, not NetworkLink
+
+This will probably need to move to common</body>
+ </ownedComment>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_MevNkJddEei-sOl6ywWHlg" name="AddressType">
<ownedComment xmi:type="uml:Comment" xmi:id="_zYqPEJdeEei-sOl6ywWHlg" annotatedElement="_MevNkJddEei-sOl6ywWHlg">
<body>Type of address</body>
@@ -494,12 +496,13 @@ A Cp is not a resource</body> <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TXtQgJddEei-sOl6ywWHlg" name="MAC"/>
<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UVFewJddEei-sOl6ywWHlg" name="IP"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_mcXjILIKEeid-vjMcczUWA" name="Anl">
+ <packagedElement xmi:type="uml:Class" xmi:id="_mcXjILIKEeid-vjMcczUWA" name="AllottedLink">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_hNCywLeVEeiq7vtzCAMDQQ" annotatedElement="_mcXjILIKEeid-vjMcczUWA">
+ <body>An AllottedLink is a link provided (or allotted) by some service instance. The Allottedlink may be incorporated into the topology of some consuming service like other links. 
+</body>
+ </ownedComment>
<generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_uMR1ILIKEeid-vjMcczUWA" name="Vnl">
- <generalization xmi:type="uml:Generalization" xmi:id="_qwsCkLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
- </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_zPN5MTOHEei5Af8DcjrhIQ" name="Interfaces"/>
<packagedElement xmi:type="uml:Package" xmi:id="_zPN5MjOHEei5Af8DcjrhIQ" name="ObjectClasses">
@@ -1044,7 +1047,10 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aPEasDm3EeiWMf5FLWfdLA" value="1"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="NetworkLinkDesc ">
+ <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="LinkDesc ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Ey004LeVEeiq7vtzCAMDQQ" annotatedElement="_AC2eIDQUEeixv_sLOod4lQ">
+ <body>A communication channel that connects two or more devices, nodes, or entities.</body>
+ </ownedComment>
<generalization xmi:type="uml:Generalization" xmi:id="_xcr5AJssEeiPBvbfaqSLYg" general="_DAQisJpXEeidy9iGT_F5-w"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_pszPADd9EeiIfPeSAqyGdQ" name="virtualLinkDescId">
<ownedComment xmi:type="uml:Comment" xmi:id="_IJjFUDd-EeiIfPeSAqyGdQ" annotatedElement="_pszPADd9EeiIfPeSAqyGdQ">
@@ -3244,5 +3250,4 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on <OpenModel_Profile:Experimental xmi:id="_B0g3AKY5Eeily5uFlujj3Q" base_Element="_xVaLUJs3EeiPBvbfaqSLYg"/>
<OpenModel_Profile:Experimental xmi:id="_HV6qEKY5Eeily5uFlujj3Q" base_Element="_O385oJssEeiPBvbfaqSLYg"/>
<OpenModel_Profile:OpenModelClass xmi:id="_mcYKMLIKEeid-vjMcczUWA" base_Class="_mcXjILIKEeid-vjMcczUWA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_uMR1IbIKEeid-vjMcczUWA" base_Class="_uMR1ILIKEeid-vjMcczUWA"/>
</xmi:XMI>
|