Common Updates - License and Policy

Slight updates to both license and policy work

Issue-ID: MODELING-104

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

2 files changed, 218 insertions, 57 deletions

diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation
index ea1563f..3a890eb 100644
--- a/papyrus/ONAP Information Model/Common.notation
+++ b/papyrus/ONAP Information Model/Common.notation
@@ -8937,77 +8937,86 @@
           <element xmi:type="uml:Property" href="Common.uml#_jOvlIAOOEemCCMXOyOLwIw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_jPLC8QOOEemCCMXOyOLwIw"/>

         </children>

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

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

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

+        <children xmi:type="notation:Shape" xmi:id="_pcWLAA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

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

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

           </children>

-          <element xmi:type="uml:Property" href="Common.uml#_kYusAAOOEemCCMXOyOLwIw"/>

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

+          <element xmi:type="uml:Property" href="Common.uml#_UcqsEA6_EemnO9QINOJnHg"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pcWLAQ6_EemnO9QINOJnHg"/>

         </children>

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

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

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

+        <children xmi:type="notation:Shape" xmi:id="_vbtscA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_lUfwsAOOEemCCMXOyOLwIw"/>

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

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbtscQ6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCrjoAO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BCzfcAO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

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

+        <children xmi:type="notation:Shape" xmi:id="_vbuTgA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BCzfcgO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCrjoQO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTgQ6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCsKsAO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BC17sAO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

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

+        <children xmi:type="notation:Shape" xmi:id="_vbuTgg6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BC17sgO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCsKsQO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTgw6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCsKsgO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BC4X8AO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

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

+        <children xmi:type="notation:Shape" xmi:id="_vbuThA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BC4X8gO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_AeYwcOwoEei7-e9MrPJW7Q"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCsKswO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuThQ6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCsxwAO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BC8pYAO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

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

+        <children xmi:type="notation:Shape" xmi:id="_vbuThg6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BC8pYgO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCsxwQO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuThw6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCsxwgO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BC-ekAO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_BC-ekQO-EemCCMXOyOLwIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_vbuTiA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BC-ekgO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCsxwwO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTiQ6_EemnO9QINOJnHg"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_BCtY0AO-EemCCMXOyOLwIw" type="Property_ClassAttributeLabel">

-          <children xmi:type="notation:DecorationNode" xmi:id="_BDATwAO-EemCCMXOyOLwIw" visible="false" type="StereotypeLabel">

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

+        <children xmi:type="notation:Shape" xmi:id="_vbu6kA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDATwgO-EemCCMXOyOLwIw"/>

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BCtY0QO-EemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbu6kQ6_EemnO9QINOJnHg"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_vbu6kg6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Common.uml#_VLsNUASPEemo7ZzqT33fqQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbu6kw6_EemnO9QINOJnHg"/>

         </children>

         <styles xmi:type="notation:TitleStyle" xmi:id="__gY_Et3tEei-jeeHUjfpLA"/>

         <styles xmi:type="notation:SortingStyle" xmi:id="__gY_E93tEei-jeeHUjfpLA"/>

@@ -9032,7 +9041,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__giJAt3tEei-jeeHUjfpLA"/>

       </children>

       <element xmi:type="uml:Class" href="Common.uml#_oURIoMfyEeiEtuRgTYzSUQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__gYYAd3tEei-jeeHUjfpLA" x="520" y="400" width="241"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__gYYAd3tEei-jeeHUjfpLA" x="500" y="400" width="281"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="__glMU93tEei-jeeHUjfpLA" type="StereotypeComment">

       <styles xmi:type="notation:TitleStyle" xmi:id="__glMVN3tEei-jeeHUjfpLA"/>

@@ -9334,7 +9343,7 @@
       <element xmi:type="uml:Association" href="Common.uml#_Jg-TMN3uEei-jeeHUjfpLA"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JhROIt3uEei-jeeHUjfpLA" points="[656, 140, -643984, -643984]$[620, 420, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhfQkN3uEei-jeeHUjfpLA" id="(0.498220640569395,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhfQkd3uEei-jeeHUjfpLA" id="(0.4979253112033195,0.0)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhfQkd3uEei-jeeHUjfpLA" id="(0.498220640569395,0.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_T6JGgt3uEei-jeeHUjfpLA" type="StereotypeCommentLink" source="_T6BxsN3uEei-jeeHUjfpLA" target="_T6JGft3uEei-jeeHUjfpLA">

       <styles xmi:type="notation:FontStyle" xmi:id="_T6JGg93uEei-jeeHUjfpLA"/>

@@ -9534,7 +9543,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_SkRi4d3yEei-jeeHUjfpLA"/>

       <element xmi:type="uml:Association" href="Common.uml#_Sj1eAN3yEei-jeeHUjfpLA"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SkRi4t3yEei-jeeHUjfpLA" points="[741, 440, -643984, -643984]$[920, 520, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SknhIN3yEei-jeeHUjfpLA" id="(1.0,0.6666666666666666)"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SknhIN3yEei-jeeHUjfpLA" id="(1.0,0.6201550387596899)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SknhId3yEei-jeeHUjfpLA" id="(0.0,0.4)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_HvVkMN3zEei-jeeHUjfpLA" type="Association_Edge" source="_VuAQwN3uEei-jeeHUjfpLA" target="_-_hGoN3tEei-jeeHUjfpLA">

@@ -12902,6 +12911,37 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_os4fgOzqEei7-e9MrPJW7Q" id="(0.4975124378109453,0.0)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_os4fgezqEei7-e9MrPJW7Q" id="(0.4979253112033195,1.0)"/>

     </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_VD7loBBaEemHjtkpPBz29Q" type="Association_Edge" source="_VwUH0OzqEei7-e9MrPJW7Q" target="_RUk8UOzqEei7-e9MrPJW7Q">

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MsBBaEemHjtkpPBz29Q" type="Association_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WIOUMBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MsRBaEemHjtkpPBz29Q" x="1" y="-18"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MshBaEemHjtkpPBz29Q" type="Association_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WIYsQBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MsxBaEemHjtkpPBz29Q" x="83" y="51"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MtBBaEemHjtkpPBz29Q" visible="false" type="Association_TargetRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WIh2MBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MtRBaEemHjtkpPBz29Q" x="75" y="-17"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MthBaEemHjtkpPBz29Q" visible="false" type="Association_SourceRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WIrnMBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MtxBaEemHjtkpPBz29Q" x="-76" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MuBBaEemHjtkpPBz29Q" type="Association_SourceMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WI0xIBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MuRBaEemHjtkpPBz29Q" x="75" y="18"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VD8MuhBaEemHjtkpPBz29Q" type="Association_TargetMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WJeRYBBaEemHjtkpPBz29Q" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD8MuxBaEemHjtkpPBz29Q" x="-76" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_VD7loRBaEemHjtkpPBz29Q"/>

+      <element xmi:type="uml:Association" href="Common.uml#_VC8uMBBaEemHjtkpPBz29Q"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VD7lohBaEemHjtkpPBz29Q" points="[340, 400, -643984, -643984]$[220, 400, -643984, -643984]$[220, 140, -643984, -643984]$[460, 140, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VEowQBBaEemHjtkpPBz29Q" id="(0.0,0.4968944099378882)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VEowQRBaEemHjtkpPBz29Q" id="(0.0,0.425531914893617)"/>

+    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_MzBnQOzrEei7-e9MrPJW7Q" type="PapyrusUMLClassDiagram" name="Policy Action" measurementUnit="Pixel">

     <children xmi:type="notation:Shape" xmi:id="_OKJLMOzrEei7-e9MrPJW7Q" type="Class_Shape">

@@ -16774,7 +16814,7 @@
       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_J2m1iv1qEeisxOMTY1eUug" type="Association_TargetMultiplicityLabel">

         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OGWEAP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J2m1i_1qEeisxOMTY1eUug" x="-16" y="7"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J2m1i_1qEeisxOMTY1eUug" x="-13" y="-4"/>

       </children>

       <styles xmi:type="notation:FontStyle" xmi:id="_J2mOcf1qEeisxOMTY1eUug"/>

       <element xmi:type="uml:Association" href="Common.uml#_J2HtUP1qEeisxOMTY1eUug"/>

@@ -17505,6 +17545,14 @@
           <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_3aXtEP_BEeiQG4ZZm0HgYw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx7RowPBEemCCMXOyOLwIw"/>

         </children>

+        <children xmi:type="notation:Shape" xmi:id="_YYAbEA7REemt4sxwHCtdEg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_bT5CEAPIEemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_YYAbEQ7REemt4sxwHCtdEg"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_YYEFcA7REemt4sxwHCtdEg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_cn_uQAPIEemCCMXOyOLwIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_YYEFcQ7REemt4sxwHCtdEg"/>

+        </children>

         <styles xmi:type="notation:TitleStyle" xmi:id="_HmRFFgPBEemCCMXOyOLwIw"/>

         <styles xmi:type="notation:SortingStyle" xmi:id="_HmRFFwPBEemCCMXOyOLwIw"/>

         <styles xmi:type="notation:FilteringStyle" xmi:id="_HmRFGAPBEemCCMXOyOLwIw"/>

@@ -17615,6 +17663,36 @@
       <element xmi:type="uml:Enumeration" href="Common.uml#_UsE8IARuEemo7ZzqT33fqQ"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsHYYQRuEemo7ZzqT33fqQ" x="40" y="160"/>

     </children>

+    <children xmi:type="notation:Shape" xmi:id="_oask8A64EemnO9QINOJnHg" type="Enumeration_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_oa29AA64EemnO9QINOJnHg" type="Enumeration_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_oa29AQ64EemnO9QINOJnHg" type="Enumeration_FloatingNameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oa3kEA64EemnO9QINOJnHg" y="15"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_oa4LIA64EemnO9QINOJnHg" type="Enumeration_LiteralCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_RVbdEA65EemnO9QINOJnHg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_KovioA65EemnO9QINOJnHg"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RVbdEQ65EemnO9QINOJnHg"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_RVcEIA65EemnO9QINOJnHg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_MeFToA65EemnO9QINOJnHg"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RVcEIQ65EemnO9QINOJnHg"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_RVcEIg65EemnO9QINOJnHg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_OGL54A65EemnO9QINOJnHg"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RVcEIw65EemnO9QINOJnHg"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_RVcrMA65EemnO9QINOJnHg" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_QAd1QA65EemnO9QINOJnHg"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RVcrMQ65EemnO9QINOJnHg"/>

+        </children>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_oa4LIQ64EemnO9QINOJnHg"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_oa4LIg64EemnO9QINOJnHg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_oa4LIw64EemnO9QINOJnHg"/>

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

+      </children>

+      <element xmi:type="uml:Enumeration" href="Common.uml#_oaES0A64EemnO9QINOJnHg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oask8Q64EemnO9QINOJnHg" x="460" y="320"/>

+    </children>

     <styles xmi:type="notation:StringValueStyle" xmi:id="_GHVo8QPBEemCCMXOyOLwIw" name="diagram_compatibility_version" stringValue="1.4.0"/>

     <styles xmi:type="notation:DiagramStyle" xmi:id="_GHVo8gPBEemCCMXOyOLwIw"/>

     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GHVo8wPBEemCCMXOyOLwIw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml
index d211d88..fa1b44f 100644
--- a/papyrus/ONAP Information Model/Common.uml
+++ b/papyrus/ONAP Information Model/Common.uml
@@ -4522,7 +4522,19 @@ Debug	          7	    debug-level messages&#xD;
       </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_R1nxUMfyEeiEtuRgTYzSUQ" name="License">

-      <packagedElement xmi:type="uml:Package" xmi:id="_U1T1kMfyEeiEtuRgTYzSUQ" name="Diagrams"/>

+      <packagedElement xmi:type="uml:Package" xmi:id="_U1T1kMfyEeiEtuRgTYzSUQ" name="Diagrams">

+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_oaES0A64EemnO9QINOJnHg" name="LicenseDuration">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_9MpJ4A64EemnO9QINOJnHg" annotatedElement="_oaES0A64EemnO9QINOJnHg">

+            <body>Units of the entitlement/license term.   Valid values: year, quarter, month, day.&#xD;

+&#xD;

+</body>

+          </ownedComment>

+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KovioA65EemnO9QINOJnHg" name="YEAR"/>

+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_MeFToA65EemnO9QINOJnHg" name="QUARTER"/>

+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OGL54A65EemnO9QINOJnHg" name="MONTH"/>

+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QAd1QA65EemnO9QINOJnHg" name="DAY"/>

+        </packagedElement>

+      </packagedElement>

       <packagedElement xmi:type="uml:Package" xmi:id="_Whm_UMfyEeiEtuRgTYzSUQ" name="Associations">

         <packagedElement xmi:type="uml:Association" xmi:id="_CcCiwMfzEeiEtuRgTYzSUQ" name="VLMHasVnfd" memberEnd="_CcDw4sfzEeiEtuRgTYzSUQ _CcICUMfzEeiEtuRgTYzSUQ">

           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CcDw4MfzEeiEtuRgTYzSUQ" source="org.eclipse.papyrus">

@@ -4549,8 +4561,11 @@ Debug	          7	    debug-level messages&#xD;
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Sj2FEN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">

             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Sj2FEd3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>

           </eAnnotations>

-          <ownedEnd xmi:type="uml:Property" xmi:id="_Sj2FEt3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" association="_Sj1eAN3yEei-jeeHUjfpLA"/>

           <ownedEnd xmi:type="uml:Property" xmi:id="_Sj3TMN3yEei-jeeHUjfpLA" name="licensekeydesc" type="_oURIoMfyEeiEtuRgTYzSUQ" association="_Sj1eAN3yEei-jeeHUjfpLA"/>

+          <ownedEnd xmi:type="uml:Property" xmi:id="_Sj2FEt3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" aggregation="composite" association="_Sj1eAN3yEei-jeeHUjfpLA">

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

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

+          </ownedEnd>

         </packagedElement>

         <packagedElement xmi:type="uml:Association" xmi:id="_Q3zaAN3yEei-jeeHUjfpLA" name="LicenseKeyPolDescMadeAvaiableAs" memberEnd="_Q30oIt3yEei-jeeHUjfpLA _Q33EYN3yEei-jeeHUjfpLA">

           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q30oIN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">

@@ -4712,14 +4727,25 @@ Debug	          7	    debug-level messages&#xD;
         <packagedElement xmi:type="uml:Class" xmi:id="_oURIoMfyEeiEtuRgTYzSUQ" name="LicenseKeyDesc">

           <generalization xmi:type="uml:Generalization" xmi:id="_Za7pwP2QEeisxOMTY1eUug" general="_Qb00MOLKEeiKy5JVrA0UGA"/>

           <ownedAttribute xmi:type="uml:Property" xmi:id="_jOvlIAOOEemCCMXOyOLwIw" name="keyFunction+">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_en_GAA6-EemnO9QINOJnHg" annotatedElement="_jOvlIAOOEemCCMXOyOLwIw">

+              <body>Lifecycle stage or state (e.g., Instantiation or Activation) at which the license key is applied to the software.</body>

+            </ownedComment>

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

           </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_kYusAAOOEemCCMXOyOLwIw" name="licenseKeyType" type="_sckiwP_BEeiQG4ZZm0HgYw"/>

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

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

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

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

           </ownedAttribute>

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_UcqsEA6_EemnO9QINOJnHg" name="licenseKeyType" type="_4CYPgAO3EemCCMXOyOLwIw">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_3zl9YA6_EemnO9QINOJnHg" annotatedElement="_UcqsEA6_EemnO9QINOJnHg">

+              <body>Valid values: &#xD;

+Universal, Unique&#xD;

+Universal - a single license key value that may be used with any number of instances of the software. &#xD;

+Unique - a unique license key value is required for each instance of the software.  &#xD;

+</body>

+            </ownedComment>

+          </ownedAttribute>

         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_4ZDVsMgEEeiEtuRgTYzSUQ" name="LicenceKeyPoolDesc">

           <ownedComment xmi:type="uml:Comment" xmi:id="_yESAsAR4Eemo7ZzqT33fqQ" annotatedElement="_4ZDVsMgEEeiEtuRgTYzSUQ">

@@ -4820,11 +4846,25 @@ Either no key, universal key, or unique key per instance required.  &#xD;
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RPtAUAPIEemCCMXOyOLwIw"/>

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

           </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_aWtAQP8WEeiZ-fXSiUXhdA" name="licenseType" type="_sckiwP_BEeiQG4ZZm0HgYw"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_bNYJkP8WEeiZ-fXSiUXhdA" name="licenseDuration">

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

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aWtAQP8WEeiZ-fXSiUXhdA" name="licenseType" type="_sckiwP_BEeiQG4ZZm0HgYw">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_CyQkAA64EemnO9QINOJnHg" annotatedElement="_aWtAQP8WEeiZ-fXSiUXhdA">

+              <body>Type of license applicable to the software product. (e.g.:  fixed-term, perpetual, trial, subscription.)  </body>

+            </ownedComment>

+          </ownedAttribute>

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bNYJkP8WEeiZ-fXSiUXhdA" name="licenseDuration" type="_oaES0A64EemnO9QINOJnHg">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_HfTh8A64EemnO9QINOJnHg" annotatedElement="_bNYJkP8WEeiZ-fXSiUXhdA">

+              <body>Valid values:&#xD;

+year, quarter, month, day.&#xD;

+Not applicable when license type is Perpetual.&#xD;

+</body>

+            </ownedComment>

           </ownedAttribute>

           <ownedAttribute xmi:type="uml:Property" xmi:id="_HRGL4P8XEeiZ-fXSiUXhdA" name="licenseDurationQuantification">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_blIyUA65EemnO9QINOJnHg" annotatedElement="_HRGL4P8XEeiZ-fXSiUXhdA">

+              <body>Number of years, quarters, months, or days for which the license is valid. &#xD;

+Not applicable when license type is Perpetual.&#xD;

+</body>

+            </ownedComment>

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

           </ownedAttribute>

           <ownedAttribute xmi:type="uml:Property" xmi:id="_HqdHEP8XEeiZ-fXSiUXhdA" name="limits"/>

@@ -5030,6 +5070,12 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_RFYeMP4LEeiao-2FtYZWRA" name="OTHER"/>

         </packagedElement>

         <packagedElement xmi:type="uml:Enumeration" xmi:id="_sckiwP_BEeiQG4ZZm0HgYw" name="LicenseTerm">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_lpSNQA64EemnO9QINOJnHg" annotatedElement="_sckiwP_BEeiQG4ZZm0HgYw">

+            <body>Valid values:&#xD;

+year, quarter, month, day.&#xD;

+Not applicable when license type is Perpetual.&#xD;

+</body>

+          </ownedComment>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wi434P_BEeiQG4ZZm0HgYw" name="FIXED_TERM"/>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ydBCQP_BEeiQG4ZZm0HgYw" name="PERPETUAL"/>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2ICigP_BEeiQG4ZZm0HgYw" name="UNLIMITED"/>

@@ -5066,6 +5112,11 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat
       </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_710dYNMOEeig45NPS8-MSw" name="Policy">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_ahnBMBBYEemHjtkpPBz29Q" annotatedElement="_710dYNMOEeig45NPS8-MSw">

+        <body>Presently the scope of policy is imperitive only (not declaritive or intent).&#xD;

+&#xD;

+Approach will be pragmatic in nature, establishing a model that meets the Policy team's near term needs, and then evolve from there.</body>

+      </ownedComment>

       <packagedElement xmi:type="uml:Package" xmi:id="_D-ZuENMPEeig45NPS8-MSw" name="Associations">

         <packagedElement xmi:type="uml:Association" xmi:id="_Hp5S8NMQEeig45NPS8-MSw" name="PolicyEventTriggersPolicyRule" memberEnd="_Hp8WQNMQEeig45NPS8-MSw _Hp89UNMQEeig45NPS8-MSw">

           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Hp7IINMQEeig45NPS8-MSw" source="org.eclipse.papyrus">

@@ -5159,11 +5210,12 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat
       <packagedElement xmi:type="uml:Package" xmi:id="_GYkqcNMPEeig45NPS8-MSw" name="PolicyObjectClasses">

         <packagedElement xmi:type="uml:Class" xmi:id="_trl94NMPEeig45NPS8-MSw" name="PolicyAction" isAbstract="true">

           <ownedComment xmi:type="uml:Comment" xmi:id="_Mef6ANb4EeitAsFAkChUcg" annotatedElement="_trl94NMPEeig45NPS8-MSw">

-            <body>This is an abstract base class that represents how to form the action clause of a PolicyRule. This consists of a single occurrence of a PolicyStatement, which is of the form:&#xD;

+            <body>This is an abstract base class that represents how to form the action clause of a PolicyRule.&#xD;

 &#xD;

- {variable, operator, value}&#xD;

+Certain actions will take place if the condition clause is TRUE, others if the condition clause is FALSE.&#xD;

 &#xD;

-Policy actions have the semantics of &quot;SET variable to value&quot;. There are two types of actions:</body>

+&#xD;

+</body>

           </ownedComment>

           <generalization xmi:type="uml:Generalization" xmi:id="_AcOXwOztEei7-e9MrPJW7Q" general="_X0O1cOzsEei7-e9MrPJW7Q"/>

           <ownedAttribute xmi:type="uml:Property" xmi:id="_yn_zEO0REei7-e9MrPJW7Q" name="keyValuePair">

@@ -5176,8 +5228,16 @@ Policy actions have the semantics of &quot;SET variable to value&quot;. There ar
             <body>A PolicyEvent is an occurrence of an important event, and can be used to trigger the evaluation of a PolicyCondition or PolicyCondition clause in a PolicyRule. </body>

           </ownedComment>

           <generalization xmi:type="uml:Generalization" xmi:id="_u6kmAO2IEei7-e9MrPJW7Q" general="_X0O1cOzsEei7-e9MrPJW7Q"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_x5sNEO2JEei7-e9MrPJW7Q" name="eventOrigin"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yy6UEO2JEei7-e9MrPJW7Q" name="eventDomain"/>

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_x5sNEO2JEei7-e9MrPJW7Q" name="eventOrigin">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_wn9X0BBZEemHjtkpPBz29Q" annotatedElement="_x5sNEO2JEei7-e9MrPJW7Q">

+              <body>eventOrigin provides information on the entity that generates the event (DCAE, Vnf, monitors).</body>

+            </ownedComment>

+          </ownedAttribute>

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yy6UEO2JEei7-e9MrPJW7Q" name="eventDomain">

+            <ownedComment xmi:type="uml:Comment" xmi:id="_GbFs8BBaEemHjtkpPBz29Q" annotatedElement="_yy6UEO2JEei7-e9MrPJW7Q">

+              <body>The environment or entity in which the event occurred (Eg - Vnf, switch, eNodeB, or data center).</body>

+            </ownedComment>

+          </ownedAttribute>

         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_jUQ9sNMPEeig45NPS8-MSw" name="PolicyGroup">

           <ownedComment xmi:type="uml:Comment" xmi:id="_nM_NMNhpEeiRnMGpBj3Tnw" annotatedElement="_jUQ9sNMPEeig45NPS8-MSw">

@@ -5464,6 +5524,10 @@ Notes: Not present in the ITU or CIM specs.</body>
         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_VwTgwOzqEei7-e9MrPJW7Q" name="PolicyEventComposite">

           <generalization xmi:type="uml:Generalization" xmi:id="_nypE0OzqEei7-e9MrPJW7Q" general="_otly0NMPEeig45NPS8-MSw"/>

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VDruABBaEemHjtkpPBz29Q" name="_policyevent" type="_otly0NMPEeig45NPS8-MSw" aggregation="composite" association="_VC8uMBBaEemHjtkpPBz29Q">

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

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

+          </ownedAttribute>

         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_bPkT4OzsEei7-e9MrPJW7Q" name="PolicyStatement">

           <generalization xmi:type="uml:Generalization" xmi:id="__vra0OzsEei7-e9MrPJW7Q" general="_X0O1cOzsEei7-e9MrPJW7Q"/>

@@ -5475,6 +5539,17 @@ Notes: Not present in the ITU or CIM specs.</body>
           <generalization xmi:type="uml:Generalization" xmi:id="_kyVWsO0EEei7-e9MrPJW7Q" general="_vYK0cNMPEeig45NPS8-MSw"/>

         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_ZqOtwOzsEei7-e9MrPJW7Q" name="PolicyCondition">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_Wd_MEA-aEemJKtuCXLlg4w" annotatedElement="_ZqOtwOzsEei7-e9MrPJW7Q">

+            <body>This is an abstract base class that represents how to form the condition clause of a PolicyRule. This class can be used to represent rule-specific or reusable policy conditions.&#xD;

+&#xD;

+Policy conditions are of the form:&#xD;

+&#xD;

+ {variable, operator, value}&#xD;

+&#xD;

+where the operator is usually the MATCH operator, but could be another type (e.g., compare) of operator. This gives the semantics of &quot;IF the condition is TRUE (or FALSE)&quot;.&#xD;

+&#xD;

+The subclasses of PolicyCondition, along with its recursive aggregation, enable simple and compound (e.g., nested) PolicyConditions to be supported by the same structure.</body>

+          </ownedComment>

           <generalization xmi:type="uml:Generalization" xmi:id="_-6jJoOzsEei7-e9MrPJW7Q" general="_X0O1cOzsEei7-e9MrPJW7Q"/>

         </packagedElement>

         <packagedElement xmi:type="uml:Class" xmi:id="_X0O1cOzsEei7-e9MrPJW7Q" name="Policy" isAbstract="true">

@@ -5559,6 +5634,12 @@ Not present in the ITU or CIM specs. &#xD;
         <ownedComment xmi:type="uml:Comment" xmi:id="_6KVDAO2IEei7-e9MrPJW7Q">

           <body>Rooted PolicyEvent</body>

         </ownedComment>

+        <packagedElement xmi:type="uml:Association" xmi:id="_VC8uMBBaEemHjtkpPBz29Q" name="CompositeEventHasEvents" memberEnd="_VDruABBaEemHjtkpPBz29Q _VDs8IRBaEemHjtkpPBz29Q">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VDqf4BBaEemHjtkpPBz29Q" source="org.eclipse.papyrus">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VDrG8BBaEemHjtkpPBz29Q" key="nature" value="UML_Nature"/>

+          </eAnnotations>

+          <ownedEnd xmi:type="uml:Property" xmi:id="_VDs8IRBaEemHjtkpPBz29Q" name="policyeventcomposite" type="_VwTgwOzqEei7-e9MrPJW7Q" association="_VC8uMBBaEemHjtkpPBz29Q"/>

+        </packagedElement>

       </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_1t6IcN3ZEei-jeeHUjfpLA" name="Network">

@@ -7562,7 +7643,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element
   <OpenModel_Profile:OpenModelAttribute xmi:id="_LybrsAOOEemCCMXOyOLwIw" base_StructuralFeature="_LybEoAOOEemCCMXOyOLwIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_OFmoMQOOEemCCMXOyOLwIw" base_StructuralFeature="_OFmoMAOOEemCCMXOyOLwIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_jOwMMAOOEemCCMXOyOLwIw" base_StructuralFeature="_jOvlIAOOEemCCMXOyOLwIw"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_kYvTEAOOEemCCMXOyOLwIw" base_StructuralFeature="_kYusAAOOEemCCMXOyOLwIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_lUfwsQOOEemCCMXOyOLwIw" base_StructuralFeature="_lUfwsAOOEemCCMXOyOLwIw"/>

   <OpenModel_Profile:Experimental xmi:id="_NlSS8AOaEemCCMXOyOLwIw" base_Element="_4ZDVsMgEEeiEtuRgTYzSUQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_1cJK0ARsEemo7ZzqT33fqQ" base_StructuralFeature="_1cIjwARsEemo7ZzqT33fqQ"/>

@@ -7589,4 +7669,7 @@ Per VNF, the affinity/anti-affinity rules defined using this information element
   <OpenModel_Profile:OpenModelAttribute xmi:id="_p41lMQVoEemrBZmpgd_POA" base_StructuralFeature="_p41lMAVoEemrBZmpgd_POA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_86YlIAd5EemP4pZRr6syIA" base_StructuralFeature="_83544Ad5EemP4pZRr6syIA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_-QdAMAd5EemP4pZRr6syIA" base_StructuralFeature="_-QcZIAd5EemP4pZRr6syIA"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_UcqsEQ6_EemnO9QINOJnHg" base_StructuralFeature="_UcqsEA6_EemnO9QINOJnHg"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_VDruARBaEemHjtkpPBz29Q" base_StructuralFeature="_VDruABBaEemHjtkpPBz29Q"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_VDs8IhBaEemHjtkpPBz29Q" base_StructuralFeature="_VDs8IRBaEemHjtkpPBz29Q"/>

 </xmi:XMI>