diff options
| author |   Kevin Scaggs <ks0567@att.com> | 2019-01-25 15:22:20 -0600 |
|---|---|---|
| committer | Kevin Scaggs <ks0567@att.com> | 2019-01-25 15:22:20 -0600 |
| commit | 299e3b8c3492fdf18c316b89ac46c118887488a0 (patch) | |
| tree | 6d0d01468ec0739137ac6c9074d32afbf9b47b93 | |
| parent | b4428aebb6211affb10196e4020956c796b6d3f8 (diff) | |
Updates to Vnf
Made small changes to Vnf, associating VirtualLinkProtocolData with
Common submodel created L2ProtocolData and L3ProtocolData
Issue-ID: MODELING-104
Change-Id: I5017a7d87df8b94dc44e2b35b40fa637e34d2b23
Signed-off-by: Kevin Scaggs <ks0567@att.com>
| -rw-r--r-- | papyrus/ONAP Information Model/Vnf.notation | 15 | ||||
| -rw-r--r-- | papyrus/ONAP Information Model/Vnf.uml | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation index ef948a1..7733dc7 100644 --- a/papyrus/ONAP Information Model/Vnf.notation +++ b/papyrus/ONAP Information Model/Vnf.notation @@ -8411,11 +8411,6 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_HMbBKJpXEeidy9iGT_F5-w"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMbBKZpXEeidy9iGT_F5-w"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HMjkAJpXEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_HMjkAZpXEeidy9iGT_F5-w" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMjkAppXEeidy9iGT_F5-w"/>
- </children>
<element xmi:type="uml:Class" href="Vnf.uml#_DAQisJpXEeidy9iGT_F5-w"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMZzAZpXEeidy9iGT_F5-w" x="400" y="360" width="241" height="80"/>
</children>
@@ -8573,11 +8568,6 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_O4EOb5ssEeiPBvbfaqSLYg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4EOcJssEeiPBvbfaqSLYg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_O5Ds4pssEeiPBvbfaqSLYg" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_O5Ds45ssEeiPBvbfaqSLYg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5Ds5JssEeiPBvbfaqSLYg"/>
- </children>
<element xmi:type="uml:Class" href="Vnf.uml#_O385oJssEeiPBvbfaqSLYg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4DnUZssEeiPBvbfaqSLYg" x="180" y="520" width="158" height="81"/>
</children>
@@ -8734,11 +8724,6 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Tz_VN6e2Eeixw5Ke5QD1pQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz_VOKe2Eeixw5Ke5QD1pQ"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_T0LicKe2Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_T0Licae2Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0Licqe2Eeixw5Ke5QD1pQ"/>
- </children>
<element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz-HEae2Eeixw5Ke5QD1pQ" x="360" y="660" width="121" height="81"/>
</children>
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml index a6f04ed..cd7a472 100644 --- a/papyrus/ONAP Information Model/Vnf.uml +++ b/papyrus/ONAP Information Model/Vnf.uml @@ -597,6 +597,7 @@ This will probably need to move to common</body> <ownedComment xmi:type="uml:Comment" xmi:id="_sD2twBx-Eemit6R65X1VNQ" annotatedElement="_geJEUBx9Eemit6R65X1VNQ">
<body>Specifies the L2 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.</body>
</ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_zxlckB8-EemJTaeYhZuDRA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HiTcYBx-Eemit6R65X1VNQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HidNYBx-Eemit6R65X1VNQ" value="1"/>
</ownedAttribute>
@@ -604,6 +605,7 @@ This will probably need to move to common</body> <ownedComment xmi:type="uml:Comment" xmi:id="_uZ0fkBx-Eemit6R65X1VNQ" annotatedElement="_gy064Bx9Eemit6R65X1VNQ">
<body>Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.</body>
</ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_4DfhMB8_EemJTaeYhZuDRA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j1pWMBx-Eemit6R65X1VNQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j1pWMRx-Eemit6R65X1VNQ" value="1"/>
</ownedAttribute>
|