From 90897122329cd8906790ff1f58955275de1efff6 Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
Date: Thu, 11 Apr 2019 07:24:17 -0500
Subject: Additional Service Stereotype Update

Updated an additional relationship on ServiceOrder diagram to
preliminary.

Issue-ID: MODELING-104

Change-Id: Ib29929da507e5c5408ffd3478dbb9f09bd48bcc2
Signed-off-by: Kevin Scaggs <ks0567@att.com>
---
 ONAP Information Model/Service.notation | 20 +++++++++++++-
 ONAP Information Model/Service.uml      | 46 +++++++++------------------------
 2 files changed, 31 insertions(+), 35 deletions(-)

(limited to 'ONAP Information Model')

diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 4683318..8ab11a7 100644
--- a/ONAP Information Model/Service.notation	
+++ b/ONAP Information Model/Service.notation	
@@ -723,6 +723,14 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q6K-sloLEemSNe5QiI5UBQ" x="960" y="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_xzXUIFrNEem07dac9irJSQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xzXUIVrNEem07dac9irJSQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xzXUI1rNEem07dac9irJSQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_IdqxoI9WEeiT7tMsBl6xjA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzXUIlrNEem07dac9irJSQ" x="680" y="40"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_kngqQYn9EeiOe-BKGdv_Yg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_kngqQon9EeiOe-BKGdv_Yg"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_kngqQ4n9EeiOe-BKGdv_Yg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -1142,6 +1150,16 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q6K-t1oLEemSNe5QiI5UBQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q6K-uFoLEemSNe5QiI5UBQ"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xzXUJFrNEem07dac9irJSQ" type="StereotypeCommentLink" source="_IstTMI9WEeiT7tMsBl6xjA" target="_xzXUIFrNEem07dac9irJSQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xzXUJVrNEem07dac9irJSQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xzX7MFrNEem07dac9irJSQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_IdqxoI9WEeiT7tMsBl6xjA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xzXUJlrNEem07dac9irJSQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xzXUJ1rNEem07dac9irJSQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xzXUKFrNEem07dac9irJSQ"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_LKKcAI91EeiT7tMsBl6xjA" type="PapyrusUMLClassDiagram" name="Service Catalog" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_7uLZsI91EeiT7tMsBl6xjA" type="Class_Shape">
@@ -2359,7 +2377,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ZFgA-gIEeiNE-az-riPDQ"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_7Y7u8OgIEeiNE-az-riPDQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ZFf8egIEeiNE-az-riPDQ" x="40" y="220" width="101"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ZFf8egIEeiNE-az-riPDQ" x="40" y="220" width="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7ZOp7ugIEeiNE-az-riPDQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7ZOp7-gIEeiNE-az-riPDQ"/>
diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index 65ed696..f722c78 100644
--- a/ONAP Information Model/Service.uml	
+++ b/ONAP Information Model/Service.uml	
@@ -235,7 +235,7 @@
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hU0ZocGkEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedComment xmi:type="uml:Comment" xmi:id="_7KUVAMHFEeirPIyAdej0kg" annotatedElement="_hUzLgMGkEeiS695oPTRE1Q">
-          <body>Enables specifying any kind of relastionships between ServiceOrderItems</body>
+          <body>Enables specifying any kind of relationships between ServiceOrderItems</body>
         </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="__mP8gMG_EeiS695oPTRE1Q" name="type">
           <ownedComment xmi:type="uml:Comment" xmi:id="_QqfcUMNPEeik36qdAhNdCw" annotatedElement="__mP8gMG_EeiS695oPTRE1Q">
@@ -258,7 +258,7 @@
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MnE0sMGjEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedComment xmi:type="uml:Comment" xmi:id="_SeyhEMHGEeirPIyAdej0kg" annotatedElement="_MnBKUMGjEeiS695oPTRE1Q">
-          <body>An assocation between two ServiceOrders.</body>
+          <body>An association between two ServiceOrders.</body>
         </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_R9Rn4MGkEeiS695oPTRE1Q" name="type">
           <ownedComment xmi:type="uml:Comment" xmi:id="_tEYKYMNMEeik36qdAhNdCw" annotatedElement="_R9Rn4MGkEeiS695oPTRE1Q">
@@ -317,15 +317,6 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DjpJwOgNEeiNE-az-riPDQ" value="*"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_LtMDwOgNEeiNE-az-riPDQ" name="SDHasAttachments" memberEnd="_LtMDw-gNEeiNE-az-riPDQ _LtMDx-gNEeiNE-az-riPDQ">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LtMDwegNEeiNE-az-riPDQ" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LtMDwugNEeiNE-az-riPDQ" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_LtMDx-gNEeiNE-az-riPDQ" name="internalservicedescriptor" type="_W1wF4OgIEeiNE-az-riPDQ" association="_LtMDwOgNEeiNE-az-riPDQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dP1bIOgNEeiNE-az-riPDQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dQI9IOgNEeiNE-az-riPDQ" value="*"/>
-        </ownedEnd>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_l1QY0OgNEeiNE-az-riPDQ" name="SDHasReferenceonReourceDescriptor" memberEnd="_l1QY0-gNEeiNE-az-riPDQ _l1issOgNEeiNE-az-riPDQ">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l1QY0egNEeiNE-az-riPDQ" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l1QY0ugNEeiNE-az-riPDQ" key="nature" value="UML_Nature"/>
@@ -344,15 +335,6 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FHg60OgOEeiNE-az-riPDQ" value="1"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_xe7WsOunEeiSZPIvixpf_Q" name="OnboardNSDasAttachement" visibility="package" memberEnd="_xfORoeunEeiSZPIvixpf_Q _xf94gOunEeiSZPIvixpf_Q">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xfFHsOunEeiSZPIvixpf_Q" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xfORoOunEeiSZPIvixpf_Q" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_xf94gOunEeiSZPIvixpf_Q" name="onboardnsdescriptor" type="_zSX3gOgIEeiNE-az-riPDQ" association="_xe7WsOunEeiSZPIvixpf_Q">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JQVWYOuoEeiSZPIvixpf_Q"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JQfHYOuoEeiSZPIvixpf_Q" value="*"/>
-        </ownedEnd>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_hhVcIOuoEeiSZPIvixpf_Q" name="wrapedasNestedService" memberEnd="_hhVcI-uoEeiSZPIvixpf_Q _hhVcJ-uoEeiSZPIvixpf_Q">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhVcIeuoEeiSZPIvixpf_Q" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhVcIuuoEeiSZPIvixpf_Q" key="nature" value="UML_Nature"/>
@@ -947,10 +929,19 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_UWL1gMDfEeiebIKjAGZWdA" name="ServiceCharacteristic">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_pdNhcFuREemhIbrwQ6FkuQ" annotatedElement="_UWL1gMDfEeiebIKjAGZWdA">
+          <body>A quality or distinctive feature that defines an entity, including the name of this feature (attribute), and the type of the actual value.</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_gEq14MDfEeiebIKjAGZWdA" name="name">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_v4hKQFuMEemhIbrwQ6FkuQ" annotatedElement="_gEq14MDfEeiebIKjAGZWdA">
+            <body>Name of dynamic characteristic (attribute).</body>
+          </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_j0sK4MDfEeiebIKjAGZWdA" name="valueType">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0B1JAFuMEemhIbrwQ6FkuQ" annotatedElement="_j0sK4MDfEeiebIKjAGZWdA">
+            <body>Type of the dynamic characteristic value.</body>
+          </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
       </packagedElement>
@@ -1039,10 +1030,6 @@ If it is set to True, management and orchestration functions are responsible for
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_za_rMOgMEeiNE-az-riPDQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_za_rMegMEeiNE-az-riPDQ" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_LtMDw-gNEeiNE-az-riPDQ" name="attachments" type="_GNGcIOgJEeiNE-az-riPDQ" association="_LtMDwOgNEeiNE-az-riPDQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LtMDxegNEeiNE-az-riPDQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LtMDxugNEeiNE-az-riPDQ" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_l1QY0-gNEeiNE-az-riPDQ" name="resourcedescriptor" association="_l1QY0OgNEeiNE-az-riPDQ">
           <type xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l1Y7sOgNEeiNE-az-riPDQ" value="1"/>
@@ -1132,10 +1119,6 @@ If it is set to True, management and orchestration functions are responsible for
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_zSX3gOgIEeiNE-az-riPDQ" name="OnboardNSDescriptor">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_xfORoeunEeiSZPIvixpf_Q" name="attachments" type="_GNGcIOgJEeiNE-az-riPDQ" aggregation="shared" association="_xe7WsOunEeiSZPIvixpf_Q">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xfhzoOunEeiSZPIvixpf_Q"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xfq9kOunEeiSZPIvixpf_Q" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_E9fK4OvZEeiEwrkYFEP6YA" name="nsdIdentifier">
           <ownedComment xmi:type="uml:Comment" xmi:id="_E9fK4evZEeiEwrkYFEP6YA" annotatedElement="_E9fK4OvZEeiEwrkYFEP6YA">
             <body>Identifier of this NSD class. It globally uniquely identifies an instance of the NSD</body>
@@ -1200,7 +1183,6 @@ NOTE 2: 	There may be multiple data sources (each identified as monitoredInfo) p
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_5Tkk8OgIEeiNE-az-riPDQ" name="GlobalType"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_7Y7u8OgIEeiNE-az-riPDQ" name="CustomizedType"/>
-      <packagedElement xmi:type="uml:Class" xmi:id="_GNGcIOgJEeiNE-az-riPDQ" name="Attachments" visibility="public"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_uOXPwPL4EeiazPylpq3fUA" name="sliceProfile?"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_1WWbsDzFEeiWMf5FLWfdLA" name="NetworkServiceInstance">
         <ownedComment xmi:type="uml:Comment" xmi:id="_1WWbsTzFEeiWMf5FLWfdLA" annotatedElement="_1WWbsDzFEeiWMf5FLWfdLA">
@@ -1514,19 +1496,14 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_zSX3gegIEeiNE-az-riPDQ" base_Class="_zSX3gOgIEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_5Tkk8egIEeiNE-az-riPDQ" base_Class="_5Tkk8OgIEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_7Y7u8egIEeiNE-az-riPDQ" base_Class="_7Y7u8OgIEeiNE-az-riPDQ"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_GNGcIegJEeiNE-az-riPDQ" base_Class="_GNGcIOgJEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_NGtQ5OgMEeiNE-az-riPDQ" base_StructuralFeature="_NGtQ4-gMEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_NHAL0egMEeiNE-az-riPDQ" base_StructuralFeature="_NHAL0OgMEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_za16NOgMEeiNE-az-riPDQ" base_StructuralFeature="_za16M-gMEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_za_rM-gMEeiNE-az-riPDQ" base_StructuralFeature="_za_rMugMEeiNE-az-riPDQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_LtMDxOgNEeiNE-az-riPDQ" base_StructuralFeature="_LtMDw-gNEeiNE-az-riPDQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_LtMDyOgNEeiNE-az-riPDQ" base_StructuralFeature="_LtMDx-gNEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_l1QY1OgNEeiNE-az-riPDQ" base_StructuralFeature="_l1QY0-gNEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_l1issegNEeiNE-az-riPDQ" base_StructuralFeature="_l1issOgNEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_3c92ZOgNEeiNE-az-riPDQ" base_StructuralFeature="_3c92Y-gNEeiNE-az-riPDQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_3c92aOgNEeiNE-az-riPDQ" base_StructuralFeature="_3c92Z-gNEeiNE-az-riPDQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xfORouunEeiSZPIvixpf_Q" base_StructuralFeature="_xfORoeunEeiSZPIvixpf_Q"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xf94geunEeiSZPIvixpf_Q" base_StructuralFeature="_xf94gOunEeiSZPIvixpf_Q"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_hhVcJOuoEeiSZPIvixpf_Q" base_StructuralFeature="_hhVcI-uoEeiSZPIvixpf_Q"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_hhfNIOuoEeiSZPIvixpf_Q" base_StructuralFeature="_hhVcJ-uoEeiSZPIvixpf_Q"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_E9fK4uvZEeiEwrkYFEP6YA" base_StructuralFeature="_E9fK4OvZEeiEwrkYFEP6YA" isInvariant="true"/>
@@ -1663,4 +1640,5 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_G-c8cFoLEemSNe5QiI5UBQ" base_Element="_6z5EwMGTEeiS695oPTRE1Q"/>
   <OpenModel_Profile:Preliminary xmi:id="_MyglwFoLEemSNe5QiI5UBQ" base_Element="_OGFpEMDiEeiebIKjAGZWdA"/>
   <OpenModel_Profile:Preliminary xmi:id="_Q5paQFoLEemSNe5QiI5UBQ" base_Element="_Lvny4MDgEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_xyntQFrNEem07dac9irJSQ" base_Element="_IdqxoI9WEeiT7tMsBl6xjA"/>
 </xmi:XMI>
-- 
cgit 1.2.3-korg