summaryrefslogtreecommitdiffstats
path: root/papyrus
diff options
context:
space:
mode:
authorjjewitt58 <jessie.jewitt@oamtechnologies.com>2018-08-23 10:40:41 -0700
committerjjewitt58 <jessie.jewitt@oamtechnologies.com>2018-08-23 10:40:41 -0700
commit4f252923df5221ee068b76ec44d1952bbabcd6c7 (patch)
treeec0058b6d9d69a4ca80bf642b8b3a8041be9ce1d /papyrus
parent832a68c3e85b7493c9916d9cf3bf3920e59d9cfb (diff)
Alignment of NSD model with R2
Issue-ID: MODELING-104 Change-Id: I0209044799e915670b639c73120033d63695c512 Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>
Diffstat (limited to 'papyrus')
-rw-r--r--papyrus/ONAP Information Model/Resource.notation237
-rw-r--r--papyrus/ONAP Information Model/Resource.uml245
-rw-r--r--papyrus/ONAP Information Model/Service.uml510
3 files changed, 561 insertions, 431 deletions
diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation
index 19b6a91..3424713 100644
--- a/papyrus/ONAP Information Model/Resource.notation
+++ b/papyrus/ONAP Information Model/Resource.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_s5WwcD2lEeiu6I5JfRTxxQ" type="PapyrusUMLClassDiagram" name="NetworkServiceDescriptorModel" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_uxbsYD2lEeiu6I5JfRTxxQ" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_uxsLED2lEeiu6I5JfRTxxQ" type="Class_NameLabel"/>
@@ -16,42 +16,6 @@
<element xmi:type="uml:Property" href="Resource.uml#_13KfMjzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_CmfLQT2mEeiu6I5JfRTxxQ"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_CmiOkD2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_CqBAYD2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_CqBAYT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CqBAYj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Resource.uml#_13KfNDzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_CmiOkT2mEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Cmkq0D2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_CqSGID2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_CqSGIT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CqSGIj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Resource.uml#_13KfNjzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Cmkq0T2mEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_CmlR4D2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_CqlBED2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_CqlBET2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CqlBEj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Resource.uml#_13LGQDzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_CmlR4T2mEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_CmnuID2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_Cq0RoD2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_Cq0RoT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cq0Roj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Resource.uml#_13LGQjzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_CmnuIT2mEeiu6I5JfRTxxQ"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_CmrYgD2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
<children xmi:type="notation:DecorationNode" xmi:id="_CrcjwD2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_CrcjwT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -79,6 +43,15 @@
<element xmi:type="uml:Property" href="Resource.uml#_13LGbDzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_YQzMgT2vEeiu6I5JfRTxxQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_ZfnT8Kb1Eeixw5Ke5QD1pQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Zfwd4Kb1Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Zfwd4ab1Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zfwd4qb1Eeixw5Ke5QD1pQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Resource.uml#_CE1gEKY7Eeixw5Ke5QD1pQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ZfnT8ab1Eeixw5Ke5QD1pQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_uxtZMT2lEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_uxtZMj2lEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_uxtZMz2lEeiu6I5JfRTxxQ"/>
@@ -118,33 +91,6 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_SVL4wD2mEeiu6I5JfRTxxQ" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_SVL4wT2mEeiu6I5JfRTxxQ" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_a825MD2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_a9VaUD2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_a9VaUT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a9VaUj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_13gdcjzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a825MT2mEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_a858gD2mEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_a9fyYD2mEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_a9fyYT2mEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a9fyYj2mEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_13gddDzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a858gT2mEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_j9VqAJmiEeiSm9XNElOsxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_j9640JmiEeiSm9XNElOsxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_j9640ZmiEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j9640pmiEeiSm9XNElOsxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_OGFC0JmiEeiSm9XNElOsxQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_j9VqAZmiEeiSm9XNElOsxQ"/>
- </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_SVL4wj2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_SVL4wz2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_SVL4xD2mEeiu6I5JfRTxxQ"/>
@@ -167,13 +113,13 @@
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_SV31Qj2mEeiu6I5JfRTxxQ"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SVJcgT2mEeiu6I5JfRTxxQ" x="-240" y="40" height="101"/>
+ <element xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SVJcgT2mEeiu6I5JfRTxxQ" x="-160" y="40" height="101"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_SWC0YD2mEeiu6I5JfRTxxQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_SWDbcD2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_SWDbcj2mEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_SWDbcT2mEeiu6I5JfRTxxQ" x="200"/>
@@ -184,43 +130,6 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_361rcT2mEeiu6I5JfRTxxQ" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_361rcj2mEeiu6I5JfRTxxQ" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_buYAQD2nEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_bvIOMD2nEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_bvIOMT2nEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bvIOMj2nEeiu6I5JfRTxxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_45TagzzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_buYAQT2nEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_isfB4D2nEeiu6I5JfRTxxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_itIiID2nEeiu6I5JfRTxxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_itIiIT2nEeiu6I5JfRTxxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_itIiIj2nEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_5chzoJmbEeiSm9XNElOsxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_5chzoZmbEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::PassedByReference"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_6urDcP_gEeaI0OG3Zoa57Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5chzopmbEeiSm9XNElOsxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_45TahTzEEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_isfB4T2nEeiu6I5JfRTxxQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_cfj4kJmcEeiSm9XNElOsxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_chM3UJmcEeiSm9XNElOsxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_chM3UZmcEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_chM3UpmcEeiSm9XNElOsxQ"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_chVaMJmcEeiSm9XNElOsxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_chVaMZmcEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::PassedByReference"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_6urDcP_gEeaI0OG3Zoa57Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_chVaMpmcEeiSm9XNElOsxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cfj4kZmcEeiSm9XNElOsxQ"/>
- </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_361rcz2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_361rdD2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_361rdT2mEeiu6I5JfRTxxQ"/>
@@ -243,13 +152,13 @@
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_37nukj2mEeiu6I5JfRTxxQ"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_45TagDzEEeiWMf5FLWfdLA"/>
+ <element xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_360dUT2mEeiu6I5JfRTxxQ" x="1080" y="40"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_38t6wD2mEeiu6I5JfRTxxQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_38t6wT2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_38uh0D2mEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_45TagDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_38t6wj2mEeiu6I5JfRTxxQ" x="200"/>
@@ -260,15 +169,6 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_DXUgYj2oEeiu6I5JfRTxxQ" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_DXUgYz2oEeiu6I5JfRTxxQ" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_IgqAgJmkEeiSm9XNElOsxQ" type="Property_ClassAttributeLabel">
- <children xmi:type="notation:DecorationNode" xmi:id="_IhgVEJmkEeiSm9XNElOsxQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_IhgVEZmkEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhgVEpmkEeiSm9XNElOsxQ"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_0xS58JmjEeiSm9XNElOsxQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IgqAgZmkEeiSm9XNElOsxQ"/>
- </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_DXUgZD2oEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_DXUgZT2oEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_DXUgZj2oEeiu6I5JfRTxxQ"/>
@@ -291,13 +191,13 @@
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DYLcAj2oEeiu6I5JfRTxxQ"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
+ <element xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DXTSQT2oEeiu6I5JfRTxxQ" x="220" y="320" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_DY-tQD2oEeiu6I5JfRTxxQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_DY-tQT2oEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_DY-tQz2oEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DY-tQj2oEeiu6I5JfRTxxQ" x="200"/>
@@ -314,14 +214,6 @@
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_A5D4wj2pEeiu6I5JfRTxxQ"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_7wMwUJmkEeiSm9XNElOsxQ" type="StereotypeLabel">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CcfzwJmmEeiSm9XNElOsxQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CcfzwZmmEeiSm9XNElOsxQ" key="visible" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_7wMwUZmkEeiSm9XNElOsxQ" name="stereotype" stringValue="OpenModel_Profile::Experimental"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_FU4UgJ2EEeSk-dMsN-xZbw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wMwUpmkEeiSm9XNElOsxQ"/>
- </children>
<element xmi:type="uml:Property" href="Resource.uml#_13WFYzzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_A3-6sT2pEeiu6I5JfRTxxQ"/>
</children>
@@ -399,6 +291,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_BcoOAD2rEeiu6I5JfRTxxQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BcoOAT2rEeiu6I5JfRTxxQ"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_nql20KbzEeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_nql20abzEeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nql20qbzEeixw5Ke5QD1pQ"/>
+ </children>
<element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bcnm4T2rEeiu6I5JfRTxxQ" x="40" y="480" width="241"/>
</children>
@@ -438,17 +335,56 @@
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pPzBEj2rEeiu6I5JfRTxxQ"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+ <element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pPk-oT2rEeiu6I5JfRTxxQ" x="820" y="480"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_pRUrEz2rEeiu6I5JfRTxxQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_pRUrFD2rEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pRVSID2rEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pRUrFT2rEeiu6I5JfRTxxQ" x="200"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_6JwEUKb0Eeixw5Ke5QD1pQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_6J84oKb0Eeixw5Ke5QD1pQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6J9fsKb0Eeixw5Ke5QD1pQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6J9fsab0Eeixw5Ke5QD1pQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fsqb0Eeixw5Ke5QD1pQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fs6b0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6J9ftKb0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9ftab0Eeixw5Ke5QD1pQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9ftqb0Eeixw5Ke5QD1pQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6J9ft6b0Eeixw5Ke5QD1pQ" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fuKb0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fuab0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fuqb0Eeixw5Ke5QD1pQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fu6b0Eeixw5Ke5QD1pQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fvKb0Eeixw5Ke5QD1pQ" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fvab0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fvqb0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fv6b0Eeixw5Ke5QD1pQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fwKb0Eeixw5Ke5QD1pQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6KUsEKb0Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_6KUsEab0Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KUsEqb0Eeixw5Ke5QD1pQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6JwEUab0Eeixw5Ke5QD1pQ" x="100" y="640"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_6KdO8Kb0Eeixw5Ke5QD1pQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6KdO8ab0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KdO86b0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KdO8qb0Eeixw5Ke5QD1pQ" x="200"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_s5WwcT2lEeiu6I5JfRTxxQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_s5Wwcj2lEeiu6I5JfRTxxQ"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_s5Wwcz2lEeiu6I5JfRTxxQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -468,7 +404,7 @@
<edges xmi:type="notation:Connector" xmi:id="_SWECgD2mEeiu6I5JfRTxxQ" type="StereotypeCommentLink" source="_SVJcgD2mEeiu6I5JfRTxxQ" target="_SWC0YD2mEeiu6I5JfRTxxQ">
<styles xmi:type="notation:FontStyle" xmi:id="_SWECgT2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_SWFQoD2mEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SWECgj2mEeiu6I5JfRTxxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -509,7 +445,7 @@
<edges xmi:type="notation:Connector" xmi:id="_38uh0T2mEeiu6I5JfRTxxQ" type="StereotypeCommentLink" source="_360dUD2mEeiu6I5JfRTxxQ" target="_38t6wD2mEeiu6I5JfRTxxQ">
<styles xmi:type="notation:FontStyle" xmi:id="_38uh0j2mEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_38vI4j2mEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_45TagDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_38uh0z2mEeiu6I5JfRTxxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -550,7 +486,7 @@
<edges xmi:type="notation:Connector" xmi:id="_DY-tRD2oEeiu6I5JfRTxxQ" type="StereotypeCommentLink" source="_DXTSQD2oEeiu6I5JfRTxxQ" target="_DY-tQD2oEeiu6I5JfRTxxQ">
<styles xmi:type="notation:FontStyle" xmi:id="_DY-tRT2oEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_DY_UUj2oEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DY-tRj2oEeiu6I5JfRTxxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -584,9 +520,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_WkBl0T2oEeiu6I5JfRTxxQ"/>
<element xmi:type="uml:Association" href="Service.uml#_Wi3vQD2oEeiu6I5JfRTxxQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WkBl0j2oEeiu6I5JfRTxxQ" points="[360, 221, -643984, -643984]$[360, 320, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl08oD2oEeiu6I5JfRTxxQ" id="(0.23653088042049936,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl08oT2oEeiu6I5JfRTxxQ" id="(0.5957446808510638,0.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WkBl0j2oEeiu6I5JfRTxxQ" points="[280, 241, -643984, -643984]$[280, 320, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl08oD2oEeiu6I5JfRTxxQ" id="(0.1314060446780552,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl08oT2oEeiu6I5JfRTxxQ" id="(0.6,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_3YC1hj2oEeiu6I5JfRTxxQ" type="StereotypeCommentLink" source="_3XpM4D2oEeiu6I5JfRTxxQ" target="_3YC1gj2oEeiu6I5JfRTxxQ">
<styles xmi:type="notation:FontStyle" xmi:id="_3YC1hz2oEeiu6I5JfRTxxQ"/>
@@ -698,7 +634,7 @@
<edges xmi:type="notation:Connector" xmi:id="_pRVSIT2rEeiu6I5JfRTxxQ" type="StereotypeCommentLink" source="_pPk-oD2rEeiu6I5JfRTxxQ" target="_pRUrEz2rEeiu6I5JfRTxxQ">
<styles xmi:type="notation:FontStyle" xmi:id="_pRVSIj2rEeiu6I5JfRTxxQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pRV5Mj2rEeiu6I5JfRTxxQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+ <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pRVSIz2rEeiu6I5JfRTxxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -792,6 +728,39 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ycE4gD2tEeiu6I5JfRTxxQ" id="(0.657030223390276,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ycE4gT2tEeiu6I5JfRTxxQ" id="(0.3416557161629435,0.0)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_6KdO9Kb0Eeixw5Ke5QD1pQ" type="StereotypeCommentLink" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_6KdO8Kb0Eeixw5Ke5QD1pQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_6KdO9ab0Eeixw5Ke5QD1pQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KqDQqb0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6KdO9qb0Eeixw5Ke5QD1pQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQKb0Eeixw5Ke5QD1pQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQab0Eeixw5Ke5QD1pQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_G3dtEKb1Eeixw5Ke5QD1pQ" type="Association_Edge" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_Bcnm4D2rEeiu6I5JfRTxxQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIKb1Eeixw5Ke5QD1pQ" type="Association_StereotypeLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUIab1Eeixw5Ke5QD1pQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIqb1Eeixw5Ke5QD1pQ" type="Association_NameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUI6b1Eeixw5Ke5QD1pQ" x="3" y="68"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3eUJKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_TargetRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUJab1Eeixw5Ke5QD1pQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3e7MKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_SourceRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Mab1Eeixw5Ke5QD1pQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3e7Mqb1Eeixw5Ke5QD1pQ" type="Association_SourceMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7M6b1Eeixw5Ke5QD1pQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G3e7NKb1Eeixw5Ke5QD1pQ" type="Association_TargetMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Nab1Eeixw5Ke5QD1pQ" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_G3dtEab1Eeixw5Ke5QD1pQ"/>
+ <element xmi:type="uml:Association" href="Vnf.uml#_LOOBADQtEeixv_sLOod4lQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G3dtEqb1Eeixw5Ke5QD1pQ" points="[153, 640, -643984, -643984]$[157, 580, -643984, -643984]"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_NmiJAKY4Eeixw5Ke5QD1pQ" type="PapyrusUMLClassDiagram" name="NSDR3Model" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_NmiJAaY4Eeixw5Ke5QD1pQ" type="Class_Shape">
diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml
index ba83318..d63ce19 100644
--- a/papyrus/ONAP Information Model/Resource.uml
+++ b/papyrus/ONAP Information Model/Resource.uml
@@ -70,31 +70,28 @@ NOTE 2: There may be multiple data sources (each identified as monitoredInfo) p
</ownedComment>
<type xmi:type="uml:DataType" href="Common.uml#_P-qXMD2vEeiu6I5JfRTxxQ"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_jBZXYD2mEeiu6I5JfRTxxQ" name="_nsdf" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_jBZXYD2mEeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" aggregation="composite">
<ownedComment xmi:type="uml:Comment" xmi:id="_a9SiQEPhEeiVGPeZpaYNtQ" annotatedElement="_jBZXYD2mEeiu6I5JfRTxxQ">
<body>Identifies a DF within the scope of an NSD.</body>
</ownedComment>
- <type xmi:type="uml:Class" href="Service.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jBdBwD2mEeiu6I5JfRTxxQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jBdo0D2mEeiu6I5JfRTxxQ" value="*"/>
<association xmi:type="uml:Association" href="Service.uml#_jA8rcD2mEeiu6I5JfRTxxQ"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_qMMUsD2nEeiu6I5JfRTxxQ" name="_sapd" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_qMMUsD2nEeiu6I5JfRTxxQ" name="_sapd" type="_45TagDzEEeiWMf5FLWfdLA" aggregation="composite">
<ownedComment xmi:type="uml:Comment" xmi:id="_NtSEwEPhEeiVGPeZpaYNtQ" annotatedElement="_qMMUsD2nEeiu6I5JfRTxxQ">
<body>Provides the descriptor of a SAP of the NS.</body>
</ownedComment>
- <type xmi:type="uml:Class" href="Service.uml#_45TagDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qMOJ4D2nEeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qMOw8D2nEeiu6I5JfRTxxQ" value="*"/>
<association xmi:type="uml:Association" href="Service.uml#_qMJ4cD2nEeiu6I5JfRTxxQ"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_Wi5kcj2oEeiu6I5JfRTxxQ" name="_vnffgd" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Wi5kcj2oEeiu6I5JfRTxxQ" name="_vnffgd" type="_13ZIsDzEEeiWMf5FLWfdLA" aggregation="composite">
<ownedComment xmi:type="uml:Comment" xmi:id="_WFbbcEPhEeiVGPeZpaYNtQ" annotatedElement="_Wi5kcj2oEeiu6I5JfRTxxQ">
<body>Provides the descriptors of the applicable forwarding graphs.&#xD;
Cardinality of 0 means that the NS is a NF set with unspecified connectivity.&#xD;
</body>
</ownedComment>
- <type xmi:type="uml:Class" href="Service.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wi7ZoD2oEeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wi8AsD2oEeiu6I5JfRTxxQ" value="*"/>
<association xmi:type="uml:Association" href="Service.uml#_Wi3vQD2oEeiu6I5JfRTxxQ"/>
@@ -118,11 +115,10 @@ Cardinality of 0 means that the NS is a NF set with unspecified connectivity.&#x
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JDDz0T2rEeiu6I5JfRTxxQ" value="*"/>
<association xmi:type="uml:Association" href="Service.uml#_JDAwgD2rEeiu6I5JfRTxxQ"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_wdAOoD2rEeiu6I5JfRTxxQ" name="_pnfdId" aggregation="shared">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_wdAOoD2rEeiu6I5JfRTxxQ" name="_pnfdId" type="_13TCEDzEEeiWMf5FLWfdLA" aggregation="shared">
<ownedComment xmi:type="uml:Comment" xmi:id="_JkKTQEPhEeiVGPeZpaYNtQ" annotatedElement="_wdAOoD2rEeiu6I5JfRTxxQ">
<body>References the PNFD of a constituent PNF.</body>
</ownedComment>
- <type xmi:type="uml:Class" href="Service.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wdCD0D2rEeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wdCD0T2rEeiu6I5JfRTxxQ" value="*"/>
<association xmi:type="uml:Association" href="Service.uml#_wc9LUD2rEeiu6I5JfRTxxQ"/>
@@ -173,6 +169,239 @@ Cardinality of 0 means that the NS is a NF set with unspecified connectivity.&#x
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13WFcDzEEeiWMf5FLWfdLA" value="1"/>
</ownedAttribute>
</packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_13gdcDzEEeiWMf5FLWfdLA" name="NsDf">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13gdcTzEEeiWMf5FLWfdLA" annotatedElement="_13gdcDzEEeiWMf5FLWfdLA">
+ <body>The NsDf class specifies the properties of a variant of an NS.&#xD;
+NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0.</body>
+ </ownedComment>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13gdcjzEEeiWMf5FLWfdLA" name="nsDfId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13gdczzEEeiWMf5FLWfdLA" annotatedElement="_13gdcjzEEeiWMf5FLWfdLA">
+ <body>Identifies this NsDf class. It identifies a NS DF within the NSD.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13gddDzEEeiWMf5FLWfdLA" name="flavourKey">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13gddTzEEeiWMf5FLWfdLA" annotatedElement="_13gddDzEEeiWMf5FLWfdLA">
+ <body>Assurance parameter against which this flavour is being described. The key can be a combination of multiple assurance parameters with a logical relationship between them. The parameters should be present as a monitoredInfo attribute in the NSD.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_OGFC0JmiEeiSm9XNElOsxQ" name="monitoredInfo" visibility="public" type="_kEZoSDzEEeiWMf5FLWfdLA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_XGghgJmiEeiSm9XNElOsxQ" annotatedElement="_OGFC0JmiEeiSm9XNElOsxQ">
+ <body>Identifies either a virtualised resource-related performance metric or a VNF Indicator.</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YgQisJmiEeiSm9XNElOsxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YgtOoJmiEeiSm9XNElOsxQ" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_-83tUj2yEeiu6I5JfRTxxQ" name="_nsInstantiationLevel" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_VsHHEEPiEeiVGPeZpaYNtQ" annotatedElement="_-83tUj2yEeiu6I5JfRTxxQ">
+ <body>Describes the details of an NS level.&#xD;
+NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0.&#xD;
+</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_GYs-4DzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-847cD2yEeiu6I5JfRTxxQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-85igD2yEeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_-82fMD2yEeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_CtSbEJmhEeiSm9XNElOsxQ" name="_defaultNsInstantiationLevel" aggregation="composite">
+ <type xmi:type="uml:Class" href="Service.uml#_GYs-4DzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CtUQQJmhEeiSm9XNElOsxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CtU3UJmhEeiSm9XNElOsxQ" value="1"/>
+ <association xmi:type="uml:Association" href="Service.uml#_Cs71wJmhEeiSm9XNElOsxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_actGkj2zEeiu6I5JfRTxxQ" name="_affinityOrAntiAffinitygroup" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_cByPsEPiEeiVGPeZpaYNtQ" annotatedElement="_actGkj2zEeiu6I5JfRTxxQ">
+ <body>Specifies affinity or anti-affinity relationship applicable between the VNF instances created using different VNFDs, the Virtual Link instances created using different NsVirtualLinkDescs or the nested NS instances created using different NSDs in the same affinity or anti-affinity group.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_acvi0D2zEeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_acwJ4D2zEeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_acr4cD2zEeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="__KZ9kD2zEeiu6I5JfRTxxQ" name="_scalingAspect" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_e9QiUEPiEeiVGPeZpaYNtQ" annotatedElement="__KZ9kD2zEeiu6I5JfRTxxQ">
+ <body>The scaling aspects supported by this DF of the NS.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_GYmRMDzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__KbLsD2zEeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__KbywD2zEeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#__KYIYD2zEeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_hPo9gD20Eeiu6I5JfRTxxQ" name="_pnfProfile" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_igKoYEPiEeiVGPeZpaYNtQ" annotatedElement="_hPo9gD20Eeiu6I5JfRTxxQ">
+ <body>PNF profile to be used for the NS flavour.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_GYYOwDzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQ5hwD20Eeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQ5hwT20Eeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_hPmhQD20Eeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VJhq0j21Eeiu6I5JfRTxxQ" name="_nsProfile" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oZrZcEPiEeiVGPeZpaYNtQ" annotatedElement="_VJhq0j21Eeiu6I5JfRTxxQ">
+ <body>Specifies a NS Profile supported by this NS DF.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_GY8PcDzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VJjgAD21Eeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VJkHED21Eeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_VJf1oD21Eeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0f3mIj22Eeiu6I5JfRTxxQ" name="_vnfProfile" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_bbAZYJmeEeiSm9XNElOsxQ" annotatedElement="_0f3mIj22Eeiu6I5JfRTxxQ">
+ <body>VNF profile to be used for the NS flavour.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_45XE4DzEEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0f6CYD22Eeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0f6CYT22Eeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_0f2YAD22Eeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_kzQ4cD24Eeiu6I5JfRTxxQ" name="_dependencies">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_fCDYkJmeEeiSm9XNElOsxQ" annotatedElement="_kzQ4cD24Eeiu6I5JfRTxxQ">
+ <body>Specifies the order in which instances of the VNFs and/or nested NSs have to be created.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_beE2IDzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-P98UD24Eeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-Qh9AD24Eeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_kyvUAD24Eeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_nO14IT26Eeiu6I5JfRTxxQ" name="_virtualLinkprofile" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_UDjqsJmeEeiSm9XNElOsxQ" annotatedElement="_nO14IT26Eeiu6I5JfRTxxQ">
+ <body>VL profile to be used for the NS flavour.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_45bWUDzEEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nO3tUD26Eeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nO4UYD26Eeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_nOy00D26Eeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_13ZIsDzEEeiWMf5FLWfdLA" name="Vnffgd">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIsTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIsDzEEeiWMf5FLWfdLA">
+ <body>The Vnffgd class specifies a topology of connectivity of a NS and optionally forwarding rules applicable to the traffic conveyed over this topology.</body>
+ </ownedComment>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0xS58JmjEeiSm9XNElOsxQ" name="vnffgdId" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_-lbGcJmjEeiSm9XNElOsxQ" annotatedElement="_0xS58JmjEeiSm9XNElOsxQ">
+ <body>Identifier of this Vnffgd information element. It uniquely identifies a VNFFGD.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZItDzEEeiWMf5FLWfdLA" name="vnfdId" aggregation="shared">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13ZItTzEEeiWMf5FLWfdLA" annotatedElement="_13ZItDzEEeiWMf5FLWfdLA">
+ <body>References the VNFD of a constituent VNF.&#xD;
+NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it.&#xD;
+NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZItjzEEeiWMf5FLWfdLA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZItzzEEeiWMf5FLWfdLA" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZIwDzEEeiWMf5FLWfdLA" name="cpdPoolId" aggregation="shared">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIwTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIwDzEEeiWMf5FLWfdLA">
+ <body>A reference to a pool of descriptors of connection points attached to one of the constituent VNFs and PNFs and/or one of the SAPs of the parent NS or of a nested NS.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_kEZB9jzEEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZIwjzEEeiWMf5FLWfdLA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZIwzzEEeiWMf5FLWfdLA" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZIxDzEEeiWMf5FLWfdLA" name="nfpd" aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIxTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIxDzEEeiWMf5FLWfdLA">
+ <body>The network forwarding path associated to the VNFFG.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_13eBMDzEEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZIxjzEEeiWMf5FLWfdLA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZIxzzEEeiWMf5FLWfdLA" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0PyOoT2pEeiu6I5JfRTxxQ" name="_nsVirtualLinkDesc" type="_13WFYDzEEeiWMf5FLWfdLA" aggregation="shared">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_8WDdwEPhEeiVGPeZpaYNtQ" annotatedElement="_0PyOoT2pEeiu6I5JfRTxxQ">
+ <body>References the VLD of a constituent VL.&#xD;
+NOTE: The presence of a VLD identifier in a VNFFGD does not imply that all connection points of the VLs instantiated using this VL are connected to the VNFFG instantiated using the VNFFGD.&#xD;
+</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0P0D0D2pEeiu6I5JfRTxxQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0P0D0T2pEeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_0PwZcD2pEeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_DTJ1QT2sEeiu6I5JfRTxxQ" name="_pnfd" type="_13TCEDzEEeiWMf5FLWfdLA" aggregation="shared">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Aiu5kEPiEeiVGPeZpaYNtQ" annotatedElement="_DTJ1QT2sEeiu6I5JfRTxxQ">
+ <body>References the PNFD of a constituent PNF.&#xD;
+NOTE 1 : The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it.&#xD;
+NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD.&#xD;
+</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTLDYD2sEeiu6I5JfRTxxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DTLDYT2sEeiu6I5JfRTxxQ" value="*"/>
+ <association xmi:type="uml:Association" href="Service.uml#_DTInID2sEeiu6I5JfRTxxQ"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_45TagDzEEeiWMf5FLWfdLA" name="Sapd">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_45TagTzEEeiWMf5FLWfdLA" annotatedElement="_45TagDzEEeiWMf5FLWfdLA">
+ <body>The SAPD class specifies the information used to instantiate the service access points of an NS. A Sapd inherits from the Cpd class. All attributes of the Cpd are also attributes of the Sapd.</body>
+ </ownedComment>
+ <generalization xmi:type="uml:Generalization" xmi:id="_TsplgD2nEeiu6I5JfRTxxQ">
+ <general xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+ </generalization>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_45TagzzEEeiWMf5FLWfdLA" name="sapAddressAssignment">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_45TahDzEEeiWMf5FLWfdLA" annotatedElement="_45TagzzEEeiWMf5FLWfdLA">
+ <body>Specify whether the SAP address assignment is under the responsibility of management and orchestration functions or not. &#xD;
+If it is set to True, management and orchestration functions are responsible for assigning addresses to the access points instantiated from this SAPD.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_45TahTzEEeiWMf5FLWfdLA" name="associatedCpdId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_45TahjzEEeiWMf5FLWfdLA" annotatedElement="_45TahTzEEeiWMf5FLWfdLA">
+ <body>References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. </body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45TahzzEEeiWMf5FLWfdLA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45TaiDzEEeiWMf5FLWfdLA" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KDyg0JmcEeiSm9XNElOsxQ" name="nsVirtualLinkDescId" visibility="public" type="_13WFYDzEEeiWMf5FLWfdLA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_QkChwJmcEeiSm9XNElOsxQ" annotatedElement="_KDyg0JmcEeiSm9XNElOsxQ">
+ <body>References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to.</body>
+ </ownedComment>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJxwgJmcEeiSm9XNElOsxQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SKT8AJmcEeiSm9XNElOsxQ" value="1"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_13TCEDzEEeiWMf5FLWfdLA" name="Pnfd">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCETzEEeiWMf5FLWfdLA" annotatedElement="_13TCEDzEEeiWMf5FLWfdLA">
+ <body>The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only.</body>
+ </ownedComment>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCEjzEEeiWMf5FLWfdLA" name="pnfdId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCEzzEEeiWMf5FLWfdLA" annotatedElement="_13TCEjzEEeiWMf5FLWfdLA">
+ <body>Identifier of this Pnfd class. It uniquely identifies the PNFD.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_ijP2UEDOEeW6nNR00wt2vw"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCFDzEEeiWMf5FLWfdLA" name="provider">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFTzEEeiWMf5FLWfdLA" annotatedElement="_13TCFDzEEeiWMf5FLWfdLA">
+ <body>Identifies the provider of the PNFD.&#xD;
+NOTE: The provider of the PNFD might be different from the provider of the PNF.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCFjzEEeiWMf5FLWfdLA" name="version">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFzzEEeiWMf5FLWfdLA" annotatedElement="_13TCFjzEEeiWMf5FLWfdLA">
+ <body>Identifies the version of the PNFD</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_J90d8Jy-EeWdBv9DVHQu3Q"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCGDzEEeiWMf5FLWfdLA" name="security">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCGTzEEeiWMf5FLWfdLA" annotatedElement="_13TCGDzEEeiWMf5FLWfdLA">
+ <body>Provides a signature to prevent tampering.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="../NfvInformationModel/NfvModel.uml#_yS45sJy9EeWdBv9DVHQu3Q"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCGjzEEeiWMf5FLWfdLA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCGzzEEeiWMf5FLWfdLA" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCHDzEEeiWMf5FLWfdLA" name="pnfExtCpd " aggregation="composite">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_13TCHTzEEeiWMf5FLWfdLA" annotatedElement="_13TCHDzEEeiWMf5FLWfdLA">
+ <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>
+ </ownedComment>
+ <type xmi:type="uml:Class" href="Service.uml#_bd53ADzFEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCHjzEEeiWMf5FLWfdLA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCHzzEEeiWMf5FLWfdLA" value="*"/>
+ </ownedAttribute>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_lK_JcTOHEei5Af8DcjrhIQ" name="TypeDefinitions">
<packagedElement xmi:type="uml:DataType" xmi:id="_kEaPVjzEEeiWMf5FLWfdLA" name="NsLifeCycleManagementScript">
diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index 841efed..6461a96 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -65,35 +65,55 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D8M_QD0dEeiWMf5FLWfdLA" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_-82fMD2yEeiu6I5JfRTxxQ" name="NsDfHasNsLevel" memberEnd="_-83tUj2yEeiu6I5JfRTxxQ _-85igT2yEeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_-82fMD2yEeiu6I5JfRTxxQ" name="NsDfHasNsLevel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-83tUD2yEeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-83tUT2yEeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_-85igT2yEeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_-82fMD2yEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_-83tUj2yEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_-85igT2yEeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_-85igT2yEeiu6I5JfRTxxQ" name="_nsdf" association="_-82fMD2yEeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_acr4cD2zEeiu6I5JfRTxxQ" name="NsDfHasAffinityOrAntiAffinityGroup" memberEnd="_actGkj2zEeiu6I5JfRTxxQ _acwJ4T2zEeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_acr4cD2zEeiu6I5JfRTxxQ" name="NsDfHasAffinityOrAntiAffinityGroup">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_actGkD2zEeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_actGkT2zEeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_acwJ4T2zEeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_acr4cD2zEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_actGkj2zEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_acwJ4T2zEeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_acwJ4T2zEeiu6I5JfRTxxQ" name="_nsdf" association="_acr4cD2zEeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="__KYIYD2zEeiu6I5JfRTxxQ" name="NsDfHasScalingAspect" memberEnd="__KZ9kD2zEeiu6I5JfRTxxQ __KbywT2zEeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="__KYIYD2zEeiu6I5JfRTxxQ" name="NsDfHasScalingAspect">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KZWgD2zEeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KZWgT2zEeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="__KbywT2zEeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="__KYIYD2zEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#__KZ9kD2zEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#__KbywT2zEeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="__KbywT2zEeiu6I5JfRTxxQ" name="_nsdf" association="__KYIYD2zEeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_hPmhQD20Eeiu6I5JfRTxxQ" name="NsDfHasPnfProfile" memberEnd="_hPo9gD20Eeiu6I5JfRTxxQ _hQ6I0D20Eeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_hPmhQD20Eeiu6I5JfRTxxQ" name="NsDfHasPnfProfile">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPoWcD20Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPoWcT20Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_hQ6I0D20Eeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_hPmhQD20Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_hPo9gD20Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_hQ6I0D20Eeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hQ6I0D20Eeiu6I5JfRTxxQ" name="_nsdf" association="_hPmhQD20Eeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_VJf1oD21Eeiu6I5JfRTxxQ" name="NsDfHasNsProfile" memberEnd="_VJhq0j21Eeiu6I5JfRTxxQ _VJkHET21Eeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_VJf1oD21Eeiu6I5JfRTxxQ" name="NsDfHasNsProfile">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VJhq0D21Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VJhq0T21Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_VJkHET21Eeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_VJf1oD21Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_VJhq0j21Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_VJkHET21Eeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VJkHET21Eeiu6I5JfRTxxQ" name="_nsdf" association="_VJf1oD21Eeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_r-EZoD21Eeiu6I5JfRTxxQ" name="NsProfileAppliesToApplicableNsDf" memberEnd="_r-GO0T21Eeiu6I5JfRTxxQ _r-7VQD21Eeiu6I5JfRTxxQ">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r-FnwD21Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
@@ -113,11 +133,15 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fM2UcD22Eeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_0f2YAD22Eeiu6I5JfRTxxQ" name="NsDfHasVnfProfile" memberEnd="_0f3mIj22Eeiu6I5JfRTxxQ _0f6CYj22Eeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_0f2YAD22Eeiu6I5JfRTxxQ" name="NsDfHasVnfProfile">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0f3mID22Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0f3mIT22Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_0f6CYj22Eeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_0f2YAD22Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_0f3mIj22Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_0f6CYj22Eeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_0f6CYj22Eeiu6I5JfRTxxQ" name="_nsdf" association="_0f2YAD22Eeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_DqruAD24Eeiu6I5JfRTxxQ" name="VnfProfileReferencesVnfDf" memberEnd="_DquKQD24Eeiu6I5JfRTxxQ _Dqv_cT24Eeiu6I5JfRTxxQ">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DqtjMD24Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
@@ -128,11 +152,14 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QYgrgD24Eeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_kyvUAD24Eeiu6I5JfRTxxQ" name="NsDfHasProfileDependencies" memberEnd="_kyxJMj24Eeiu6I5JfRTxxQ _kzQ4cD24Eeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_kyvUAD24Eeiu6I5JfRTxxQ" name="NsDfHasProfileDependencies">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kyxJMD24Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kyxJMT24Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_kyxJMj24Eeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_kyvUAD24Eeiu6I5JfRTxxQ">
+ <memberEnd xmi:type="uml:Property" href="#_kyxJMj24Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_kzQ4cD24Eeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_kyxJMj24Eeiu6I5JfRTxxQ" name="_nsdf" association="_kyvUAD24Eeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ky6TID24Eeiu6I5JfRTxxQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kzFSQD24Eeiu6I5JfRTxxQ" value="1"/>
</ownedEnd>
@@ -164,11 +191,15 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a7R0wD26Eeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_nOy00D26Eeiu6I5JfRTxxQ" name="NsDfHasVirtualLinkProfile" memberEnd="_nO14IT26Eeiu6I5JfRTxxQ _nO4UYT26Eeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_nOy00D26Eeiu6I5JfRTxxQ" name="NsDfHasVirtualLinkProfile">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nO1RED26Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nO14ID26Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_nO4UYT26Eeiu6I5JfRTxxQ" name="_nsDf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_nOy00D26Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_nO14IT26Eeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_nO4UYT26Eeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_nO4UYT26Eeiu6I5JfRTxxQ" name="_nsDf" association="_nOy00D26Eeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_PAOikD27Eeiu6I5JfRTxxQ" name="VirtualLinkProfileReferencesVLDesc" memberEnd="_PAQXwj27Eeiu6I5JfRTxxQ _PASM8j27Eeiu6I5JfRTxxQ">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PAQXwD27Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
@@ -341,11 +372,14 @@
<type xmi:type="uml:Class" href="Resource.uml#_13KfMDzEEeiWMf5FLWfdLA"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_0PwZcD2pEeiu6I5JfRTxxQ" name="VnffgdHasConstituentVirtualLinkDesc" memberEnd="_0PyOoT2pEeiu6I5JfRTxxQ _0P0q4D2pEeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_0PwZcD2pEeiu6I5JfRTxxQ" name="VnffgdHasConstituentVirtualLinkDesc">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0PxnkD2pEeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0PyOoD2pEeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_0P0q4D2pEeiu6I5JfRTxxQ" name="_vnffgd" type="_13ZIsDzEEeiWMf5FLWfdLA" association="_0PwZcD2pEeiu6I5JfRTxxQ">
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_0PyOoT2pEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_0P0q4D2pEeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_0P0q4D2pEeiu6I5JfRTxxQ" name="_vnffgd" association="_0PwZcD2pEeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GHl9sD2qEeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GLzIQD2qEeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
@@ -384,11 +418,14 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7ezvMD2rEeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_DTInID2sEeiu6I5JfRTxxQ" name="VnffgdHasConstituentPnfds" memberEnd="_DTJ1QT2sEeiu6I5JfRTxxQ _DTLDYj2sEeiu6I5JfRTxxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_DTInID2sEeiu6I5JfRTxxQ" name="VnffgdHasConstituentPnfds">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DTJOMD2sEeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DTJ1QD2sEeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_DTLDYj2sEeiu6I5JfRTxxQ" name="_vnffgd" type="_13ZIsDzEEeiWMf5FLWfdLA" association="_DTInID2sEeiu6I5JfRTxxQ">
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_DTJ1QT2sEeiu6I5JfRTxxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_DTLDYj2sEeiu6I5JfRTxxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_DTLDYj2sEeiu6I5JfRTxxQ" name="_vnffgd" association="_DTInID2sEeiu6I5JfRTxxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P7P-MD2sEeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P7vGYD2sEeiu6I5JfRTxxQ" value="*"/>
</ownedEnd>
@@ -544,11 +581,15 @@ If null, then represents to the end of time&#xD;
</eAnnotations>
<ownedEnd xmi:type="uml:Property" xmi:id="_ZzrIIJDrEei9Vqs7Ti8Wxg" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_ZzapcJDrEei9Vqs7Ti8Wxg"/>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_Cs71wJmhEeiSm9XNElOsxQ" name="NsDfHasDefaultNsLevel" memberEnd="_CtSbEJmhEeiSm9XNElOsxQ _CtVeYJmhEeiSm9XNElOsxQ">
+ <packagedElement xmi:type="uml:Association" xmi:id="_Cs71wJmhEeiSm9XNElOsxQ" name="NsDfHasDefaultNsLevel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CtPXwJmhEeiSm9XNElOsxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CtP-0JmhEeiSm9XNElOsxQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_CtVeYJmhEeiSm9XNElOsxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_Cs71wJmhEeiSm9XNElOsxQ"/>
+ <memberEnd xmi:type="uml:Property" href="Resource.uml#_CtSbEJmhEeiSm9XNElOsxQ"/>
+ <memberEnd xmi:type="uml:Property" href="#_CtVeYJmhEeiSm9XNElOsxQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_CtVeYJmhEeiSm9XNElOsxQ" name="_nsdf" association="_Cs71wJmhEeiSm9XNElOsxQ">
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </ownedEnd>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces"/>
@@ -832,10 +873,11 @@ NS levels may be used in the context of NS scaling and in this case they are ref
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GY8PfzzFEeiWMf5FLWfdLA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GY8PgDzFEeiWMf5FLWfdLA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_r-GO0T21Eeiu6I5JfRTxxQ" name="_nsdf" type="_13gdcDzEEeiWMf5FLWfdLA" association="_r-EZoD21Eeiu6I5JfRTxxQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_r-GO0T21Eeiu6I5JfRTxxQ" name="_nsdf" association="_r-EZoD21Eeiu6I5JfRTxxQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_Tf8_QEPnEeiVGPeZpaYNtQ" annotatedElement="_r-GO0T21Eeiu6I5JfRTxxQ">
<body>Identifies the applicable NS DF within the scope of the NSD.</body>
</ownedComment>
+ <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r-rdoD21Eeiu6I5JfRTxxQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r-0AgD21Eeiu6I5JfRTxxQ" value="1"/>
</ownedAttribute>
@@ -1417,220 +1459,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
<packagedElement xmi:type="uml:Class" xmi:id="_BQaDwJpZEeidy9iGT_F5-w" name="ServiceDescComposite">
<generalization xmi:type="uml:Generalization" xmi:id="_LfWkAJpZEeidy9iGT_F5-w" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_13TCEDzEEeiWMf5FLWfdLA" name="Pnfd">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCETzEEeiWMf5FLWfdLA" annotatedElement="_13TCEDzEEeiWMf5FLWfdLA">
- <body>The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only.</body>
- </ownedComment>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCEjzEEeiWMf5FLWfdLA" name="pnfdId">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCEzzEEeiWMf5FLWfdLA" annotatedElement="_13TCEjzEEeiWMf5FLWfdLA">
- <body>Identifier of this Pnfd class. It uniquely identifies the PNFD.</body>
- </ownedComment>
- <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_ijP2UEDOEeW6nNR00wt2vw"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCFDzEEeiWMf5FLWfdLA" name="provider">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFTzEEeiWMf5FLWfdLA" annotatedElement="_13TCFDzEEeiWMf5FLWfdLA">
- <body>Identifies the provider of the PNFD.&#xD;
-NOTE: The provider of the PNFD might be different from the provider of the PNF.</body>
- </ownedComment>
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCFjzEEeiWMf5FLWfdLA" name="version">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFzzEEeiWMf5FLWfdLA" annotatedElement="_13TCFjzEEeiWMf5FLWfdLA">
- <body>Identifies the version of the PNFD</body>
- </ownedComment>
- <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_J90d8Jy-EeWdBv9DVHQu3Q"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCGDzEEeiWMf5FLWfdLA" name="security">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCGTzEEeiWMf5FLWfdLA" annotatedElement="_13TCGDzEEeiWMf5FLWfdLA">
- <body>Provides a signature to prevent tampering.</body>
- </ownedComment>
- <type xmi:type="uml:DataType" href="../NfvInformationModel/NfvModel.uml#_yS45sJy9EeWdBv9DVHQu3Q"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCGjzEEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCGzzEEeiWMf5FLWfdLA" value="1"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCHDzEEeiWMf5FLWfdLA" name="pnfExtCpd " type="_bd53ADzFEeiWMf5FLWfdLA" aggregation="composite">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13TCHTzEEeiWMf5FLWfdLA" annotatedElement="_13TCHDzEEeiWMf5FLWfdLA">
- <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCHjzEEeiWMf5FLWfdLA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCHzzEEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_13gdcDzEEeiWMf5FLWfdLA" name="NsDf">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13gdcTzEEeiWMf5FLWfdLA" annotatedElement="_13gdcDzEEeiWMf5FLWfdLA">
- <body>The NsDf class specifies the properties of a variant of an NS.&#xD;
-NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0.</body>
- </ownedComment>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13gdcjzEEeiWMf5FLWfdLA" name="nsDfId">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13gdczzEEeiWMf5FLWfdLA" annotatedElement="_13gdcjzEEeiWMf5FLWfdLA">
- <body>Identifies this NsDf class. It identifies a NS DF within the NSD.</body>
- </ownedComment>
- <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13gddDzEEeiWMf5FLWfdLA" name="flavourKey">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13gddTzEEeiWMf5FLWfdLA" annotatedElement="_13gddDzEEeiWMf5FLWfdLA">
- <body>Assurance parameter against which this flavour is being described. The key can be a combination of multiple assurance parameters with a logical relationship between them. The parameters should be present as a monitoredInfo attribute in the NSD.</body>
- </ownedComment>
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_OGFC0JmiEeiSm9XNElOsxQ" name="monitoredInfo" visibility="public">
- <ownedComment xmi:type="uml:Comment" xmi:id="_XGghgJmiEeiSm9XNElOsxQ" annotatedElement="_OGFC0JmiEeiSm9XNElOsxQ">
- <body>Identifies either a virtualised resource-related performance metric or a VNF Indicator.</body>
- </ownedComment>
- <type xmi:type="uml:DataType" href="Resource.uml#_kEZoSDzEEeiWMf5FLWfdLA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YgQisJmiEeiSm9XNElOsxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YgtOoJmiEeiSm9XNElOsxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_-83tUj2yEeiu6I5JfRTxxQ" name="_nsInstantiationLevel" type="_GYs-4DzFEeiWMf5FLWfdLA" aggregation="composite" association="_-82fMD2yEeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_VsHHEEPiEeiVGPeZpaYNtQ" annotatedElement="_-83tUj2yEeiu6I5JfRTxxQ">
- <body>Describes the details of an NS level.&#xD;
-NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0.&#xD;
-</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-847cD2yEeiu6I5JfRTxxQ" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-85igD2yEeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_CtSbEJmhEeiSm9XNElOsxQ" name="_defaultNsInstantiationLevel" type="_GYs-4DzFEeiWMf5FLWfdLA" aggregation="composite" association="_Cs71wJmhEeiSm9XNElOsxQ">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CtUQQJmhEeiSm9XNElOsxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CtU3UJmhEeiSm9XNElOsxQ" value="1"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_actGkj2zEeiu6I5JfRTxxQ" name="_affinityOrAntiAffinitygroup" aggregation="composite" association="_acr4cD2zEeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_cByPsEPiEeiVGPeZpaYNtQ" annotatedElement="_actGkj2zEeiu6I5JfRTxxQ">
- <body>Specifies affinity or anti-affinity relationship applicable between the VNF instances created using different VNFDs, the Virtual Link instances created using different NsVirtualLinkDescs or the nested NS instances created using different NSDs in the same affinity or anti-affinity group.</body>
- </ownedComment>
- <type xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_acvi0D2zEeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_acwJ4D2zEeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="__KZ9kD2zEeiu6I5JfRTxxQ" name="_scalingAspect" type="_GYmRMDzFEeiWMf5FLWfdLA" aggregation="composite" association="__KYIYD2zEeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_e9QiUEPiEeiVGPeZpaYNtQ" annotatedElement="__KZ9kD2zEeiu6I5JfRTxxQ">
- <body>The scaling aspects supported by this DF of the NS.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__KbLsD2zEeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__KbywD2zEeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_hPo9gD20Eeiu6I5JfRTxxQ" name="_pnfProfile" type="_GYYOwDzFEeiWMf5FLWfdLA" aggregation="composite" association="_hPmhQD20Eeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_igKoYEPiEeiVGPeZpaYNtQ" annotatedElement="_hPo9gD20Eeiu6I5JfRTxxQ">
- <body>PNF profile to be used for the NS flavour.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQ5hwD20Eeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQ5hwT20Eeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_VJhq0j21Eeiu6I5JfRTxxQ" name="_nsProfile" type="_GY8PcDzFEeiWMf5FLWfdLA" aggregation="composite" association="_VJf1oD21Eeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_oZrZcEPiEeiVGPeZpaYNtQ" annotatedElement="_VJhq0j21Eeiu6I5JfRTxxQ">
- <body>Specifies a NS Profile supported by this NS DF.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VJjgAD21Eeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VJkHED21Eeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_0f3mIj22Eeiu6I5JfRTxxQ" name="_vnfProfile" type="_45XE4DzEEeiWMf5FLWfdLA" aggregation="composite" association="_0f2YAD22Eeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_bbAZYJmeEeiSm9XNElOsxQ" annotatedElement="_0f3mIj22Eeiu6I5JfRTxxQ">
- <body>VNF profile to be used for the NS flavour.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0f6CYD22Eeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0f6CYT22Eeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_kzQ4cD24Eeiu6I5JfRTxxQ" name="_dependencies" type="_beE2IDzFEeiWMf5FLWfdLA" association="_kyvUAD24Eeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_fCDYkJmeEeiSm9XNElOsxQ" annotatedElement="_kzQ4cD24Eeiu6I5JfRTxxQ">
- <body>Specifies the order in which instances of the VNFs and/or nested NSs have to be created.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-P98UD24Eeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-Qh9AD24Eeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_nO14IT26Eeiu6I5JfRTxxQ" name="_virtualLinkprofile" type="_45bWUDzEEeiWMf5FLWfdLA" aggregation="composite" association="_nOy00D26Eeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_UDjqsJmeEeiSm9XNElOsxQ" annotatedElement="_nO14IT26Eeiu6I5JfRTxxQ">
- <body>VL profile to be used for the NS flavour.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nO3tUD26Eeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nO4UYD26Eeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_13ZIsDzEEeiWMf5FLWfdLA" name="Vnffgd">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIsTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIsDzEEeiWMf5FLWfdLA">
- <body>The Vnffgd class specifies a topology of connectivity of a NS and optionally forwarding rules applicable to the traffic conveyed over this topology.</body>
- </ownedComment>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_0xS58JmjEeiSm9XNElOsxQ" name="vnffgdId" visibility="public">
- <ownedComment xmi:type="uml:Comment" xmi:id="_-lbGcJmjEeiSm9XNElOsxQ" annotatedElement="_0xS58JmjEeiSm9XNElOsxQ">
- <body>Identifier of this Vnffgd information element. It uniquely identifies a VNFFGD.</body>
- </ownedComment>
- <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZItDzEEeiWMf5FLWfdLA" name="vnfdId" aggregation="shared">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13ZItTzEEeiWMf5FLWfdLA" annotatedElement="_13ZItDzEEeiWMf5FLWfdLA">
- <body>References the VNFD of a constituent VNF.&#xD;
-NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it.&#xD;
-NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD.</body>
- </ownedComment>
- <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZItjzEEeiWMf5FLWfdLA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZItzzEEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZIwDzEEeiWMf5FLWfdLA" name="cpdPoolId" type="_kEZB9jzEEeiWMf5FLWfdLA" aggregation="shared">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIwTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIwDzEEeiWMf5FLWfdLA">
- <body>A reference to a pool of descriptors of connection points attached to one of the constituent VNFs and PNFs and/or one of the SAPs of the parent NS or of a nested NS.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZIwjzEEeiWMf5FLWfdLA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZIwzzEEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_13ZIxDzEEeiWMf5FLWfdLA" name="nfpd" type="_13eBMDzEEeiWMf5FLWfdLA" aggregation="composite">
- <ownedComment xmi:type="uml:Comment" xmi:id="_13ZIxTzEEeiWMf5FLWfdLA" annotatedElement="_13ZIxDzEEeiWMf5FLWfdLA">
- <body>The network forwarding path associated to the VNFFG.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13ZIxjzEEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13ZIxzzEEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_0PyOoT2pEeiu6I5JfRTxxQ" name="_nsVirtualLinkDesc" aggregation="shared" association="_0PwZcD2pEeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_8WDdwEPhEeiVGPeZpaYNtQ" annotatedElement="_0PyOoT2pEeiu6I5JfRTxxQ">
- <body>References the VLD of a constituent VL.&#xD;
-NOTE: The presence of a VLD identifier in a VNFFGD does not imply that all connection points of the VLs instantiated using this VL are connected to the VNFFG instantiated using the VNFFGD.&#xD;
-</body>
- </ownedComment>
- <type xmi:type="uml:Class" href="Resource.uml#_13WFYDzEEeiWMf5FLWfdLA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0P0D0D2pEeiu6I5JfRTxxQ" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0P0D0T2pEeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_DTJ1QT2sEeiu6I5JfRTxxQ" name="_pnfd" type="_13TCEDzEEeiWMf5FLWfdLA" aggregation="shared" association="_DTInID2sEeiu6I5JfRTxxQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_Aiu5kEPiEeiVGPeZpaYNtQ" annotatedElement="_DTJ1QT2sEeiu6I5JfRTxxQ">
- <body>References the PNFD of a constituent PNF.&#xD;
-NOTE 1 : The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it.&#xD;
-NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD.&#xD;
-</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTLDYD2sEeiu6I5JfRTxxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DTLDYT2sEeiu6I5JfRTxxQ" value="*"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_45TagDzEEeiWMf5FLWfdLA" name="Sapd">
- <ownedComment xmi:type="uml:Comment" xmi:id="_45TagTzEEeiWMf5FLWfdLA" annotatedElement="_45TagDzEEeiWMf5FLWfdLA">
- <body>The SAPD class specifies the information used to instantiate the service access points of an NS. A Sapd inherits from the Cpd class. All attributes of the Cpd are also attributes of the Sapd.</body>
- </ownedComment>
- <generalization xmi:type="uml:Generalization" xmi:id="_TsplgD2nEeiu6I5JfRTxxQ">
- <general xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
- </generalization>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_45TagzzEEeiWMf5FLWfdLA" name="sapAddressAssignment">
- <ownedComment xmi:type="uml:Comment" xmi:id="_45TahDzEEeiWMf5FLWfdLA" annotatedElement="_45TagzzEEeiWMf5FLWfdLA">
- <body>Specify whether the SAP address assignment is under the responsibility of management and orchestration functions or not. &#xD;
-If it is set to True, management and orchestration functions are responsible for assigning addresses to the access points instantiated from this SAPD.</body>
- </ownedComment>
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_45TahTzEEeiWMf5FLWfdLA" name="associatedCpdId">
- <ownedComment xmi:type="uml:Comment" xmi:id="_45TahjzEEeiWMf5FLWfdLA" annotatedElement="_45TahTzEEeiWMf5FLWfdLA">
- <body>References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. </body>
- </ownedComment>
- <type xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45TahzzEEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45TaiDzEEeiWMf5FLWfdLA" value="1"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_KDyg0JmcEeiSm9XNElOsxQ" name="nsVirtualLinkDescId" visibility="public">
- <ownedComment xmi:type="uml:Comment" xmi:id="_QkChwJmcEeiSm9XNElOsxQ" annotatedElement="_KDyg0JmcEeiSm9XNElOsxQ">
- <body>References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to.</body>
- </ownedComment>
- <type xmi:type="uml:Class" href="Resource.uml#_13WFYDzEEeiWMf5FLWfdLA"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJxwgJmcEeiSm9XNElOsxQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SKT8AJmcEeiSm9XNElOsxQ" value="1"/>
- </ownedAttribute>
- </packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_6GSVkDzFEeiWMf5FLWfdLA" name="Pnf">
<ownedComment xmi:type="uml:Comment" xmi:id="_6GSVkTzFEeiWMf5FLWfdLA" annotatedElement="_6GSVkDzFEeiWMf5FLWfdLA">
<body>An implementation of a NF via a tightly coupled software and hardware system.</body>
@@ -1863,12 +1691,24 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
<OpenModel_Profile:OpenModelAttribute xmi:id="_euxkoKbuEeixw5Ke5QD1pQ">
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGbDzEEeiWMf5FLWfdLA"/>
</OpenModel_Profile:OpenModelAttribute>
- <OpenModel_Profile:OpenModelClass xmi:id="_13TpIDzEEeiWMf5FLWfdLA" base_Class="_13TCEDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpITzEEeiWMf5FLWfdLA" base_StructuralFeature="_13TCEjzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIjzEEeiWMf5FLWfdLA" base_StructuralFeature="_13TCFDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIzzEEeiWMf5FLWfdLA" base_StructuralFeature="_13TCFjzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJDzEEeiWMf5FLWfdLA" base_StructuralFeature="_13TCGDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13TCHDzEEeiWMf5FLWfdLA"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_13TpIDzEEeiWMf5FLWfdLA">
+ <base_Class xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelClass>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpITzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCEjzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIjzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCFDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIzzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCFjzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJDzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCGDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJTzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCHDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelClass xmi:id="_eu9K0KbuEeixw5Ke5QD1pQ">
<base_Class xmi:type="uml:Class" href="Resource.uml#_13WFYDzEEeiWMf5FLWfdLA"/>
</OpenModel_Profile:OpenModelClass>
@@ -1884,20 +1724,40 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
<OpenModel_Profile:OpenModelAttribute xmi:id="_evBcQKbuEeixw5Ke5QD1pQ">
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13WFbTzEEeiWMf5FLWfdLA"/>
</OpenModel_Profile:OpenModelAttribute>
- <OpenModel_Profile:OpenModelClass xmi:id="_13ZIyDzEEeiWMf5FLWfdLA" base_Class="_13ZIsDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvwTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13ZItDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxDzEEeiWMf5FLWfdLA" base_StructuralFeature="_13ZIwDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13ZIxDzEEeiWMf5FLWfdLA"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_13ZIyDzEEeiWMf5FLWfdLA">
+ <base_Class xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelClass>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvwTzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZItDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxDzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZIwDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxTzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZIxDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelClass xmi:id="_13eBPDzEEeiWMf5FLWfdLA" base_Class="_13eBMDzEEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQDzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBMjzEEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBNDzEEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQjzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBODzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_13hrkDzEEeiWMf5FLWfdLA" base_Class="_13gdcDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13hrkTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13gdcjzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_13iSoDzEEeiWMf5FLWfdLA" base_StructuralFeature="_13gddDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_45UBkDzEEeiWMf5FLWfdLA" base_Class="_45TagDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsDzEEeiWMf5FLWfdLA" base_StructuralFeature="_45TagzzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsTzEEeiWMf5FLWfdLA" base_StructuralFeature="_45TahTzEEeiWMf5FLWfdLA"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_13hrkDzEEeiWMf5FLWfdLA">
+ <base_Class xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelClass>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13hrkTzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13gdcjzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_13iSoDzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13gddDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelClass xmi:id="_45UBkDzEEeiWMf5FLWfdLA">
+ <base_Class xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelClass>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsDzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_45TagzzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsTzEEeiWMf5FLWfdLA">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelClass xmi:id="_45Xr8DzEEeiWMf5FLWfdLA" base_Class="_45XE4DzEEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_45Xr8TzEEeiWMf5FLWfdLA" base_StructuralFeature="_45XE4zzEEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_45YTADzEEeiWMf5FLWfdLA" base_StructuralFeature="_45XE6zzEEeiWMf5FLWfdLA"/>
@@ -2018,7 +1878,9 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_Wi5kcj2oEeiu6I5JfRTxxQ"/>
</OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_Wi8Asj2oEeiu6I5JfRTxxQ" base_StructuralFeature="_Wi8AsT2oEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_0Py1sD2pEeiu6I5JfRTxxQ" base_StructuralFeature="_0PyOoT2pEeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_0Py1sD2pEeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0PyOoT2pEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_0P0q4T2pEeiu6I5JfRTxxQ" base_StructuralFeature="_0P0q4D2pEeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_eu3EMabuEeixw5Ke5QD1pQ">
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_YX8Ikj2qEeiu6I5JfRTxxQ"/>
@@ -2032,39 +1894,57 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_wdAOoD2rEeiu6I5JfRTxxQ"/>
</OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_wdCq4T2rEeiu6I5JfRTxxQ" base_StructuralFeature="_wdCq4D2rEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_DTJ1Qj2sEeiu6I5JfRTxxQ" base_StructuralFeature="_DTJ1QT2sEeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_DTJ1Qj2sEeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_DTJ1QT2sEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_DTLqcD2sEeiu6I5JfRTxxQ" base_StructuralFeature="_DTLDYj2sEeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_eu78sKbuEeixw5Ke5QD1pQ">
<base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_yX0DkD2tEeiu6I5JfRTxxQ"/>
</OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_yX3G4D2tEeiu6I5JfRTxxQ" base_StructuralFeature="_yX2f0D2tEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_-84UYD2yEeiu6I5JfRTxxQ" base_StructuralFeature="_-83tUj2yEeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_-84UYD2yEeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_-83tUj2yEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_-85igj2yEeiu6I5JfRTxxQ" base_StructuralFeature="_-85igT2yEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_acttoD2zEeiu6I5JfRTxxQ" base_StructuralFeature="_actGkj2zEeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_acttoD2zEeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_actGkj2zEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_acww8D2zEeiu6I5JfRTxxQ" base_StructuralFeature="_acwJ4T2zEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="__KZ9kT2zEeiu6I5JfRTxxQ" base_StructuralFeature="__KZ9kD2zEeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="__KZ9kT2zEeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#__KZ9kD2zEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="__Kbywj2zEeiu6I5JfRTxxQ" base_StructuralFeature="__KbywT2zEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_hPo9gT20Eeiu6I5JfRTxxQ" base_StructuralFeature="_hPo9gD20Eeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_hPo9gT20Eeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_hPo9gD20Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_hQ6I0T20Eeiu6I5JfRTxxQ" base_StructuralFeature="_hQ6I0D20Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_VJiR4D21Eeiu6I5JfRTxxQ" base_StructuralFeature="_VJhq0j21Eeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_VJiR4D21Eeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_VJhq0j21Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_VJkuID21Eeiu6I5JfRTxxQ" base_StructuralFeature="_VJkHET21Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_r-GO0j21Eeiu6I5JfRTxxQ" base_StructuralFeature="_r-GO0T21Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_r-78UD21Eeiu6I5JfRTxxQ" base_StructuralFeature="_r-7VQD21Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_LJFrMD22Eeiu6I5JfRTxxQ" base_StructuralFeature="_LJFEIj22Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_LJdeoT22Eeiu6I5JfRTxxQ" base_StructuralFeature="_LJdeoD22Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_0f4NMD22Eeiu6I5JfRTxxQ" base_StructuralFeature="_0f3mIj22Eeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_0f4NMD22Eeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0f3mIj22Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_0f6CYz22Eeiu6I5JfRTxxQ" base_StructuralFeature="_0f6CYj22Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_DquKQT24Eeiu6I5JfRTxxQ" base_StructuralFeature="_DquKQD24Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_Dqv_cj24Eeiu6I5JfRTxxQ" base_StructuralFeature="_Dqv_cT24Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_kyxJMz24Eeiu6I5JfRTxxQ" base_StructuralFeature="_kyxJMj24Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_kzQ4cT24Eeiu6I5JfRTxxQ" base_StructuralFeature="_kzQ4cD24Eeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_kzQ4cT24Eeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kzQ4cD24Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_IhnyUj25Eeiu6I5JfRTxxQ" base_StructuralFeature="_IhnyUT25Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_Ihq1oT25Eeiu6I5JfRTxxQ" base_StructuralFeature="_Ihq1oD25Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_g9bZ4D25Eeiu6I5JfRTxxQ" base_StructuralFeature="_g9ay0T25Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_g9coAj25Eeiu6I5JfRTxxQ" base_StructuralFeature="_g9coAT25Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_PKjYsD26Eeiu6I5JfRTxxQ" base_StructuralFeature="_PKixoj26Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_PK26sj26Eeiu6I5JfRTxxQ" base_StructuralFeature="_PK26sT26Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_nO2fMD26Eeiu6I5JfRTxxQ" base_StructuralFeature="_nO14IT26Eeiu6I5JfRTxxQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_nO2fMD26Eeiu6I5JfRTxxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_nO14IT26Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_nO4UYj26Eeiu6I5JfRTxxQ" base_StructuralFeature="_nO4UYT26Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_PAQXwz27Eeiu6I5JfRTxxQ" base_StructuralFeature="_PAQXwj27Eeiu6I5JfRTxxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_PAS0AD27Eeiu6I5JfRTxxQ" base_StructuralFeature="_PASM8j27Eeiu6I5JfRTxxQ"/>
@@ -2173,33 +2053,85 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
<OpenModel_Profile:Experimental xmi:id="_euzZ0KbuEeixw5Ke5QD1pQ">
<base_Element xmi:type="uml:Property" href="Resource.uml#_jBZXYD2mEeiu6I5JfRTxxQ"/>
</OpenModel_Profile:Experimental>
- <OpenModel_Profile:Experimental xmi:id="_pjjIwJmbEeiSm9XNElOsxQ" base_Element="_45TagDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:Experimental xmi:id="_sLwhIJmbEeiSm9XNElOsxQ" base_Element="_45TagzzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:Experimental xmi:id="_0PYZUJmbEeiSm9XNElOsxQ" base_Element="_45TahTzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:PassedByReference xmi:id="_5aPUoJmbEeiSm9XNElOsxQ" base_Property="_45TahTzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_KDzu8JmcEeiSm9XNElOsxQ" base_StructuralFeature="_KDyg0JmcEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_Yk-SUJmcEeiSm9XNElOsxQ" base_Element="_KDyg0JmcEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:PassedByReference xmi:id="_YlugQJmcEeiSm9XNElOsxQ" base_Property="_KDyg0JmcEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_G79XwJmdEeiSm9XNElOsxQ" base_Element="_13gdcDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:Experimental xmi:id="_N0R6cJmdEeiSm9XNElOsxQ" base_Element="_13gdcjzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:Experimental xmi:id="_Q5bGcJmdEeiSm9XNElOsxQ" base_Element="_13gddDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:Experimental xmi:id="_i3SaMJmdEeiSm9XNElOsxQ" base_Element="_-83tUj2yEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_zEzxsJmdEeiSm9XNElOsxQ" base_Element="_actGkj2zEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_6QSg8JmdEeiSm9XNElOsxQ" base_Element="__KZ9kD2zEeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_9zx10JmdEeiSm9XNElOsxQ" base_Element="_hPo9gD20Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_CvGgUJmeEeiSm9XNElOsxQ" base_Element="_VJhq0j21Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_HzNTYJmeEeiSm9XNElOsxQ" base_Element="_0f3mIj22Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_MgxOsJmeEeiSm9XNElOsxQ" base_Element="_kzQ4cD24Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_RBirMJmeEeiSm9XNElOsxQ" base_Element="_nO14IT26Eeiu6I5JfRTxxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_CtTpMJmhEeiSm9XNElOsxQ" base_StructuralFeature="_CtSbEJmhEeiSm9XNElOsxQ"/>
+ <OpenModel_Profile:Experimental xmi:id="_pjjIwJmbEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_sLwhIJmbEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_45TagzzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_0PYZUJmbEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:PassedByReference xmi:id="_5aPUoJmbEeiSm9XNElOsxQ">
+ <base_Property xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:PassedByReference>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_KDzu8JmcEeiSm9XNElOsxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:Experimental xmi:id="_Yk-SUJmcEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:PassedByReference xmi:id="_YlugQJmcEeiSm9XNElOsxQ">
+ <base_Property xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:PassedByReference>
+ <OpenModel_Profile:Experimental xmi:id="_G79XwJmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_N0R6cJmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_13gdcjzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_Q5bGcJmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_13gddDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_i3SaMJmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_-83tUj2yEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_zEzxsJmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_actGkj2zEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_6QSg8JmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#__KZ9kD2zEeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_9zx10JmdEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_hPo9gD20Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_CvGgUJmeEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_VJhq0j21Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_HzNTYJmeEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_0f3mIj22Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_MgxOsJmeEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_kzQ4cD24Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_RBirMJmeEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_nO14IT26Eeiu6I5JfRTxxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_CtTpMJmhEeiSm9XNElOsxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_CtSbEJmhEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
<OpenModel_Profile:OpenModelAttribute xmi:id="_CtWFcJmhEeiSm9XNElOsxQ" base_StructuralFeature="_CtVeYJmhEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_doePIJmhEeiSm9XNElOsxQ" base_Element="_CtSbEJmhEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_OGG4AJmiEeiSm9XNElOsxQ" base_StructuralFeature="_OGFC0JmiEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_fzEB8JmiEeiSm9XNElOsxQ" base_Element="_OGFC0JmiEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_Ebf-cJmjEeiSm9XNElOsxQ" base_Element="_13ZIsDzEEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_0xThAZmjEeiSm9XNElOsxQ" base_StructuralFeature="_0xS58JmjEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_GKA5QJmkEeiSm9XNElOsxQ" base_Element="_0xS58JmjEeiSm9XNElOsxQ"/>
- <OpenModel_Profile:Experimental xmi:id="_aWuqMJmkEeiSm9XNElOsxQ" base_Element="_13TCEDzEEeiWMf5FLWfdLA"/>
+ <OpenModel_Profile:Experimental xmi:id="_doePIJmhEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_CtSbEJmhEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_OGG4AJmiEeiSm9XNElOsxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_OGFC0JmiEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:Experimental xmi:id="_fzEB8JmiEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_OGFC0JmiEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_Ebf-cJmjEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_0xThAZmjEeiSm9XNElOsxQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0xS58JmjEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:Experimental xmi:id="_GKA5QJmkEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Property" href="Resource.uml#_0xS58JmjEeiSm9XNElOsxQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_aWuqMJmkEeiSm9XNElOsxQ">
+ <base_Element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+ </OpenModel_Profile:Experimental>
<OpenModel_Profile:OpenModelAttribute xmi:id="_y6aiAqLREeiz_K9hWIugxQ" base_StructuralFeature="_y6aiAKLREeiz_K9hWIugxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_y6bwIqLREeiz_K9hWIugxQ" base_StructuralFeature="_y6bwIKLREeiz_K9hWIugxQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_evzfYKbuEeixw5Ke5QD1pQ">