summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--papyrus/ONAP Information Model/Vnf.notation150
-rw-r--r--papyrus/ONAP Information Model/Vnf.uml74
2 files changed, 192 insertions, 32 deletions
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index b37ea09..a588e46 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -1893,20 +1893,6 @@
<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"/>
@@ -1972,7 +1958,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="141"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="180" height="181"/>
</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"/>
@@ -2384,6 +2370,48 @@
<element xmi:type="uml:Property" href="Vnf.uml#_BYBDsDgZEeiOYfGHew0BGg"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_BnuToTgZEeiOYfGHew0BGg"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_DVJiYA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eB88MA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB9jQA57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB-xYA57EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB_YcA57EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_DWrMYA57EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_DWrMYQ57EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DWrMYg57EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_DQCY4A57EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_DVJiYQ57EemrJqq3q9vf6g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_UbAaoA58EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ppiYcA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppi_gA59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppi_gQ59EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppjmkA59EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Ub810A58EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Ub810Q58EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ub810g58EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_UWbcoA58EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_UbAaoQ58EemrJqq3q9vf6g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_gXpWUA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rBN9EA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBN9EQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBOkIA59EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBPLMA59EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gY56kA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_gY56kQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gY56kg59EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_gTpnIA59EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gXpWUQ59EemrJqq3q9vf6g"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_SeL-pTgSEeiOYfGHew0BGg"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_SeL-pjgSEeiOYfGHew0BGg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_SeL-pzgSEeiOYfGHew0BGg"/>
@@ -2629,7 +2657,7 @@
<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.2484472049689441)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.14184397163120568)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.11049723756906077)"/>
</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"/>
@@ -2731,7 +2759,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.5673758865248227)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.4419889502762431)"/>
</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"/>
@@ -2875,7 +2903,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.5673758865248227)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_xsDkTEeiWMf5FLWfdLA" id="(1.0,0.4419889502762431)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_MWeoUDm5EeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_MUJtEDm5EeiWMf5FLWfdLA" target="_MWeBQjm5EeiWMf5FLWfdLA">
<styles xmi:type="notation:FontStyle" xmi:id="_MWeoUTm5EeiWMf5FLWfdLA"/>
@@ -2915,7 +2943,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.28368794326241137)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgDm5EeiWMf5FLWfdLA" id="(0.0,0.22099447513812154)"/>
<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">
@@ -3094,6 +3122,20 @@
<element xmi:type="uml:Property" href="Vnf.uml#_tID8QPuOEeiYVshOvl6_ww"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_tKQUofuOEeiYVshOvl6_ww"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_4uqCoA5rEemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cRY7UA5sEemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cRclsA5sEemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cRdz0A5sEemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cRea4A5sEemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4u9koA5rEemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_4u9koQ5rEemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4u9kog5rEemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_4rzi8A5rEemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4uqCoQ5rEemrJqq3q9vf6g"/>
+ </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"/>
@@ -3310,6 +3352,48 @@
<element xmi:type="uml:Property" href="Vnf.uml#_BYBDsDgZEeiOYfGHew0BGg"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_6GkClTzqEeiuk5pWzMOpfA"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_3yMAEA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_60iWwA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60i90A57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60i90Q57EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60jk4A57EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_3yjMcA57EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_3yjMcQ57EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3yjMcg57EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_DQCY4A57EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3yMAEQ57EemrJqq3q9vf6g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_G1tNIA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IqeWYA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IqeWYQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iqe9cA59EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iqe9cQ59EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_G2FnoA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_G2FnoQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G2Fnog59EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_UWbcoA58EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_G1tNIQ59EemrJqq3q9vf6g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_4m6WsA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_65CKUA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CKUQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CKUg59EemrJqq3q9vf6g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CxYA59EemrJqq3q9vf6g" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4nN4sA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_4nN4sQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4nN4sg59EemrJqq3q9vf6g"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_gTpnIA59EemrJqq3q9vf6g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4m6WsQ59EemrJqq3q9vf6g"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_tqmRJDzqEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_tqmRJTzqEeiuk5pWzMOpfA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_tqmRJjzqEeiuk5pWzMOpfA"/>
@@ -7347,6 +7431,34 @@
<element xmi:type="uml:Property" href="Vnf.uml#_tlqeMPxSEeijjKJn7OxwuQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_tnYVcfxSEeijjKJn7OxwuQ"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_nZPDMBDBEemFz_A_9-IJMQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BoUw0BDDEemFz_A_9-IJMQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BoUw0RDDEemFz_A_9-IJMQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BoUw0hDDEemFz_A_9-IJMQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BoUw0xDDEemFz_A_9-IJMQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_ncEUwBDBEemFz_A_9-IJMQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_ncEUwRDBEemFz_A_9-IJMQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ncEUwhDBEemFz_A_9-IJMQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_nUxZ8BDBEemFz_A_9-IJMQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_nZPDMRDBEemFz_A_9-IJMQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_45ibwBDCEemFz_A_9-IJMQ" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M7OBYBDDEemFz_A_9-IJMQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M7OBYRDDEemFz_A_9-IJMQ" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M7OBYhDDEemFz_A_9-IJMQ" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M7OBYxDDEemFz_A_9-IJMQ" key="italic" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_47BpgBDCEemFz_A_9-IJMQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_47BpgRDCEemFz_A_9-IJMQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47BpghDCEemFz_A_9-IJMQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Vnf.uml#_43vsABDCEemFz_A_9-IJMQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_45ibwRDCEemFz_A_9-IJMQ"/>
+ </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"/>
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml
index ee5d22b..a290cc0 100644
--- a/papyrus/ONAP Information Model/Vnf.uml
+++ b/papyrus/ONAP Information Model/Vnf.uml
@@ -516,6 +516,15 @@ This will probably need to move to common</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_nUxZ8BDBEemFz_A_9-IJMQ" name="consumer" type="_yPciUBDCEemFz_A_9-IJMQ"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_43vsABDCEemFz_A_9-IJMQ" name="qos_specs">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_LFiSIBDDEemFz_A_9-IJMQ" annotatedElement="_43vsABDCEemFz_A_9-IJMQ">
+ <body>Describe qualities of Qos：total_bytes_sec、total_iops_sec. </body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EONN8BDDEemFz_A_9-IJMQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EONN8RDDEemFz_A_9-IJMQ" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_cyGIcPxUEeijjKJn7OxwuQ" name="VolumeType">
<ownedAttribute xmi:type="uml:Property" xmi:id="_qvf3cPxUEeijjKJn7OxwuQ" name="volumetypeid">
@@ -531,6 +540,9 @@ This will probably need to move to common</body>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_rVW9kPxUEeijjKJn7OxwuQ" name="backendname">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yb08ABDDEemFz_A_9-IJMQ" annotatedElement="_rVW9kPxUEeijjKJn7OxwuQ">
+ <body>Backend volume name of cinder.</body>
+ </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
</packagedElement>
@@ -1004,6 +1016,16 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y5pgYPuOEeiYVshOvl6_ww"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y51toPuOEeiYVshOvl6_ww" value="*"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4rzi8A5rEemrJqq3q9vf6g" name="flavorExtraSpecs">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_RCwpQA54EemrJqq3q9vf6g" annotatedElement="_4rzi8A5rEemrJqq3q9vf6g">
+ <body>Describe Openstack flavour expansion parameters:&#xD;
+• CPU Model&#xD;
+</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WHasYA5sEemrJqq3q9vf6g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WHioMA5sEemrJqq3q9vf6g" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_-gDvwDOREeiHat9KcP8uWA" name="VirtualComputeDesc ">
<ownedComment xmi:type="uml:Comment" xmi:id="_JozqAFqbEeiTzriVSbKglg" annotatedElement="_-gDvwDOREeiHat9KcP8uWA">
@@ -1108,11 +1130,17 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S8B0UPwqEeijjKJn7OxwuQ" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_u6wxQPxEEeijjKJn7OxwuQ" name="storageqos">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_W9RAABDBEemFz_A_9-IJMQ" annotatedElement="_u6wxQPxEEeijjKJn7OxwuQ">
+ <body>Describe storage Qos.</body>
+ </ownedComment>
<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">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Y_SiIBDBEemFz_A_9-IJMQ" annotatedElement="_7qyuMPxEEeijjKJn7OxwuQ">
+ <body>Describe volume type.</body>
+ </ownedComment>
<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"/>
@@ -1216,14 +1244,6 @@ 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>
@@ -1242,7 +1262,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
</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>
+ <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"/>
@@ -2049,6 +2069,27 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
<body>Uniquely identifies a Vnf VLD.</body>
</ownedComment>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_DQCY4A57EemrJqq3q9vf6g" name="segmentationId">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_uPeTsA57EemrJqq3q9vf6g" annotatedElement="_DQCY4A57EemrJqq3q9vf6g">
+ <body>Network segment ID (VLAN/VxLAN ID).</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Xv5IQA57EemrJqq3q9vf6g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xv-n0A57EemrJqq3q9vf6g" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_UWbcoA58EemrJqq3q9vf6g" name="physicalNetwork">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZgZAEA58EemrJqq3q9vf6g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZgnCgA58EemrJqq3q9vf6g" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gTpnIA59EemrJqq3q9vf6g" name="routerExternal">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_2PRJ4A59EemrJqq3q9vf6g" annotatedElement="_gTpnIA59EemrJqq3q9vf6g">
+ <body>Specify if a vrouter comes from an external network.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j-NNUA59EemrJqq3q9vf6g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j-T7AA59EemrJqq3q9vf6g" value="1"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_DlOpkDnDEeiWMf5FLWfdLA" name="ScalingAspect">
<ownedComment xmi:type="uml:Comment" xmi:id="_PNdQ8DnDEeiWMf5FLWfdLA" annotatedElement="_DlOpkDnDEeiWMf5FLWfdLA">
@@ -2260,13 +2301,13 @@ This could include the number of CPU cores on this logical node, a memory config
</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>
+ <body>Human readable 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>
+ <body>Detailed requirements of Qos, including maximum bandwidth limitation{max_kbps}、maximum burst bandwidth limitation{max_burst_kbps} 、direction{egress|ingress}，etc.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kTldoPuIEeiYVshOvl6_ww"/>
@@ -2535,6 +2576,9 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_ZQtesOzlEei7-e9MrPJW7Q" name="VnfLcmOperationsConfiguration"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_yPciUBDCEemFz_A_9-IJMQ" name="consumerScope">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yPciURDCEemFz_A_9-IJMQ" name="back-end"/>
+ </packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0Mc-4D2KEeiFiY3bcpqGkg">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EesFsKVyEeikF6xsfT18UA" source="PapyrusVersion">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EesFsaVyEeikF6xsfT18UA" key="Version" value="0.2.14"/>
@@ -3372,7 +3416,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
<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"/>
@@ -3382,7 +3425,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
<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"/>
@@ -3393,4 +3435,10 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
<OpenModel_Profile:OpenModelAttribute xmi:id="_ph99UAVoEemrBZmpgd_POA">
<base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_ph9WQgVoEemrBZmpgd_POA"/>
</OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_4r4bcA5rEemrJqq3q9vf6g" base_StructuralFeature="_4rzi8A5rEemrJqq3q9vf6g"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_DQC_8A57EemrJqq3q9vf6g" base_StructuralFeature="_DQCY4A57EemrJqq3q9vf6g"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_UWcDsA58EemrJqq3q9vf6g" base_StructuralFeature="_UWbcoA58EemrJqq3q9vf6g"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_gTpnIQ59EemrJqq3q9vf6g" base_StructuralFeature="_gTpnIA59EemrJqq3q9vf6g"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_nUxZ8RDBEemFz_A_9-IJMQ" base_StructuralFeature="_nUxZ8BDBEemFz_A_9-IJMQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_43vsARDCEemFz_A_9-IJMQ" base_StructuralFeature="_43vsABDCEemFz_A_9-IJMQ"/>
</xmi:XMI>