Updates to License submodel

Made some updates to the license submodel per recent comments from
Ericsson

Issue-ID: MODELING-104

Change-Id: I5beff300d57b9de9659fe9abf6b430217b3a76e2
Signed-off-by: Kevin Scaggs <ks0567@att.com>

2 files changed, 26 insertions, 49 deletions

diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation
index a631443..9bac050 100644
--- a/ONAP Information Model/License.notation
+++ b/ONAP Information Model/License.notation
@@ -638,15 +638,6 @@
           <element xmi:type="uml:Property" href="License.uml#_LybEoAOOEemCCMXOyOLwIw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_H9Ge49okEem3eo_-dvCqmw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_H9Ge5NokEem3eo_-dvCqmw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_H9eSUNokEem3eo_-dvCqmw" visible="false" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H9eSUdokEem3eo_-dvCqmw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9eSUtokEem3eo_-dvCqmw"/>

-          </children>

-          <element xmi:type="uml:Property" href="License.uml#_OFmoMAOOEemCCMXOyOLwIw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_H9Ge5dokEem3eo_-dvCqmw"/>

-        </children>

         <children xmi:type="notation:Shape" xmi:id="_H9Ge5tokEem3eo_-dvCqmw" type="Property_ClassAttributeLabel">

           <element xmi:type="uml:Property" href="License.uml#_DVQbcFxsEemycfDPZTAung"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_H9Ge59okEem3eo_-dvCqmw"/>

@@ -882,11 +873,20 @@
       </children>

       <children xmi:type="notation:BasicCompartment" xmi:id="_GzREcwMJEemoQ5ZgWCUg_g" type="Class_AttributeCompartment">

         <children xmi:type="notation:Shape" xmi:id="_m5CLkNokEem3eo_-dvCqmw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_m5Yw4NokEem3eo_-dvCqmw" visible="false" type="StereotypeLabel">

+          <children xmi:type="notation:DecorationNode" xmi:id="_m5Yw4NokEem3eo_-dvCqmw" type="StereotypeLabel">

+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CDr6MEheEeqUdr85s9pcmw" source="PapyrusCSSForceValue">

+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CDr6MUheEeqUdr85s9pcmw" key="visible" value="true"/>

+            </eAnnotations>

             <styles xmi:type="notation:StringValueStyle" xmi:id="_m5Yw4dokEem3eo_-dvCqmw" name="stereotype" stringValue="OpenModel_Profile::Experimental"/>

             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_FU4UgJ2EEeSk-dMsN-xZbw"/>

             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m5Yw4tokEem3eo_-dvCqmw"/>

           </children>

+          <children xmi:type="notation:DecorationNode" xmi:id="_d0bPhEhZEeqUdr85s9pcmw" visible="false" type="StereotypeLabel">

+            <styles xmi:type="notation:StringValueStyle" xmi:id="_d0bPhUhZEeqUdr85s9pcmw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d0bPhkhZEeqUdr85s9pcmw"/>

+          </children>

+          <styles xmi:type="notation:IntValueStyle" xmi:id="_APpJsEheEeqUdr85s9pcmw" name="shapeDirection" intValue="2"/>

           <element xmi:type="uml:Property" href="License.uml#_BLpV4P19EeisxOMTY1eUug"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_m5CLkdokEem3eo_-dvCqmw"/>

         </children>

@@ -1388,11 +1388,6 @@
       </children>

       <children xmi:type="notation:BasicCompartment" xmi:id="_RNdnJf2SEeisxOMTY1eUug" type="Class_AttributeCompartment">

         <children xmi:type="notation:Shape" xmi:id="_F3E1ECoxEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_F3HRUCoxEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_F3HRUSoxEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F3HRUioxEemnoK-fhDe5lw"/>

-          </children>

           <element xmi:type="uml:Property" href="License.uml#_FeFtUCoxEemnoK-fhDe5lw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_F3E1ESoxEemnoK-fhDe5lw"/>

         </children>

@@ -1431,11 +1426,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_RNdnMv2SEeisxOMTY1eUug"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RNdnM_2SEeisxOMTY1eUug"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__C_8kNohEem3eo_-dvCqmw" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="__C_8kdohEem3eo_-dvCqmw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__C_8ktohEem3eo_-dvCqmw"/>

-      </children>

       <element xmi:type="uml:Class" href="License.uml#_Omfk4P2SEeisxOMTY1eUug"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RNdnIf2SEeisxOMTY1eUug" x="380" y="280" width="241" height="101"/>

     </children>

@@ -2519,15 +2509,6 @@
           <element xmi:type="uml:Property" href="License.uml#_LybEoAOOEemCCMXOyOLwIw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_kMKH8Qe-EeqgQMsQBX3k5g"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_kMKH8ge-EeqgQMsQBX3k5g" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_kMYxdwe-EeqgQMsQBX3k5g" visible="false" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_kMYxeAe-EeqgQMsQBX3k5g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kMYxeQe-EeqgQMsQBX3k5g"/>

-          </children>

-          <element xmi:type="uml:Property" href="License.uml#_OFmoMAOOEemCCMXOyOLwIw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kMKH8we-EeqgQMsQBX3k5g"/>

-        </children>

         <children xmi:type="notation:Shape" xmi:id="_kMKH9Ae-EeqgQMsQBX3k5g" type="Property_ClassAttributeLabel">

           <children xmi:type="notation:DecorationNode" xmi:id="_kMamoAe-EeqgQMsQBX3k5g" visible="false" type="StereotypeLabel">

             <styles xmi:type="notation:StringValueStyle" xmi:id="_kMamoQe-EeqgQMsQBX3k5g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

@@ -2547,6 +2528,9 @@
           <layoutConstraint xmi:type="notation:Location" xmi:id="_kMKH9we-EeqgQMsQBX3k5g"/>

         </children>

         <children xmi:type="notation:Shape" xmi:id="_kMKvAAe-EeqgQMsQBX3k5g" type="Property_ClassAttributeLabel">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NAeXsEg5EeqrN_dABcC8eA" source="PapyrusCSSForceValue">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NAe-wEg5EeqrN_dABcC8eA" key="fontColor" value="true"/>

+          </eAnnotations>

           <children xmi:type="notation:DecorationNode" xmi:id="_kMe4EAe-EeqgQMsQBX3k5g" visible="false" type="StereotypeLabel">

             <styles xmi:type="notation:StringValueStyle" xmi:id="_kMe4EQe-EeqgQMsQBX3k5g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>

diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml
index e7babac..c0c105d 100644
--- a/ONAP Information Model/License.uml
+++ b/ONAP Information Model/License.uml
@@ -107,8 +107,8 @@ MRN should also be provided, but is not required.</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_r3zb0NS3EemxF5TqBFPL8g" annotatedElement="_n3op0AVlEemrBZmpgd_POA">

             <body>FeatureGroup can be related to some number of EntitlementPools.</body>

           </ownedComment>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y1BkcAVlEemrBZmpgd_POA" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y1F14AVlEemrBZmpgd_POA" value="1"/>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y1BkcAVlEemrBZmpgd_POA"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y1F14AVlEemrBZmpgd_POA" value="*"/>

         </ownedEnd>

       </packagedElement>

       <packagedElement xmi:type="uml:Association" xmi:id="_mQo20AVlEemrBZmpgd_POA" name="FeatureGroupHasLicenceKeyPool" memberEnd="_mQqsAAVlEemrBZmpgd_POA _mQrTEAVlEemrBZmpgd_POA">

@@ -129,6 +129,8 @@ MRN should also be provided, but is not required.</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_kyefQNS0EemxF5TqBFPL8g" annotatedElement="_mQrTEAVlEemrBZmpgd_POA">

             <body>A feature group can be related to some number of LicenseKeyPools</body>

           </ownedComment>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HO36kEg7EeqUdr85s9pcmw"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HPOf4Eg7EeqUdr85s9pcmw" value="*"/>

         </ownedEnd>

       </packagedElement>

       <packagedElement xmi:type="uml:Association" xmi:id="_LMfMoAVoEemrBZmpgd_POA" name="LicenseAgreementHasFeatureGroup" memberEnd="_LMgawgVoEemrBZmpgd_POA _LMho4AVoEemrBZmpgd_POA">

@@ -298,17 +300,6 @@ A license key group is not specific to a feature group.  A license key group may
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_itis8FxsEemycfDPZTAung"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_itm-YFxsEemycfDPZTAung" value="1"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_OFmoMAOOEemCCMXOyOLwIw" name="manufactureReferenceNumber">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_1gI8MAR7Eemo7ZzqT33fqQ" annotatedElement="_OFmoMAOOEemCCMXOyOLwIw">

-            <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_UUv44L4IEemK6JiDsak_Cg">

-            <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>

-          </ownedComment>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X9Q7ECu1EemHS6guZRbYAw"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X9gLoCu1EemHS6guZRbYAw" value="1"/>

-        </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_DVQbcFxsEemycfDPZTAung" name="invariantId">

           <ownedComment xmi:type="uml:Comment" xmi:id="_FzCbYNPfEemT28hM6O3M4A" annotatedElement="_DVQbcFxsEemycfDPZTAung">

             <body>Identifier that stays the same irrespective of version.</body>

@@ -367,10 +358,13 @@ A license key group is not specific to a feature group.  A license key group may
           </ownedComment>

           <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_xXnn4M5_Eemcqf4p4jcudw" name="licensekey">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_xXnn4M5_Eemcqf4p4jcudw" name="licenseKeyFile">

           <ownedComment xmi:type="uml:Comment" xmi:id="_XtlpgNPsEemmedxZoaqdIw" annotatedElement="_xXnn4M5_Eemcqf4p4jcudw">

             <body>Vendor provided license key file that is entered into the vendor software to activiate / unlock it.</body>

           </ownedComment>

+          <ownedComment xmi:type="uml:Comment" xmi:id="_0gXskEnFEeqJtobn01H_rw">

+            <body>Vendor provided license key file that is entered into the vendor software to activiate / unlock it.</body>

+          </ownedComment>

           <type xmi:type="uml:PrimitiveType" href="Common.uml#_T7JtYM6AEemcqf4p4jcudw"/>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nQP50M6AEemcqf4p4jcudw"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nQdVMM6AEemcqf4p4jcudw" value="1"/>

@@ -472,9 +466,9 @@ Multiple pools for the same type of entitlement may be created based on the cons
 &#xD;

 An Entitlement Pool is created for each type of Entitlement that is required for the software products.   Each Entitlement Pool is assigned a Name and Description for modeling purposes and is uniquely identified by a UUID. In addition, a list of characteristics of the Entitlement Pool are defined.&#xD;

 &#xD;

-Controllers will request entitlements.&#xD;

+Controllers may request entitlements.&#xD;

+&#xD;

 &#xD;

-An entitlement pool is not specific to a feature group.  An entitlement pool may be related to multiple feature groups of a software item or even to multiple software items.&#xD;

 &#xD;

 &#xD;

 &#xD;

@@ -511,10 +505,10 @@ An entitlement pool is not specific to a feature group.  An entitlement pool may
         </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_BLpV4P19EeisxOMTY1eUug" name="entitlementManufactureReferenceNumber">

           <ownedComment xmi:type="uml:Comment" xmi:id="_N6jM8APJEemCCMXOyOLwIw" annotatedElement="_BLpV4P19EeisxOMTY1eUug">

-            <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>

+            <body>Reference number for the entitlement as described by the vendor in their price list / catalog /contract.</body>

           </ownedComment>

           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3MQOQJ3SEemXg71wwI_kPA"/>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3MQOQJ3SEemXg71wwI_kPA" value="1"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MXjAJ3SEemXg71wwI_kPA" value="1"/>

         </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_BluCwP19EeisxOMTY1eUug" name="entitlementPurchaseIncrements">

@@ -793,10 +787,8 @@ Not applicable when license type is Perpetual.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_XHdLsJIDEemcKqT9M_AFKA" base_StructuralFeature="_XHckoJIDEemcKqT9M_AFKA"/>

   <OpenModel_Profile:Experimental xmi:id="_sp3Q8JQ3EemOEtHYIW7DFw" base_Element="_XHckoJIDEemcKqT9M_AFKA"/>

   <OpenModel_Profile:Experimental xmi:id="_REgXIJQ6EemOEtHYIW7DFw" base_Element="_HVtowAOOEemCCMXOyOLwIw"/>

-  <OpenModel_Profile:Experimental xmi:id="_VBct0JQ6EemOEtHYIW7DFw" base_Element="_OFmoMAOOEemCCMXOyOLwIw"/>

   <OpenModel_Profile:Experimental xmi:id="_fnNWIJQ7EemOEtHYIW7DFw" base_Element="_DVQbcFxsEemycfDPZTAung"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_r8sooLLmEem-C4S9EyeNSA" base_StructuralFeature="_r8plULLmEem-C4S9EyeNSA"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_UU9UQL4IEemK6JiDsak_Cg" base_Comment="_UUv44L4IEemK6JiDsak_Cg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_9kM1EL4OEemK6JiDsak_Cg" base_Class="_9kMOAL4OEemK6JiDsak_Cg"/>

   <ActionLanguage:TextualRepresentation xmi:id="_Nul2cL7HEem4xcGs3yJOww" base_Comment="_NuESAL7HEem4xcGs3yJOww" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_Yh3fkMA3Eem3GPFSfqjGLQ" base_Class="_Yh24gMA3Eem3GPFSfqjGLQ"/>

@@ -859,4 +851,5 @@ Not applicable when license type is Perpetual.&#xD;
   <OpenModel_Profile:Reference xmi:id="_XWNjcArjEeqW-467Rt61hA" base_Element="_UsE8IARuEemo7ZzqT33fqQ" reference="As Built in ASDC; Not related to any release usecase."/>

   <OpenModel_Profile:Experimental xmi:id="_ZqM_UArjEeqW-467Rt61hA" base_Element="_oaES0A64EemnO9QINOJnHg"/>

   <OpenModel_Profile:Reference xmi:id="_ZqsHgArjEeqW-467Rt61hA" base_Element="_oaES0A64EemnO9QINOJnHg" reference="As Built in ASDC; Not related to any release usecase."/>

+  <ActionLanguage:TextualRepresentation xmi:id="_0gzxcEnFEeqJtobn01H_rw" base_Comment="_0gXskEnFEeqJtobn01H_rw" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

 </xmi:XMI>