diff options
author | Hui Deng <denghui12@huawei.com> | 2018-12-10 10:37:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-12-10 10:37:39 +0000 |
commit | 5f34e94be6922558b4dd2e5eab44fff10ea70665 (patch) | |
tree | 4481249c3f5918f1e154db7435f534dc3dff8ab7 | |
parent | 9bf056a5d3d6efb44a543ef82d201882fd97c8c1 (diff) | |
parent | 6c461dfc2ae4e41682bbdf88a12534e61b338279 (diff) |
Merge "Vnf new requirements" into R3workingbranch
-rw-r--r-- | papyrus/ONAP Information Model/Vnf.notation | 374 | ||||
-rw-r--r-- | papyrus/ONAP Information Model/Vnf.uml | 148 |
2 files changed, 507 insertions, 15 deletions
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation index ceabf9c..b37ea09 100644 --- a/papyrus/ONAP Information Model/Vnf.notation +++ b/papyrus/ONAP Information Model/Vnf.notation @@ -142,6 +142,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_HklksDkLEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_-pkC0TmsEeiWMf5FLWfdLA"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_mTHYUPt7EeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI" fillColor="255">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vI-McPuAEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-McfuAEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-McvuAEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-Mc_uAEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_mTaTQPt7EeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_mTaTQft7EeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mTaTQvt7EeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_mP8vkPt7EeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_mTHYUft7EeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_aai6ITOREeiHat9KcP8uWA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_aai6IjOREeiHat9KcP8uWA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_aai6IzOREeiHat9KcP8uWA"/>
@@ -248,6 +262,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_HN9eEDmzEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_UpzYITmzEeiWMf5FLWfdLA"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_qy-nIPuBEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AZutIPuCEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AZutIfuCEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AZutIvuCEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AZutI_uCEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_qzQ7APuBEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_qzQ7AfuBEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qzQ7AvuBEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_qwmBgPuBEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_qy-nIfuBEeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_e5ZrEzOREeiHat9KcP8uWA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_e5ZrFDOREeiHat9KcP8uWA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_e5ZrFTOREeiHat9KcP8uWA"/>
@@ -560,6 +588,48 @@ <element xmi:type="uml:Property" href="Vnf.uml#_9jZuMDdKEeiIfPeSAqyGdQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_9not8TdKEeiIfPeSAqyGdQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_QQpzMPwqEeijjKJn7OxwuQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xvkb0PwqEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvkb0fwqEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvkb0vwqEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XvqicPwqEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_QRm1cPwqEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_QRm1cfwqEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRm1cvwqEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_QOpoEPwqEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_QQpzMfwqEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_u8eogPxEEeijjKJn7OxwuQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5RkNAPxEEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5RkNAfxEEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5RkNAvxEEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5RkNA_xEEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_u9DQQPxEEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_u9DQQfxEEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u9DQQvxEEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_u6wxQPxEEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_u8eogfxEEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_7sORkPxEEeijjKJn7OxwuQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OZ4qkPxFEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OZ4qkfxFEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OZ4qkvxFEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OZ4qk_xFEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_7s4_8PxEEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_7s4_8fxEEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7s4_8vxEEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_7qyuMPxEEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_7sORkfxEEeijjKJn7OxwuQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_LAACRDOSEeiHat9KcP8uWA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_LAACRTOSEeiHat9KcP8uWA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_LAACRjOSEeiHat9KcP8uWA"/>
@@ -1666,6 +1736,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_HklksDkLEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_oOLoE13hEeiwL5tPgFMcjQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_MAJMEPuBEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qsg0kPuBEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qsg0kfuBEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qsg0kvuBEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qsg0k_uBEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_MAVZUPuBEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MAVZUfuBEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAVZUvuBEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_mP8vkPt7EeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MAJMEfuBEeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_6MiyETQTEeixv_sLOod4lQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_6MiyEjQTEeixv_sLOod4lQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_6MiyEzQTEeixv_sLOod4lQ"/>
@@ -1689,7 +1773,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kt_74jc_EeiIfPeSAqyGdQ"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Mhj8TQTEeixv_sLOod4lQ" x="900" y="280" width="381" height="281"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Mhj8TQTEeixv_sLOod4lQ" x="900" y="280" width="381" height="301"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_AC4TUDQUEeixv_sLOod4lQ" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_AC46YDQUEeixv_sLOod4lQ" type="Class_NameLabel"/>
@@ -1809,6 +1893,62 @@ <element xmi:type="uml:Property" href="Vnf.uml#_875IoDdSEeiIfPeSAqyGdQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_9AAMkTdSEeiIfPeSAqyGdQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_HV9qAPuDEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pE97QPuDEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pE97QfuDEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pE97QvuDEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pE97Q_uDEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_HWWEgPuDEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_HWWEgfuDEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HWWEgvuDEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_HVGuYPuDEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_HV9qAfuDEeikN6fzJzDfWw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_0zILgPuDEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VC5eoPuEEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VC5eofuEEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VC5eovuEEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VC5eo_uEEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_0zgmAPuDEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_0zgmAfuDEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0zgmAvuDEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_0yXWgPuDEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_0zILgfuDEeikN6fzJzDfWw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_imdKQPuEEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_H9X9YPuFEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_H9X9YfuFEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_H9X9YvuFEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_H9X9Y_uFEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_im1kwPuEEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_im1kwfuEEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_im1kwvuEEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_ilsVQPuEEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_imdKQfuEEeikN6fzJzDfWw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Pze-APuFEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CDkmgPuHEeiYVshOvl6_ww" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CDkmgfuHEeiYVshOvl6_ww" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CDnCwPuHEeiYVshOvl6_ww" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CDnp0PuHEeiYVshOvl6_ww" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Pz9fIPuFEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Pz9fIfuFEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pz9fIvuFEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_PyPn4PuFEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Pze-AfuFEeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_zOg-FjQVEeixv_sLOod4lQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_zOg-FzQVEeixv_sLOod4lQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_zOg-GDQVEeixv_sLOod4lQ"/>
@@ -1832,7 +1972,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvhl4jc_EeiIfPeSAqyGdQ"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_zOfv8DQVEeixv_sLOod4lQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="180" height="121"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="180" height="141"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Am1LkDQtEeixv_sLOod4lQ" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_Am1LkjQtEeixv_sLOod4lQ" type="Class_NameLabel"/>
@@ -1925,6 +2065,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_mIpmIDapEei23_xWdimG9w"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_msU1eTgeEeiOYfGHew0BGg"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_zdJFcPuCEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7i6SsPuCEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7i6SsfuCEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7i6SsvuCEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7i6Ss_uCEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zdbZUPuCEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_zdbZUfuCEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zdbZUvuCEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_qwmBgPuBEeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zdJFcfuCEeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_FELNYTWdEei9Ia34RXjpEg"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_FELNYjWdEei9Ia34RXjpEg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_FELNYzWdEei9Ia34RXjpEg"/>
@@ -1951,7 +2105,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwB8Mjc_EeiIfPeSAqyGdQ"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEIKETWdEei9Ia34RXjpEg" x="960" y="680" width="301" height="141"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEIKETWdEei9Ia34RXjpEg" x="960" y="680" width="301" height="161"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_3_akcDaKEei23_xWdimG9w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_3_akcTaKEei23_xWdimG9w"/>
@@ -2253,7 +2407,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeReMjgSEeiOYfGHew0BGg"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_0lvvQDgREeiOYfGHew0BGg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="170"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="181"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_SeUhgDgSEeiOYfGHew0BGg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_SeUhgTgSEeiOYfGHew0BGg"/>
@@ -2382,7 +2536,7 @@ <element xmi:type="uml:Association" href="Vnf.uml#_R8QvsDQUEeixv_sLOod4lQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R8upwjQUEeixv_sLOod4lQ" points="[561, 620, -643984, -643984]$[840, 620, -643984, -643984]$[840, 540, -643984, -643984]$[900, 540, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R89TQDQUEeixv_sLOod4lQ" id="(1.0,0.1652892561983471)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R89TQTQUEeixv_sLOod4lQ" id="(0.0,0.9252669039145908)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R89TQTQUEeixv_sLOod4lQ" id="(0.0,0.8637873754152824)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_LRy5cDQtEeixv_sLOod4lQ" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_6Mhj8DQTEeixv_sLOod4lQ">
<children xmi:type="notation:DecorationNode" xmi:id="_LRy5czQtEeixv_sLOod4lQ" type="Association_StereotypeLabel">
@@ -2474,8 +2628,8 @@ <styles xmi:type="notation:FontStyle" xmi:id="_kBuOMTWeEei9Ia34RXjpEg"/>
<element xmi:type="uml:Association" href="Vnf.uml#_j97TUDWeEei9Ia34RXjpEg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBuOMjWeEei9Ia34RXjpEg" points="[1201, 720, -643984, -643984]$[1300, 720, -643984, -643984]$[1300, 200, -643984, -643984]$[684, 200, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7EDWeEei9Ia34RXjpEg" id="(1.0,0.28368794326241137)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.1652892561983471)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7EDWeEei9Ia34RXjpEg" id="(1.0,0.2484472049689441)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.14184397163120568)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_3_akdDaKEei23_xWdimG9w" type="StereotypeCommentLink" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_3_akcDaKEei23_xWdimG9w">
<styles xmi:type="notation:FontStyle" xmi:id="_3_akdTaKEei23_xWdimG9w"/>
@@ -2577,7 +2731,7 @@ <element xmi:type="uml:Association" href="Vnf.uml#_ufxV8DdVEeiIfPeSAqyGdQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unBNcjdVEeiIfPeSAqyGdQ" points="[160, 760, -643984, -643984]$[120, 260, -643984, -643984]$[460, 260, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4DdVEeiIfPeSAqyGdQ" id="(0.26578073089701,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.6611570247933884)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.5673758865248227)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_oFePZDd-EeiIfPeSAqyGdQ" type="StereotypeCommentLink" source="_oFSpMDd-EeiIfPeSAqyGdQ" target="_oFePYDd-EeiIfPeSAqyGdQ">
<styles xmi:type="notation:FontStyle" xmi:id="_oFePZTd-EeiIfPeSAqyGdQ"/>
@@ -2689,7 +2843,7 @@ <styles xmi:type="notation:FontStyle" xmi:id="_uzOFETgTEeiOYfGHew0BGg"/>
<element xmi:type="uml:Association" href="Vnf.uml#_uogp4DgTEeiOYfGHew0BGg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uzOFEjgTEeiOYfGHew0BGg" points="[581, 380, -643984, -643984]$[780, 380, -643984, -643984]$[780, 400, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3EDgTEeiOYfGHew0BGg" id="(1.0,0.11764705882352941)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3EDgTEeiOYfGHew0BGg" id="(1.0,0.11049723756906077)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3ETgTEeiOYfGHew0BGg" id="(0.6405693950177936,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_nNOFsDkTEeiWMf5FLWfdLA" type="Association_Edge" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">
@@ -2721,7 +2875,7 @@ <element xmi:type="uml:Association" href="Vnf.uml#_mpiw4DkTEeiWMf5FLWfdLA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nNOFsjkTEeiWMf5FLWfdLA" points="[940, 400, -643984, -643984]$[940, 260, -643984, -643984]$[684, 260, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_KoDkTEeiWMf5FLWfdLA" id="(0.10498687664041995,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_xsDkTEeiWMf5FLWfdLA" id="(1.0,0.6611570247933884)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_xsDkTEeiWMf5FLWfdLA" id="(1.0,0.5673758865248227)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_MWeoUDm5EeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_MUJtEDm5EeiWMf5FLWfdLA" target="_MWeBQjm5EeiWMf5FLWfdLA">
<styles xmi:type="notation:FontStyle" xmi:id="_MWeoUTm5EeiWMf5FLWfdLA"/>
@@ -2761,7 +2915,7 @@ <styles xmi:type="notation:FontStyle" xmi:id="_hA8sQTm5EeiWMf5FLWfdLA"/>
<element xmi:type="uml:Association" href="Vnf.uml#_gt50cDm5EeiWMf5FLWfdLA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hA8sQjm5EeiWMf5FLWfdLA" points="[460, 220, -643984, -643984]$[300, 220, -643984, -643984]$[300, 181, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgDm5EeiWMf5FLWfdLA" id="(0.0,0.3305785123966942)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgDm5EeiWMf5FLWfdLA" id="(0.0,0.28368794326241137)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgTm5EeiWMf5FLWfdLA" id="(0.7874015748031497,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_iFgOoDm7EeiWMf5FLWfdLA" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_MUJtEDm5EeiWMf5FLWfdLA">
@@ -2926,6 +3080,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_fXB5kDdzEeiIfPeSAqyGdQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Pc-c8TzfEeiuk5pWzMOpfA"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_tKQUoPuOEeiYVshOvl6_ww" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7DFssPuOEeiYVshOvl6_ww" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7DFssfuOEeiYVshOvl6_ww" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7DFssvuOEeiYVshOvl6_ww" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7DFss_uOEeiYVshOvl6_ww" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tKch4PuOEeiYVshOvl6_ww" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tKch4fuOEeiYVshOvl6_ww" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKch4vuOEeiYVshOvl6_ww"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_tID8QPuOEeiYVshOvl6_ww"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tKQUofuOEeiYVshOvl6_ww"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_FrZ1NDzfEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_FrZ1NTzfEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_FrZ1NjzfEeiuk5pWzMOpfA"/>
@@ -2949,7 +3117,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fri_IjzfEeiuk5pWzMOpfA"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_ISONYDOSEeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FrZOITzfEeiuk5pWzMOpfA" x="900" y="400" height="161"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FrZOITzfEeiuk5pWzMOpfA" x="900" y="400" height="181"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_FrmCczzfEeiuk5pWzMOpfA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_FrmCdDzfEeiuk5pWzMOpfA"/>
@@ -3460,6 +3628,20 @@ <element xmi:type="uml:Property" href="Vnf.uml#_X1lEsDTeEeiwQ6KPLHcy4g"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_l34l8TzuEeiuk5pWzMOpfA"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_d-a6EPuCEeikN6fzJzDfWw" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hzOocPuCEeikN6fzJzDfWw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hzOocfuCEeikN6fzJzDfWw" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hzOocvuCEeikN6fzJzDfWw" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hzOoc_uCEeikN6fzJzDfWw" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_d-zUkPuCEeikN6fzJzDfWw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_d-zUkfuCEeikN6fzJzDfWw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d-zUkvuCEeikN6fzJzDfWw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_mP8vkPt7EeikN6fzJzDfWw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_d-a6EfuCEeikN6fzJzDfWw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_hGJVRDzuEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_hGJVRTzuEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_hGJVRjzuEeiuk5pWzMOpfA"/>
@@ -3483,7 +3665,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGUUYjzuEeiuk5pWzMOpfA"/>
</children>
<element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGIuMTzuEeiuk5pWzMOpfA" x="420" y="400" height="281"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGIuMTzuEeiuk5pWzMOpfA" x="420" y="400" height="321"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_hGXXszzuEeiuk5pWzMOpfA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_hGXXtDzuEeiuk5pWzMOpfA"/>
@@ -3767,7 +3949,7 @@ <styles xmi:type="notation:FontStyle" xmi:id="_hHBfATzuEeiuk5pWzMOpfA"/>
<element xmi:type="uml:Association" href="Vnf.uml#_zxa4ADQvEeixv_sLOod4lQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hHBfAjzuEeiuk5pWzMOpfA" points="[960, 420, -643984, -643984]$[640, 420, -643984, -643984]$[600, 320, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4DzuEeiuk5pWzMOpfA" id="(0.44543429844098,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4DzuEeiuk5pWzMOpfA" id="(0.46403712296983757,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4TzuEeiuk5pWzMOpfA" id="(0.5809128630705395,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_ieTr8Dz3Eeiuk5pWzMOpfA" type="Comment_AnnotatedElementEdge" source="_fAdFADz3Eeiuk5pWzMOpfA" target="_ZuQegDzqEeiuk5pWzMOpfA">
@@ -3806,7 +3988,7 @@ <element xmi:type="uml:Association" href="Vnf.uml#_8qDIUD5xEeijbdkIlrq2uQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8ujN0j5xEeijbdkIlrq2uQ" points="[661, 280, -643984, -643984]$[940, 280, -643984, -643984]$[900, 480, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_811hkD5xEeijbdkIlrq2uQ" id="(1.0,0.5309734513274337)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_811hkT5xEeijbdkIlrq2uQ" id="(0.08583690987124463,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_811hkT5xEeijbdkIlrq2uQ" id="(0.08602150537634409,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_mnkeYFqmEeiTzriVSbKglg" type="Association_Edge" source="_tqlqEDzqEeiuk5pWzMOpfA" target="_rc5EcDzfEeiuk5pWzMOpfA" lineColor="255">
<children xmi:type="notation:DecorationNode" xmi:id="_mnkeY1qmEeiTzriVSbKglg" type="Association_StereotypeLabel">
@@ -6174,6 +6356,48 @@ <element xmi:type="uml:Property" href="Vnf.uml#_Hy64kDd_EeiIfPeSAqyGdQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_VfBsM3PYEeiuFfjlON-CuQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_uIMnwPuHEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P2UIMPuIEeiYVshOvl6_ww" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P2aO0PuIEeiYVshOvl6_ww" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P2aO0fuIEeiYVshOvl6_ww" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P2aO0vuIEeiYVshOvl6_ww" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uJuRwPuHEeiYVshOvl6_ww" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_uJuRwfuHEeiYVshOvl6_ww" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uJuRwvuHEeiYVshOvl6_ww"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_uFBX8PuHEeiYVshOvl6_ww"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uIMnwfuHEeiYVshOvl6_ww"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_RcyWwPuIEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_boZ2MPuIEeiYVshOvl6_ww" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_boZ2MfuIEeiYVshOvl6_ww" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_boZ2MvuIEeiYVshOvl6_ww" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bof80PuIEeiYVshOvl6_ww" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_RdvZAPuIEeiYVshOvl6_ww" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_RdvZAfuIEeiYVshOvl6_ww" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RdvZAvuIEeiYVshOvl6_ww"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_RayLoPuIEeiYVshOvl6_ww"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RcyWwfuIEeiYVshOvl6_ww"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_gVjh0PuIEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DBIzQPuNEeiYVshOvl6_ww" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DBIzQfuNEeiYVshOvl6_ww" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DBIzQvuNEeiYVshOvl6_ww" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DBIzQ_uNEeiYVshOvl6_ww" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gWUW0PuIEeiYVshOvl6_ww" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_gWUW0fuIEeiYVshOvl6_ww" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gWUW0vuIEeiYVshOvl6_ww"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_gUB30PuIEeiYVshOvl6_ww"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gVjh0fuIEeiYVshOvl6_ww"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_R676ZHPYEeiuFfjlON-CuQ"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_R676ZXPYEeiuFfjlON-CuQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_R676ZnPYEeiuFfjlON-CuQ"/>
@@ -7084,6 +7308,126 @@ <element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_HPRnZZqEEeidy9iGT_F5-w" x="200"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_hz78kPxSEeijjKJn7OxwuQ" type="DataType_Shape" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ImEwgPxTEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ImEwgfxTEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ImEwgvxTEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ImEwg_xTEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hz78kvxSEeijjKJn7OxwuQ" type="DataType_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hz78k_xSEeijjKJn7OxwuQ" type="DataType_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_hz78lPxSEeijjKJn7OxwuQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hz78lfxSEeijjKJn7OxwuQ" type="DataType_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_tOAzMPxSEeijjKJn7OxwuQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HI-gYPxTEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HI-gYfxTEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HI-gYvxTEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HJEnAPxTEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tP63sPxSEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tP63sfxSEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP63svxSEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_tMfJMPxSEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tOAzMfxSEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_tnYVcPxSEeijjKJn7OxwuQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p2S0APxTEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2S0AfxTEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2S0AvxTEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2S0A_xTEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tonrkPxSEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tonrkfxSEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tonrkvxSEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_tlqeMPxSEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tnYVcfxSEeijjKJn7OxwuQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hz78lvxSEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hz78l_xSEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hz78mPxSEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hz78mfxSEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hz78mvxSEeijjKJn7OxwuQ" visible="false" type="DataType_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hz78m_xSEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hz78nPxSEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hz78nfxSEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hz78nvxSEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:DataType" href="Vnf.uml#_hzvvUPxSEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hz78kfxSEeijjKJn7OxwuQ" x="740" y="1600"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_cySVsPxUEeijjKJn7OxwuQ" type="DataType_Shape" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p2X3EPxUEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2X3EfxUEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2X3EvxUEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p2X3E_xUEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_cySVsvxUEeijjKJn7OxwuQ" type="DataType_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_cySVs_xUEeijjKJn7OxwuQ" type="DataType_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cySVtPxUEeijjKJn7OxwuQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_cySVtfxUEeijjKJn7OxwuQ" type="DataType_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_qw1UMPxUEeijjKJn7OxwuQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rh7SkPxXEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rh7SkfxXEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rh7SkvxXEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rh7Sk_xXEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_qyQ3kPxUEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_qyQ3kfxUEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyQ3kvxUEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_qvf3cPxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_qw1UMfxUEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_rDPS0PxUEeijjKJn7OxwuQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pPJ-sPxXEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pPJ-sfxXEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pPJ-svxXEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pPJ-s_xXEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_rEq2MPxUEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_rEq2MfxUEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rEq2MvxUEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_rBniMPxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_rDPS0fxUEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_rWgNEPxUEeijjKJn7OxwuQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1asO0PxUEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1asO0fxUEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1asO0vxUEeijjKJn7OxwuQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1asO0_xUEeijjKJn7OxwuQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_rYB3EPxUEeijjKJn7OxwuQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_rYB3EfxUEeijjKJn7OxwuQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYB3EvxUEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_rVW9kPxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_rWgNEfxUEeijjKJn7OxwuQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_cySVtvxUEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_cySVt_xUEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_cySVuPxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cySVufxUEeijjKJn7OxwuQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_cySVuvxUEeijjKJn7OxwuQ" visible="false" type="DataType_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_cySVu_xUEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_cySVvPxUEeijjKJn7OxwuQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_cySVvfxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cySVvvxUEeijjKJn7OxwuQ"/>
+ </children>
+ <element xmi:type="uml:DataType" href="Vnf.uml#_cyGIcPxUEeijjKJn7OxwuQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cySVsfxUEeijjKJn7OxwuQ" x="920" y="1600"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_XaTYAXPWEeiuFfjlON-CuQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_XaTYAnPWEeiuFfjlON-CuQ"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_XaTYA3PWEeiuFfjlON-CuQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml index ce8d827..4f1a121 100644 --- a/papyrus/ONAP Information Model/Vnf.uml +++ b/papyrus/ONAP Information Model/Vnf.uml @@ -503,6 +503,37 @@ This will probably need to move to common</body> </ownedComment>
<generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
</packagedElement>
+ <packagedElement xmi:type="uml:DataType" xmi:id="_hzvvUPxSEeijjKJn7OxwuQ" name="StorageQos">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tMfJMPxSEeijjKJn7OxwuQ" name="qosid">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_C1n00PxTEeijjKJn7OxwuQ" annotatedElement="_tMfJMPxSEeijjKJn7OxwuQ">
+ <body>Unique identifier of the storage Qos in VNFD.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tlqeMPxSEeijjKJn7OxwuQ" name="qosname">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_uD6rAPxTEeijjKJn7OxwuQ" annotatedElement="_tlqeMPxSEeijjKJn7OxwuQ">
+ <body>Name of storage QoS.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:DataType" xmi:id="_cyGIcPxUEeijjKJn7OxwuQ" name="VolumeType">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_qvf3cPxUEeijjKJn7OxwuQ" name="volumetypeid">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yWO_UPxUEeijjKJn7OxwuQ" annotatedElement="_qvf3cPxUEeijjKJn7OxwuQ">
+ <body>Unique identifier of volume type in VNFD.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_rBniMPxUEeijjKJn7OxwuQ" name="volumetypename">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Zwh_cPxVEeijjKJn7OxwuQ" annotatedElement="_rBniMPxUEeijjKJn7OxwuQ">
+ <body>Name of volume type.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_rVW9kPxUEeijjKJn7OxwuQ" name="backendname">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_zPN5MTOHEei5Af8DcjrhIQ" name="Interfaces"/>
<packagedElement xmi:type="uml:Package" xmi:id="_zPN5MjOHEei5Af8DcjrhIQ" name="ObjectClasses">
@@ -610,6 +641,14 @@ NOTE: More software images can be attached to the virtualisation container using <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aeqaUDagEei23_xWdimG9w"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aetdoDagEei23_xWdimG9w" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_qwmBgPuBEeikN6fzJzDfWw" name="dependOn">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_-KxiQPuBEeikN6fzJzDfWw" annotatedElement="_qwmBgPuBEeikN6fzJzDfWw">
+ <body>Specify instantiation priority and dependencies of VDU</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4eFsQPuBEeikN6fzJzDfWw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hPG4PuBEeikN6fzJzDfWw" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_aaEZADOREeiHat9KcP8uWA" name="Vnfd">
<ownedComment xmi:type="uml:Comment" xmi:id="_g6pCsDOUEeiHat9KcP8uWA" annotatedElement="_aaEZADOREeiHat9KcP8uWA">
@@ -800,6 +839,12 @@ NOTE: This allows to provide one or more localization languages to support selec <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OcqD8DTSEeiwQ6KPLHcy4g"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OctuUDTSEeiwQ6KPLHcy4g" value="*"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_mP8vkPt7EeikN6fzJzDfWw" name="veVnfmVnfInterface">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_XOeiMPuAEeikN6fzJzDfWw" annotatedElement="_mP8vkPt7EeikN6fzJzDfWw">
+ <body>IP Address between VNF and VNFM.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_J0Zx0DOSEeiHat9KcP8uWA" name="SwImageDesc">
<ownedComment xmi:type="uml:Comment" xmi:id="_8Nl8oDasEei23_xWdimG9w" annotatedElement="_J0Zx0DOSEeiHat9KcP8uWA">
@@ -951,6 +996,14 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DhBX0Dd6EeiIfPeSAqyGdQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhFCMDd6EeiIfPeSAqyGdQ" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tID8QPuOEeiYVshOvl6_ww" name="securityGroups">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_48w5YPuOEeiYVshOvl6_ww" annotatedElement="_tID8QPuOEeiYVshOvl6_ww">
+ <body>VNFD needs to specify the security group name {security_groups} for each VDU.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y5pgYPuOEeiYVshOvl6_ww"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y51toPuOEeiYVshOvl6_ww" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_-gDvwDOREeiHat9KcP8uWA" name="VirtualComputeDesc ">
<ownedComment xmi:type="uml:Comment" xmi:id="_JozqAFqbEeiTzriVSbKglg" annotatedElement="_-gDvwDOREeiHat9KcP8uWA">
@@ -1046,6 +1099,24 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aOwRoDm3EeiWMf5FLWfdLA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aPEasDm3EeiWMf5FLWfdLA" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_QOpoEPwqEeijjKJn7OxwuQ" name="multiAttach">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_axvMUPwqEeijjKJn7OxwuQ" annotatedElement="_QOpoEPwqEeijjKJn7OxwuQ">
+ <body>Indicating whether a vDisk is a shared volume in VNFD.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S7jTMPwqEeijjKJn7OxwuQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S8B0UPwqEeijjKJn7OxwuQ" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_u6wxQPxEEeijjKJn7OxwuQ" name="storageqos">
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xdX38PxEEeijjKJn7OxwuQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xd2ZEPxEEeijjKJn7OxwuQ" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_7qyuMPxEEeijjKJn7OxwuQ" name="volumetype">
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HakIAPxFEeijjKJn7OxwuQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HcFyAPxFEeijjKJn7OxwuQ" value="1"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="LinkDesc " isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_Ey004LeVEeiq7vtzCAMDQQ" annotatedElement="_AC2eIDQUEeixv_sLOod4lQ">
@@ -1145,6 +1216,38 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_guUrMDm5EeiWMf5FLWfdLA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_guVSQDm5EeiWMf5FLWfdLA" value="*"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HVGuYPuDEeikN6fzJzDfWw" name="qosPolicyId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_TGUSoPuDEeikN6fzJzDfWw" annotatedElement="_HVGuYPuDEeikN6fzJzDfWw">
+ <body>Qos ID of a vdu.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VvyPQPuDEeikN6fzJzDfWw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V9bCoPuDEeikN6fzJzDfWw" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0yXWgPuDEeikN6fzJzDfWw" name="sriovAntiAffinityGroup">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_clvlAPuEEeikN6fzJzDfWw" annotatedElement="_0yXWgPuDEeikN6fzJzDfWw">
+ <body>Define the port anti-affinity group ID for each SR-IOV type vNIC. Multiple vNICs in the same anti-affinity group must belong to the same virtual network, and the number of vNICs in the same anti-affinity group cannot exceed two.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4MkMgPuDEeikN6fzJzDfWw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4R5_gPuDEeikN6fzJzDfWw" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ilsVQPuEEeikN6fzJzDfWw" name="securityGroups">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_EqOxoPuFEeikN6fzJzDfWw" annotatedElement="_ilsVQPuEEeikN6fzJzDfWw">
+ <body>VNFD needs to specify the security group name {security_groups} for each vNic.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1nr_gPuEEeikN6fzJzDfWw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1s7r4PuEEeikN6fzJzDfWw" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_PyPn4PuFEeikN6fzJzDfWw" name="portSecurityEnabled">
+ <ownedComment xmi:type="uml:Comment" xmi:id="__Kv_QPuGEeiYVshOvl6_ww" annotatedElement="_PyPn4PuFEeikN6fzJzDfWw">
+ <body>VNFD needs to specify whether to enable security group for each vNic.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UjCdYPuFEeikN6fzJzDfWw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UokdoPuFEeikN6fzJzDfWw" value="1"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_p0UVsDQvEeixv_sLOod4lQ" name="VnfDf ">
<ownedComment xmi:type="uml:Comment" xmi:id="_l0ZY4GNVEeio9amveq0yWQ" annotatedElement="_p0UVsDQvEeixv_sLOod4lQ">
@@ -2149,6 +2252,26 @@ This could include the number of CPU cores on this logical node, a memory config <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z7MFgDd_EeiIfPeSAqyGdQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z7WdkDd_EeiIfPeSAqyGdQ" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_uFBX8PuHEeiYVshOvl6_ww" name="qosid">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_LF1bwPuIEeiYVshOvl6_ww" annotatedElement="_uFBX8PuHEeiYVshOvl6_ww">
+ <body>Qos ID.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_RayLoPuIEeiYVshOvl6_ww" name="qosname">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ZP674PuIEeiYVshOvl6_ww" annotatedElement="_RayLoPuIEeiYVshOvl6_ww">
+ <body>Qos name.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gUB30PuIEeiYVshOvl6_ww" name="rules">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yom7EPuLEeiYVshOvl6_ww" annotatedElement="_gUB30PuIEeiYVshOvl6_ww">
+ <body>Qualities of Qos, including max_kbps、max_burst_kbps 、direction.</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kTldoPuIEeiYVshOvl6_ww"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kUKFYPuIEeiYVshOvl6_ww" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_ZqQQ8DkIEeiWMf5FLWfdLA" name="VnfConfigurableProperties">
<ownedComment xmi:type="uml:Comment" xmi:id="_mg8PgDkIEeiWMf5FLWfdLA" annotatedElement="_ZqQQ8DkIEeiWMf5FLWfdLA">
@@ -2281,6 +2404,11 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZcpG8jmxEeiWMf5FLWfdLA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZcpG8zmxEeiWMf5FLWfdLA" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_zm95IvwtEeijjKJn7OxwuQ" name="localaffinityorantiaffinityrule">
+ <type xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_znD_wPwtEeijjKJn7OxwuQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znD_wfwtEeijjKJn7OxwuQ" value="1"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_MRthQDmyEeiWMf5FLWfdLA" name="VnfcConfigurableProperties">
<ownedComment xmi:type="uml:Comment" xmi:id="_T2oEMDmyEeiWMf5FLWfdLA" annotatedElement="_MRthQDmyEeiWMf5FLWfdLA">
@@ -3242,4 +3370,24 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on <OpenModel_Profile:Experimental xmi:id="_RpyA4L_zEeisMMIUeH4UGw" base_Element="_utZfYF9vEeiaLPXj8My4aQ"/>
<OpenModel_Profile:Experimental xmi:id="_dipFQL_zEeisMMIUeH4UGw" base_Element="_vnd68F9vEeiaLPXj8My4aQ"/>
<OpenModel_Profile:Experimental xmi:id="_hWbooOzlEei7-e9MrPJW7Q" base_Element="_ZQtesOzlEei7-e9MrPJW7Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_mQDdQPt7EeikN6fzJzDfWw" base_StructuralFeature="_mP8vkPt7EeikN6fzJzDfWw"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_qwmBgfuBEeikN6fzJzDfWw" base_StructuralFeature="_qwmBgPuBEeikN6fzJzDfWw"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_HVGuYfuDEeikN6fzJzDfWw" base_StructuralFeature="_HVGuYPuDEeikN6fzJzDfWw"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_0yXWgfuDEeikN6fzJzDfWw" base_StructuralFeature="_0yXWgPuDEeikN6fzJzDfWw" support="OPTIONAL"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_ilsVQfuEEeikN6fzJzDfWw" base_StructuralFeature="_ilsVQPuEEeikN6fzJzDfWw"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_PyPn4fuFEeikN6fzJzDfWw" base_StructuralFeature="_PyPn4PuFEeikN6fzJzDfWw"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_uFCmEPuHEeiYVshOvl6_ww" base_StructuralFeature="_uFBX8PuHEeiYVshOvl6_ww"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_RayLofuIEeiYVshOvl6_ww" base_StructuralFeature="_RayLoPuIEeiYVshOvl6_ww"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_gUB30fuIEeiYVshOvl6_ww" base_StructuralFeature="_gUB30PuIEeiYVshOvl6_ww"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_tID8QfuOEeiYVshOvl6_ww" base_StructuralFeature="_tID8QPuOEeiYVshOvl6_ww"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_QOpoEfwqEeijjKJn7OxwuQ" base_StructuralFeature="_QOpoEPwqEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_zm95I_wtEeijjKJn7OxwuQ" base_StructuralFeature="_zm95IvwtEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_znD_w_wtEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_u6wxQfxEEeijjKJn7OxwuQ" base_StructuralFeature="_u6wxQPxEEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_7qyuMfxEEeijjKJn7OxwuQ" base_StructuralFeature="_7qyuMPxEEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_tMfJMfxSEeijjKJn7OxwuQ" base_StructuralFeature="_tMfJMPxSEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_tlqeMfxSEeijjKJn7OxwuQ" base_StructuralFeature="_tlqeMPxSEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_qvf3cfxUEeijjKJn7OxwuQ" base_StructuralFeature="_qvf3cPxUEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_rBniMfxUEeijjKJn7OxwuQ" base_StructuralFeature="_rBniMPxUEeijjKJn7OxwuQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_rVW9kfxUEeijjKJn7OxwuQ" base_StructuralFeature="_rVW9kPxUEeijjKJn7OxwuQ"/>
</xmi:XMI>
|