summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Scaggs <ks0567@att.com>2019-09-24 19:45:51 -0500
committerKevin Scaggs <ks0567@att.com>2019-09-24 19:45:51 -0500
commit954cff54ba79efdb921a0e24682889de18028a40 (patch)
tree53ee1f0ad4793dc0e0cd7201552aa1a2b8e4ad1a
parent3b9450eaa3ee824e558b40c50d7821185a0c51fd (diff)
Slight Updates to Common
Slight updates to ParameterGroup per interactions with Chuyi. Issue-ID: MODELING-104 Change-Id: Ic8cd82b714653660e1a332bc0c399fb314953faf Signed-off-by: Kevin Scaggs <ks0567@att.com>
-rw-r--r--ONAP Information Model/Common.notation113
-rw-r--r--ONAP Information Model/Common.uml19
2 files changed, 11 insertions, 121 deletions
diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 52a5ea7..db73853 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -8767,81 +8767,13 @@
<children xmi:type="notation:Shape" xmi:id="_SD5SAMTWEemrXPg1xDDmKg" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_SD8VUMTWEemrXPg1xDDmKg" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Common.uml#_SDwvIMTWEemrXPg1xDDmKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SD5SAcTWEemrXPg1xDDmKg" x="1080" y="40" width="221" height="41"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SD5SAcTWEemrXPg1xDDmKg" x="940" y="40" width="221" height="41"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_GkllwMprEemxyP_sJGfnPA" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_GkmM0MprEemxyP_sJGfnPA" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Common.uml#_Gkh7YMprEemxyP_sJGfnPA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkllwcprEemxyP_sJGfnPA" x="120" y="120" width="161" height="81"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_UMtD4NsXEemHzqRGrCYopQ" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_UMtq8NsXEemHzqRGrCYopQ" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_UMtq8dsXEemHzqRGrCYopQ" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UMtq8tsXEemHzqRGrCYopQ" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UMtq89sXEemHzqRGrCYopQ" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UMtq9NsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UMtq9dsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UMtq9tsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMtq99sXEemHzqRGrCYopQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UMtq-NsXEemHzqRGrCYopQ" visible="false" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UMtq-dsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UMtq-tsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UMtq-9sXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMtq_NsXEemHzqRGrCYopQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UMtq_dsXEemHzqRGrCYopQ" visible="false" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UMtq_tsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UMtq_9sXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UMtrANsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMtrAdsXEemHzqRGrCYopQ"/>
- </children>
- <element xmi:type="uml:Class" href="Common.uml#_UMqAkNsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMtD4dsXEemHzqRGrCYopQ" y="200"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UM4qE9sXEemHzqRGrCYopQ" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UM4qFNsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UM4qFtsXEemHzqRGrCYopQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_UMqAkNsXEemHzqRGrCYopQ"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UM4qFdsXEemHzqRGrCYopQ" x="200"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_dJOS8NsXEemHzqRGrCYopQ" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_dJO6ANsXEemHzqRGrCYopQ" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_dJO6AdsXEemHzqRGrCYopQ" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_dJO6AtsXEemHzqRGrCYopQ" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dJO6A9sXEemHzqRGrCYopQ" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dJO6BNsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dJO6BdsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dJO6BtsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJO6B9sXEemHzqRGrCYopQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dJO6CNsXEemHzqRGrCYopQ" visible="false" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dJO6CdsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dJO6CtsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dJO6C9sXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJO6DNsXEemHzqRGrCYopQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dJO6DdsXEemHzqRGrCYopQ" visible="false" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dJO6DtsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dJO6D9sXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dJO6ENsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJO6EdsXEemHzqRGrCYopQ"/>
- </children>
- <element xmi:type="uml:Class" href="Common.uml#_dJL2sNsXEemHzqRGrCYopQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJOS8dsXEemHzqRGrCYopQ" x="-20" y="560"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_dJZSE9sXEemHzqRGrCYopQ" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dJZSFNsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dJZSFtsXEemHzqRGrCYopQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_dJL2sNsXEemHzqRGrCYopQ"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJZSFdsXEemHzqRGrCYopQ" x="200"/>
- </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_diV8QZ0LEem7-cWktwUxRA" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_diV8Qp0LEem7-cWktwUxRA"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_diV8Q50LEem7-cWktwUxRA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -9032,7 +8964,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ww9kwL6ZEem4xcGs3yJOww" type="Association_NameLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_XO1MgL6ZEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww9kwb6ZEem4xcGs3yJOww" x="1" y="18"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww9kwb6ZEem4xcGs3yJOww" x="2" y="-1"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ww9kwr6ZEem4xcGs3yJOww" visible="false" type="Association_TargetRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_XPPcML6ZEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9149,46 +9081,5 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8FsL6gEem4xcGs3yJOww" id="(0.5693950177935944,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8Fsb6gEem4xcGs3yJOww" id="(0.4979253112033195,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_UM4qF9sXEemHzqRGrCYopQ" type="StereotypeCommentLink" source="_UMtD4NsXEemHzqRGrCYopQ" target="_UM4qE9sXEemHzqRGrCYopQ">
- <styles xmi:type="notation:FontStyle" xmi:id="_UM4qGNsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UM5RItsXEemHzqRGrCYopQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_UMqAkNsXEemHzqRGrCYopQ"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UM4qGdsXEemHzqRGrCYopQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UM5RINsXEemHzqRGrCYopQ"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UM5RIdsXEemHzqRGrCYopQ"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_dJZSF9sXEemHzqRGrCYopQ" type="StereotypeCommentLink" source="_dJOS8NsXEemHzqRGrCYopQ" target="_dJZSE9sXEemHzqRGrCYopQ">
- <styles xmi:type="notation:FontStyle" xmi:id="_dJZSGNsXEemHzqRGrCYopQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dJZSHNsXEemHzqRGrCYopQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_dJL2sNsXEemHzqRGrCYopQ"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dJZSGdsXEemHzqRGrCYopQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dJZSGtsXEemHzqRGrCYopQ"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dJZSG9sXEemHzqRGrCYopQ"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_jJ2_sNsXEemHzqRGrCYopQ" type="Generalization_Edge" source="_dJOS8NsXEemHzqRGrCYopQ" target="_UMtD4NsXEemHzqRGrCYopQ">
- <children xmi:type="notation:DecorationNode" xmi:id="_jJ2_s9sXEemHzqRGrCYopQ" type="Generalization_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1HGrkNsbEemHzqRGrCYopQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jJ3mwNsXEemHzqRGrCYopQ" x="-1" y="38"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_jJ2_sdsXEemHzqRGrCYopQ"/>
- <element xmi:type="uml:Generalization" href="Common.uml#_izIhwNsXEemHzqRGrCYopQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJ2_stsXEemHzqRGrCYopQ" points="[280, 340, -643984, -643984]$[125, 260, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j3eToNsXEemHzqRGrCYopQ" id="(0.2962962962962963,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j3eTodsXEemHzqRGrCYopQ" id="(0.16,1.0)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_liz0ENsXEemHzqRGrCYopQ" type="Generalization_Edge" source="_fdcTYJ2BEemXg71wwI_kPA" target="_UMtD4NsXEemHzqRGrCYopQ">
- <children xmi:type="notation:DecorationNode" xmi:id="_liz0E9sXEemHzqRGrCYopQ" type="Generalization_StereotypeLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_liz0FNsXEemHzqRGrCYopQ" y="40"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_liz0EdsXEemHzqRGrCYopQ"/>
- <element xmi:type="uml:Generalization" href="Common.uml#_lLuw0NsXEemHzqRGrCYopQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_liz0EtsXEemHzqRGrCYopQ" points="[520, 240, -643984, -643984]$[125, 240, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYrwNsXEemHzqRGrCYopQ" id="(0.11080332409972299,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYrwdsXEemHzqRGrCYopQ" id="(1.0,0.38461538461538464)"/>
- </edges>
</notation:Diagram>
</xmi:XMI>
diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index 0d0662b..f60c231 100644
--- a/ONAP Information Model/Common.uml
+++ b/ONAP Information Model/Common.uml
@@ -1491,15 +1491,21 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5ZpncIndEemVXsYTZj8frQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_WwqCwL6ZEem4xcGs3yJOww" name="ValueGroupHasParameter" memberEnd="_Wwr38L6ZEem4xcGs3yJOww _WwttIL6ZEem4xcGs3yJOww">
+ <packagedElement xmi:type="uml:Association" xmi:id="_WwqCwL6ZEem4xcGs3yJOww" name="ParameterGroupHasParameter" memberEnd="_Wwr38L6ZEem4xcGs3yJOww _WwttIL6ZEem4xcGs3yJOww">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WwrQ4L6ZEem4xcGs3yJOww" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WwrQ4b6ZEem4xcGs3yJOww" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_Wwr38L6ZEem4xcGs3yJOww" name="parameter" type="_Zqsc4L6XEem4xcGs3yJOww" association="_WwqCwL6ZEem4xcGs3yJOww">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_4bTo8N7ZEemt8qGnFrqSFA" annotatedElement="_WwqCwL6ZEem4xcGs3yJOww">
+ <body>A Parameter can be in more than one ParameterGroup, and a ParameterGroup can have some number of Parameters.</body>
+ </ownedComment>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_Wwr38L6ZEem4xcGs3yJOww" name="parameter" type="_Zqsc4L6XEem4xcGs3yJOww" aggregation="shared" association="_WwqCwL6ZEem4xcGs3yJOww">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_de5cYL6ZEem4xcGs3yJOww" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_de9t0L6ZEem4xcGs3yJOww" value="*"/>
</ownedEnd>
- <ownedEnd xmi:type="uml:Property" xmi:id="_WwttIL6ZEem4xcGs3yJOww" name="dynamicparameter" type="_fcsFcJ2BEemXg71wwI_kPA" association="_WwqCwL6ZEem4xcGs3yJOww"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_WwttIL6ZEem4xcGs3yJOww" name="dynamicparameter" type="_fcsFcJ2BEemXg71wwI_kPA" association="_WwqCwL6ZEem4xcGs3yJOww">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u5IvIN7ZEemt8qGnFrqSFA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u5eGUN7ZEemt8qGnFrqSFA" value="*"/>
+ </ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_ucwrsL6ZEem4xcGs3yJOww" name="ParameterEnumeratedBySpecValue" memberEnd="_ucxSwr6ZEem4xcGs3yJOww _ucyg4L6ZEem4xcGs3yJOww">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ucxSwL6ZEem4xcGs3yJOww" source="org.eclipse.papyrus">
@@ -1621,10 +1627,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS
<packagedElement xmi:type="uml:Class" xmi:id="_MbJhgDYjEemz0q_yvHDIRA" name="NS">
<generalization xmi:type="uml:Generalization" xmi:id="_Pjz7kDYjEemz0q_yvHDIRA" general="_Xht84CY2EemRA_CB-n5OfQ"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_UMqAkNsXEemHzqRGrCYopQ" name="SParameterGroup"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_dJL2sNsXEemHzqRGrCYopQ" name="DiscreteParmGroup">
- <generalization xmi:type="uml:Generalization" xmi:id="_izIhwNsXEemHzqRGrCYopQ" general="_UMqAkNsXEemHzqRGrCYopQ"/>
- </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_JjPoQOLJEeiKy5JVrA0UGA" name="RootObjectClasses">
<packagedElement xmi:type="uml:Class" xmi:id="_eCjlEOLJEeiKy5JVrA0UGA" name="RootEntity" isAbstract="true">
@@ -1806,7 +1808,6 @@ Permitted Values:&#xD;
<ownedComment xmi:type="uml:Comment" xmi:id="_zH0l8MTWEemrXPg1xDDmKg" annotatedElement="_fcsFcJ2BEemXg71wwI_kPA">
<body>A group of parameters that somehow relate or work together.</body>
</ownedComment>
- <generalization xmi:type="uml:Generalization" xmi:id="_lLuw0NsXEemHzqRGrCYopQ" general="_UMqAkNsXEemHzqRGrCYopQ"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_oy4YwJ2BEemXg71wwI_kPA" name="parameterGroupName">
<ownedComment xmi:type="uml:Comment" xmi:id="_2XkfcMTWEemrXPg1xDDmKg" annotatedElement="_oy4YwJ2BEemXg71wwI_kPA">
<body>Name of ParameterGroup</body>
@@ -5054,6 +5055,4 @@ Permitted Values:&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_XJtjwM8zEemfevCNCQbkKw" base_StructuralFeature="_XJrHgM8zEemfevCNCQbkKw"/>
<OpenModel_Profile:Experimental xmi:id="_yV7dcM8zEemfevCNCQbkKw" base_Element="_T7JtYM6AEemcqf4p4jcudw"/>
<OpenModel_Profile:Experimental xmi:id="_dHjlwM80EemfevCNCQbkKw" base_Element="_XJrHgM8zEemfevCNCQbkKw"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_UMqnoNsXEemHzqRGrCYopQ" base_Class="_UMqAkNsXEemHzqRGrCYopQ"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_dJMdwNsXEemHzqRGrCYopQ" base_Class="_dJL2sNsXEemHzqRGrCYopQ"/>
</xmi:XMI>