1 files changed, 9 insertions, 10 deletions
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>