Completed Party Refinements

Made further updates to Party model (see WIKI Post)

Issue-ID: MODELING-104

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

2 files changed, 3 insertions, 274 deletions

diff --git a/ONAP Information Model/Party.notation b/ONAP Information Model/Party.notation
index b8e00cd..49cc5e1 100644
--- a/ONAP Information Model/Party.notation
+++ b/ONAP Information Model/Party.notation
@@ -79,69 +79,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_rdUXFC7mEem7DJry5UTesQ" y="15"/>

       </children>

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

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_TY57oF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_T8E6IF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_U3GX8F0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_V2IMAF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_WTkV8F0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_XNr00F0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_ZRXj0F0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

@@ -170,7 +107,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gYBHglrhEem07dac9irJSQ"/>

       </children>

       <element xmi:type="uml:Class" href="Party.uml#_rdTI8C7mEem7DJry5UTesQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rdUXES7mEem7DJry5UTesQ" x="200" y="220" width="201" height="181"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rdUXES7mEem7DJry5UTesQ" x="200" y="220" width="201" height="101"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_shz58C7mEem7DJry5UTesQ" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_shz58i7mEem7DJry5UTesQ" type="Class_NameLabel"/>

@@ -178,33 +115,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_shz59C7mEem7DJry5UTesQ" y="15"/>

       </children>

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

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_arR9EF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_cDtIkF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Party.uml#_clPvYF0kEemRdaQWqjNOmA"/>

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

-        </children>

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

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

         <styles xmi:type="notation:FilteringStyle" xmi:id="_shz5-C7mEem7DJry5UTesQ"/>

@@ -794,50 +704,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MuvYDbnEemP3p_OV1tL7g" x="200"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_7wj-ADbnEemP3p_OV1tL7g" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_7wj-AjbnEemP3p_OV1tL7g" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7wj-AzbnEemP3p_OV1tL7g" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7wj-BDbnEemP3p_OV1tL7g" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7wj-BTbnEemP3p_OV1tL7g" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7wj-BjbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7wj-BzbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7wj-CDbnEemP3p_OV1tL7g"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7wj-CjbnEemP3p_OV1tL7g" visible="false" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7wj-CzbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7wj-DDbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7wj-DTbnEemP3p_OV1tL7g"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7wj-DzbnEemP3p_OV1tL7g" visible="false" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7wj-EDbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7wj-ETbnEemP3p_OV1tL7g"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7wj-EjbnEemP3p_OV1tL7g"/>

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

-      </children>

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

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

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

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

-      </children>

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

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

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

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

-      </children>

-      <element xmi:type="uml:Class" href="Party.uml#_7wiv4DbnEemP3p_OV1tL7g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wj-ATbnEemP3p_OV1tL7g" x="980" y="80" width="121"/>

-    </children>

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

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7wpdkzbnEemP3p_OV1tL7g" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="Party.uml#_7wiv4DbnEemP3p_OV1tL7g"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wpdkjbnEemP3p_OV1tL7g" x="200"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_99yDgDbnEemP3p_OV1tL7g" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_99yDgjbnEemP3p_OV1tL7g" type="Class_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_99yDgzbnEemP3p_OV1tL7g" type="Class_FloatingNameLabel">

@@ -960,16 +826,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5MvWYzbnEemP3p_OV1tL7g"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5MvWZDbnEemP3p_OV1tL7g"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_7wpdlDbnEemP3p_OV1tL7g" type="StereotypeCommentLink" source="_7wj-ADbnEemP3p_OV1tL7g" target="_7wpdkDbnEemP3p_OV1tL7g">

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7wpdmTbnEemP3p_OV1tL7g" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="Party.uml#_7wiv4DbnEemP3p_OV1tL7g"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7wpdljbnEemP3p_OV1tL7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7wpdlzbnEemP3p_OV1tL7g"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7wpdmDbnEemP3p_OV1tL7g"/>

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_993jFzbnEemP3p_OV1tL7g" type="StereotypeCommentLink" source="_99yDgDbnEemP3p_OV1tL7g" target="_993jEzbnEemP3p_OV1tL7g">

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

       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_993jHDbnEemP3p_OV1tL7g" name="BASE_ELEMENT">

@@ -1064,37 +920,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i2iT8DboEemP3p_OV1tL7g" id="(1.0,0.4)"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ky-LcDboEemP3p_OV1tL7g" type="Association_Edge" source="_5MpPwDbnEemP3p_OV1tL7g" target="_7wj-ADbnEemP3p_OV1tL7g">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LczboEemP3p_OV1tL7g" type="Association_StereotypeLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LdDboEemP3p_OV1tL7g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LdTboEemP3p_OV1tL7g" type="Association_NameLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LdjboEemP3p_OV1tL7g" x="1" y="-13"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LdzboEemP3p_OV1tL7g" visible="false" type="Association_TargetRoleLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LeDboEemP3p_OV1tL7g" x="24" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LeTboEemP3p_OV1tL7g" visible="false" type="Association_SourceRoleLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LejboEemP3p_OV1tL7g" x="-24" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LezboEemP3p_OV1tL7g" type="Association_SourceMultiplicityLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LfDboEemP3p_OV1tL7g" x="24" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ky-LfTboEemP3p_OV1tL7g" type="Association_TargetMultiplicityLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ky-LfjboEemP3p_OV1tL7g" x="-15" y="7"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ky-LcTboEemP3p_OV1tL7g"/>

-      <element xmi:type="uml:Association" href="Party.uml#_ky0acDboEemP3p_OV1tL7g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ky-LcjboEemP3p_OV1tL7g" points="[940, 100, -643984, -643984]$[1100, 100, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kzS7kDboEemP3p_OV1tL7g" id="(1.0,0.4)"/>

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

-    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_S-T_YDbaEemP3p_OV1tL7g" type="PapyrusUMLClassDiagram" name="Party Roles" measurementUnit="Pixel">

     <children xmi:type="notation:Shape" xmi:id="_WUROkDbaEemP3p_OV1tL7g" type="Class_Shape">

@@ -1396,7 +1221,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gaP8JlrhEem07dac9irJSQ"/>

       </children>

       <element xmi:type="uml:Class" href="Party.uml#_pGNDkDbaEemP3p_OV1tL7g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pGPf0TbaEemP3p_OV1tL7g" x="860" y="100"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pGPf0TbaEemP3p_OV1tL7g" x="820" y="100"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_pGXbozbaEemP3p_OV1tL7g" type="StereotypeComment">

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

@@ -1561,7 +1386,7 @@
       </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6KaLeTbaEemP3p_OV1tL7g" x="27" y="20"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6KaLeTbaEemP3p_OV1tL7g" x="3" y="7"/>

       </children>

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

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

diff --git a/ONAP Information Model/Party.uml b/ONAP Information Model/Party.uml
index 57c846c..aefdb96 100644
--- a/ONAP Information Model/Party.uml
+++ b/ONAP Information Model/Party.uml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_2Rm7cDkrEemjyLkBMGZA1g/27" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_2Rm7cDkrEemjyLkBMGZA1g/27 OpenModel_Profile.profile.uml#_2RzvwDkrEemjyLkBMGZA1g">

   <uml:Package xmi:id="_oZz14DOHEei5Af8DcjrhIQ" name="Party">

-    <packagedElement xmi:type="uml:Association" xmi:id="_ky0acDboEemP3p_OV1tL7g" name="PartyNameDefinedViaLanuage" memberEnd="_ky0aczboEemP3p_OV1tL7g _ky1BgDboEemP3p_OV1tL7g">

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

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

-      </eAnnotations>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_ky0aczboEemP3p_OV1tL7g" name="language" type="_7wiv4DbnEemP3p_OV1tL7g" association="_ky0acDboEemP3p_OV1tL7g"/>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_ky1BgDboEemP3p_OV1tL7g" name="partyname" type="_5MnakDbnEemP3p_OV1tL7g" association="_ky0acDboEemP3p_OV1tL7g">

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

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

-      </ownedEnd>

-    </packagedElement>

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

       <packagedElement xmi:type="uml:Association" xmi:id="_qTvDYC7nEem7DJry5UTesQ" name="CompositeOrganizationComposedOf" memberEnd="_qTw4kC7nEem7DJry5UTesQ _qTxfoC7nEem7DJry5UTesQ">

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

@@ -99,50 +89,6 @@
 The individual could be a customer, an employee or any other person that the organization needs to store information about. An Individual is a type of Party.</body>

         </ownedComment>

         <generalization xmi:type="uml:Generalization" xmi:id="_3Dw1wC7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_TY57oF0kEemRdaQWqjNOmA" name="gender">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_AE77IF0lEemRdaQWqjNOmA" annotatedElement="_TY57oF0kEemRdaQWqjNOmA">

-            <body>A socially constructed role that implies behaviours, activities, and attributes.</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_T8E6IF0kEemRdaQWqjNOmA" name="placeOfBirth">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_JJQbUF0lEemRdaQWqjNOmA" annotatedElement="_T8E6IF0kEemRdaQWqjNOmA">

-            <body>City, town name etc.</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_U3GX8F0kEemRdaQWqjNOmA" name="nationality">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_i2B7gF0lEemRdaQWqjNOmA" annotatedElement="_U3GX8F0kEemRdaQWqjNOmA">

-            <body>Country or ethnic group</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_V2IMAF0kEemRdaQWqjNOmA" name="maritalStatus">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_oR35IF0lEemRdaQWqjNOmA" annotatedElement="_V2IMAF0kEemRdaQWqjNOmA">

-            <body>Married, never married, divorced, widowed</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WTkV8F0kEemRdaQWqjNOmA" name="skills">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_sb4bcF0lEemRdaQWqjNOmA" annotatedElement="_WTkV8F0kEemRdaQWqjNOmA">

-            <body>Note:&#xD;

-Probably only used for employees, but is really role independent&#xD;

-This should be modeled as a separate entity but is shown as an attribute for brevity</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_XNr00F0kEemRdaQWqjNOmA" name="disabilities">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_veuhYF0lEemRdaQWqjNOmA" annotatedElement="_XNr00F0kEemRdaQWqjNOmA">

-            <body>Notes: Used for legal requirements (special billing, special products, special contact media, such as Braille). This should be modeled as a separate entity but is shown as an attribute for brevity.</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZRXj0F0kEemRdaQWqjNOmA" name="aliveDuring">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xJezAF0lEemRdaQWqjNOmA" annotatedElement="_ZRXj0F0kEemRdaQWqjNOmA">

-            <body>Birth date and death date</body>

-          </ownedComment>

-          <type xmi:type="uml:DataType" href="Common.uml#_oyf9MOwXEei7-e9MrPJW7Q"/>

-        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_shyr0C7mEem7DJry5UTesQ" name="Organization">

         <ownedComment xmi:type="uml:Comment" xmi:id="_JrcQcF0nEemRdaQWqjNOmA" annotatedElement="_shyr0C7mEem7DJry5UTesQ">

@@ -150,28 +96,6 @@ This should be modeled as a separate entity but is shown as an attribute for bre
 An Organization might be composite or atomic.</body>

         </ownedComment>

         <generalization xmi:type="uml:Generalization" xmi:id="_33D68C7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_arR9EF0kEemRdaQWqjNOmA" name="isLegalEntity">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_SDoDYF0nEemRdaQWqjNOmA" annotatedElement="_arR9EF0kEemRdaQWqjNOmA">

-            <body>Permitted Values:&#xD;

-TRUE or FALSE</body>

-          </ownedComment>

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_cDtIkF0kEemRdaQWqjNOmA" name="legalPeriod">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_XCkCkF0nEemRdaQWqjNOmA" annotatedElement="_cDtIkF0kEemRdaQWqjNOmA">

-            <body>Incorporation date to disincorporation date.</body>

-          </ownedComment>

-          <type xmi:type="uml:DataType" href="Common.uml#_oyf9MOwXEei7-e9MrPJW7Q"/>

-        </ownedAttribute>

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

-          <ownedComment xmi:type="uml:Comment" xmi:id="_dq62oF0nEemRdaQWqjNOmA" annotatedElement="_clPvYF0kEemRdaQWqjNOmA">

-            <body>The type of organization&#xD;

-&#xD;

-Notes:&#xD;

-Club, Society, …</body>

-          </ownedComment>

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

-        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_yB-98C7mEem7DJry5UTesQ" name="OrganizationDecompositionComponent">

         <ownedComment xmi:type="uml:Comment" xmi:id="_Ya_twF0qEemRdaQWqjNOmA" annotatedElement="_yB-98C7mEem7DJry5UTesQ">

@@ -250,11 +174,6 @@ Club, Society, …</body>
           <body>A word, term, or phrase by which a party (individual or organization) is known and distinguished from other parties.A name is an informal way of identifying an object [Fowler].PartyName is an abstract concept that should be used in places where the business refers to an organization name, organization unit name or individual name</body>

         </ownedComment>

       </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_7wiv4DbnEemP3p_OV1tL7g" name="Language">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_NR74MF02EemRdaQWqjNOmA" annotatedElement="_7wiv4DbnEemP3p_OV1tL7g">

-          <body>Represents a spoken and/or written language.</body>

-        </ownedComment>

-      </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_99w1YDbnEemP3p_OV1tL7g" name="IndividualName">

         <ownedComment xmi:type="uml:Comment" xmi:id="_fdbNsF01EemRdaQWqjNOmA" annotatedElement="_99w1YDbnEemP3p_OV1tL7g">

           <body>A word, term, or phrase by which an individual is known and distinguished from other individuals.A name is an informal way of identifying an object [Fowler]This entity allows for international naming variations. An IndividualName is a type of PartyName.</body>

@@ -320,18 +239,13 @@ Club, Society, …</body>
   <OpenModel_Profile:Reference xmi:id="_fWY54DbbEemP3p_OV1tL7g" base_Element="_eDT94DbaEemP3p_OV1tL7g" reference="From TMF SID"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_3lu8UTbnEemP3p_OV1tL7g" base_Class="_3lu8UDbnEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_5MnakTbnEemP3p_OV1tL7g" base_Class="_5MnakDbnEemP3p_OV1tL7g"/>

-  <OpenModel_Profile:OpenModelClass xmi:id="_7wiv4TbnEemP3p_OV1tL7g" base_Class="_7wiv4DbnEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_99w1YTbnEemP3p_OV1tL7g" base_Class="_99w1YDbnEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_X8NUYzboEemP3p_OV1tL7g" base_StructuralFeature="_X8NUYjboEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_X8OigTboEemP3p_OV1tL7g" base_StructuralFeature="_X8OigDboEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_i16o4zboEemP3p_OV1tL7g" base_StructuralFeature="_i16o4jboEemP3p_OV1tL7g"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_i17P8TboEemP3p_OV1tL7g" base_StructuralFeature="_i17P8DboEemP3p_OV1tL7g"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ky0adDboEemP3p_OV1tL7g" base_StructuralFeature="_ky0aczboEemP3p_OV1tL7g"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ky1BgTboEemP3p_OV1tL7g" base_StructuralFeature="_ky1BgDboEemP3p_OV1tL7g"/>

   <OpenModel_Profile:Experimental xmi:id="_3r4VsDbpEemP3p_OV1tL7g" base_Element="_5MnakDbnEemP3p_OV1tL7g"/>

   <OpenModel_Profile:Reference xmi:id="_3sh18DbpEemP3p_OV1tL7g" base_Element="_5MnakDbnEemP3p_OV1tL7g" reference="From TMF SID"/>

-  <OpenModel_Profile:Experimental xmi:id="_5GzbkDbpEemP3p_OV1tL7g" base_Element="_7wiv4DbnEemP3p_OV1tL7g"/>

-  <OpenModel_Profile:Reference xmi:id="_5Hdi4DbpEemP3p_OV1tL7g" base_Element="_7wiv4DbnEemP3p_OV1tL7g" reference="From TMF SID"/>

   <OpenModel_Profile:Experimental xmi:id="_7xv-4DbpEemP3p_OV1tL7g" base_Element="_3lu8UDbnEemP3p_OV1tL7g"/>

   <OpenModel_Profile:Reference xmi:id="_7yZfIDbpEemP3p_OV1tL7g" base_Element="_3lu8UDbnEemP3p_OV1tL7g" reference="From TMF SID"/>

   <OpenModel_Profile:Experimental xmi:id="_FC1IsDbqEemP3p_OV1tL7g" base_Element="_99w1YDbnEemP3p_OV1tL7g"/>

@@ -348,16 +262,6 @@ Club, Society, …</body>
   </OpenModel_Profile:OpenModelAttribute>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_iVqrUF0jEemRdaQWqjNOmA" base_StructuralFeature="_iVoPEF0jEemRdaQWqjNOmA"/>

   <OpenModel_Profile:Experimental xmi:id="_DZAJYF0kEemRdaQWqjNOmA" base_Element="_iVoPEF0jEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_TY6isF0kEemRdaQWqjNOmA" base_StructuralFeature="_TY57oF0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_T8FhMF0kEemRdaQWqjNOmA" base_StructuralFeature="_T8E6IF0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_U3GX8V0kEemRdaQWqjNOmA" base_StructuralFeature="_U3GX8F0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_V2IMAV0kEemRdaQWqjNOmA" base_StructuralFeature="_V2IMAF0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_WTkV8V0kEemRdaQWqjNOmA" base_StructuralFeature="_WTkV8F0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_XNr00V0kEemRdaQWqjNOmA" base_StructuralFeature="_XNr00F0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZRXj0V0kEemRdaQWqjNOmA" base_StructuralFeature="_ZRXj0F0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_arR9EV0kEemRdaQWqjNOmA" base_StructuralFeature="_arR9EF0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_cDtIkV0kEemRdaQWqjNOmA" base_StructuralFeature="_cDtIkF0kEemRdaQWqjNOmA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_clQWcF0kEemRdaQWqjNOmA" base_StructuralFeature="_clPvYF0kEemRdaQWqjNOmA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_kp2QQV0qEemRdaQWqjNOmA" base_StructuralFeature="_kp2QQF0qEemRdaQWqjNOmA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_mSfdgV00EemRdaQWqjNOmA" base_StructuralFeature="_mSfdgF00EemRdaQWqjNOmA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_xONkMV00EemRdaQWqjNOmA" base_StructuralFeature="_xONkMF00EemRdaQWqjNOmA"/>