Updates to Service

Moved SelectionCritiera associations to common, updated
configurableAttributes to be a keyvalue pair.

Issue-ID: MODELING-104

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

2 files changed, 69 insertions, 154 deletions

diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index ca0b9c1..f038111 100644
--- a/ONAP Information Model/Service.notation
+++ b/ONAP Information Model/Service.notation
@@ -3824,7 +3824,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6XYYoLcEemyVus8T4NvCQ"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqgV0VEemiOP02o5T8tA" x="-340" y="-60" width="241" height="81"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqgV0VEemiOP02o5T8tA" x="-380" y="-60" width="321" height="81"/>

     </children>

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

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

@@ -3872,7 +3872,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6f7QoLcEemyVus8T4NvCQ"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A_9MM10VEemiOP02o5T8tA" x="-520" y="100" width="281"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A_9MM10VEemiOP02o5T8tA" x="-640" y="100" width="361"/>

     </children>

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

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

@@ -4134,43 +4134,6 @@
       <element xsi:nil="true"/>

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

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_txie8IMFEemyVus8T4NvCQ" type="DataType_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_txjGAIMFEemyVus8T4NvCQ" type="DataType_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_txjGAYMFEemyVus8T4NvCQ" type="DataType_FloatingNameLabel">

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_txjGA4MFEemyVus8T4NvCQ" type="DataType_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_1p7XgIMFEemyVus8T4NvCQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

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

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

-        </children>

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_txjGCIMFEemyVus8T4NvCQ" visible="false" type="DataType_OperationCompartment">

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

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

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

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

-      </children>

-      <element xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txie8YMFEemyVus8T4NvCQ" x="-660" y="-200"/>

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>

-      </styles>

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

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

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_4nftkIdzEemz_I38RrvOQg" type="DataType_Shape" fontName="Segoe UI" fillColor="12632256">

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

         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Is908Yd3Eemz_I38RrvOQg" key="fontHeight" value="true"/>

@@ -4988,9 +4951,9 @@
       </children>

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

       <element xmi:type="uml:Generalization" href="Common.uml#_qQWgYF0XEemiOP02o5T8tA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQzMUl0XEemiOP02o5T8tA" points="[-360, 100, -643984, -643984]$[-360, 80, -643984, -643984]$[-220, 80, -643984, -643984]$[-220, 20, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQF0XEemiOP02o5T8tA" id="(0.5693950177935944,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQV0XEemiOP02o5T8tA" id="(0.4979253112033195,0.9876543209876543)"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQzMUl0XEemiOP02o5T8tA" points="[-440, 100, -643984, -643984]$[-440, 80, -643984, -643984]$[-220, 80, -643984, -643984]$[-220, 21, -643984, -643984]"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQV0XEemiOP02o5T8tA" id="(0.4984423676012461,1.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_6L4wAF0XEemiOP02o5T8tA" type="Generalization_Edge" source="_BZSSMl0VEemiOP02o5T8tA" target="_AkYqgF0VEemiOP02o5T8tA">

       <children xmi:type="notation:DecorationNode" xmi:id="_6L4wA10XEemiOP02o5T8tA" type="Generalization_StereotypeLabel">

@@ -5001,38 +4964,7 @@
       <element xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6L4wAl0XEemiOP02o5T8tA" points="[-60, 100, -643984, -643984]$[-60, 80, -643984, -643984]$[-220, 80, -643984, -643984]$[-220, 20, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4F0XEemiOP02o5T8tA" id="(0.5363984674329502,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4V0XEemiOP02o5T8tA" id="(0.4979253112033195,0.9876543209876543)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_KAZxoF0YEemiOP02o5T8tA" type="Association_Edge" source="_AkYqgF0VEemiOP02o5T8tA" target="_A_9MMl0VEemiOP02o5T8tA">

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

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

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

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxpl0YEemiOP02o5T8tA" x="-51" y="33"/>

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxqF0YEemiOP02o5T8tA" x="35" y="-18"/>

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxql0YEemiOP02o5T8tA" x="-34" y="19"/>

-      </children>

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

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

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

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxrl0YEemiOP02o5T8tA" x="-34" y="-19"/>

-      </children>

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

-      <element xmi:type="uml:Association" href="Service.uml#_J_zUsF0YEemiOP02o5T8tA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KAZxol0YEemiOP02o5T8tA" points="[-340, 0, -643984, -643984]$[-580, 0, -643984, -643984]$[-580, 140, -643984, -643984]$[-520, 140, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KA_ngF0YEemiOP02o5T8tA" id="(0.0,0.7407407407407407)"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4V0XEemiOP02o5T8tA" id="(0.4984423676012461,1.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_5Xy3kILdEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_rMLGYILdEemyVus8T4NvCQ" target="_5XyQgILdEemyVus8T4NvCQ">

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

@@ -5064,43 +4996,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z8ayCoLzEemyVus8T4NvCQ"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_knSAwIMDEemyVus8T4NvCQ" type="Association_Edge" source="_AkYqgF0VEemiOP02o5T8tA" target="_z7-GEILzEemyVus8T4NvCQ">

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

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

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

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAxoMDEemyVus8T4NvCQ" x="6" y="-13"/>

-      </children>

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

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

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

-      </children>

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

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

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

-      </children>

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

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-qfrAYMDEemyVus8T4NvCQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-qfrAoMDEemyVus8T4NvCQ" key="visible" value="true"/>

-        </eAnnotations>

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAzIMDEemyVus8T4NvCQ" x="13" y="24"/>

-      </children>

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

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-qfD8IMDEemyVus8T4NvCQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-qfrAIMDEemyVus8T4NvCQ" key="visible" value="true"/>

-        </eAnnotations>

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

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

-      </children>

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

-      <element xmi:type="uml:Association" href="Service.uml#_kmmEQIMDEemyVus8T4NvCQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_knSAwoMDEemyVus8T4NvCQ" points="[-140, -60, -643984, -643984]$[-140, -180, -643984, -643984]$[180, -180, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_koYM8IMDEemyVus8T4NvCQ" id="(0.8298755186721992,0.0)"/>

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_JGGuQIMEEemyVus8T4NvCQ" type="Generalization_Edge" source="_nTtrAB9cEemLMI6HKP6Lbw" target="_z7-GEILzEemyVus8T4NvCQ">

       <children xmi:type="notation:DecorationNode" xmi:id="_JGHVUIMEEemyVus8T4NvCQ" type="Generalization_StereotypeLabel">

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

@@ -5112,16 +5007,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHJQEIMEEemyVus8T4NvCQ" id="(0.09501187648456057,0.0)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHJQEYMEEemyVus8T4NvCQ" id="(0.819672131147541,1.0)"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ty_Qd4MFEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_txie8IMFEemyVus8T4NvCQ" target="_ty_Qc4MFEemyVus8T4NvCQ">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_opGh2od0Eemz_I38RrvOQg" type="StereotypeCommentLink" source="_4nftkIdzEemz_I38RrvOQg" target="_opGh1od0Eemz_I38RrvOQg">

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

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

@@ -5142,6 +5027,68 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R_-b-od4Eemz_I38RrvOQg"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R_-b-4d4Eemz_I38RrvOQg"/>

     </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_Z2p6wIndEemVXsYTZj8frQ" type="Association_Edge" source="_AkYqgF0VEemiOP02o5T8tA" target="_z7-GEILzEemyVus8T4NvCQ">

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

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

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

+      </children>

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

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

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

+      </children>

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

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

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

+      </children>

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

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

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

+      </children>

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

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

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

+      </children>

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

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

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

+      </children>

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

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

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z2p6wondEemVXsYTZj8frQ" points="[-220, -60, -643984, -643984]$[-220, -180, -643984, -643984]$[180, -180, -643984, -643984]"/>

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

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

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_JSaP4IneEemVXsYTZj8frQ" type="Association_Edge" source="_A_9MMl0VEemiOP02o5T8tA" target="_AkYqgF0VEemiOP02o5T8tA">

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

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

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

+      </children>

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

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Kg-70IneEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

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

+      </children>

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

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

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

+      </children>

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

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

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

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_JSa2-IneEemVXsYTZj8frQ" type="Association_SourceMultiplicityLabel">

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JSa2-YneEemVXsYTZj8frQ" x="36" y="13"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_JSa2-oneEemVXsYTZj8frQ" type="Association_TargetMultiplicityLabel">

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JSa2-4neEemVXsYTZj8frQ" x="-30" y="7"/>

+      </children>

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

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

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JSaP4oneEemVXsYTZj8frQ" points="[-640, 140, -643984, -643984]$[-700, 140, -643984, -643984]$[-700, -20, -643984, -643984]$[-340, -20, -643984, -643984]"/>

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

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

+    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_OMM7IF0BEemn7e9Q1aGp7A" type="PapyrusUMLClassDiagram" name="Atomic / Composite Service View" measurementUnit="Pixel">

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

diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index 1a15db4..1a0ad54 100644
--- a/ONAP Information Model/Service.uml
+++ b/ONAP Information Model/Service.uml
@@ -464,21 +464,6 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ekq20F0aEemiOP02o5T8tA" value="*"/>

         </ownedEnd>

       </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_J_zUsF0YEemiOP02o5T8tA" name="SelectionCriteriaCompositeComprisedOfSelectionCriteria" memberEnd="_J_9Fsl0YEemiOP02o5T8tA _J_9Ftl0YEemiOP02o5T8tA">

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

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

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Ftl0YEemiOP02o5T8tA" name="filter" aggregation="shared" association="_J_zUsF0YEemiOP02o5T8tA">

-          <type xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cmAa0F0YEemiOP02o5T8tA" value="2"/>

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

-        </ownedEnd>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Fsl0YEemiOP02o5T8tA" name="filtercomposite" association="_J_zUsF0YEemiOP02o5T8tA">

-          <type xmi:type="uml:Class" href="Common.uml#_A_9MMF0VEemiOP02o5T8tA"/>

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

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

-        </ownedEnd>

-      </packagedElement>

     </packagedElement>

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

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

@@ -503,21 +488,6 @@
       <ownedComment xmi:type="uml:Comment" xmi:id="_ehLI8CC9Eemw1L3J4dNy4w">

         <body>Do we need this diagram?</body>

       </ownedComment>

-      <packagedElement xmi:type="uml:Association" xmi:id="_kmmEQIMDEemyVus8T4NvCQ" name="DesignEntityHasSelectionCriteria" memberEnd="_kmpHkIMDEemyVus8T4NvCQ _kmpuoIMDEemyVus8T4NvCQ">

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

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

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_kmpHkIMDEemyVus8T4NvCQ" name="designentity" association="_kmmEQIMDEemyVus8T4NvCQ">

-          <type xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>

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

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

-        </ownedEnd>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_kmpuoIMDEemyVus8T4NvCQ" name="selectioncriteria" association="_kmmEQIMDEemyVus8T4NvCQ">

-          <type xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>

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

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

-        </ownedEnd>

-      </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_pyyJ0Id4Eemz_I38RrvOQg" name="ServiceLcmEvent">

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_pyyJ0Yd4Eemz_I38RrvOQg" name="EVENT_START_DEPLOYMENT"/>

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_pyyJ0od4Eemz_I38RrvOQg" name="EVENT_END_DEPLOYMENT"/>

@@ -673,7 +643,7 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
             <body>Describes the configurable properties of the service.&#xD;

 </body>

           </ownedComment>

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

+          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>

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

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

         </ownedAttribute>

@@ -1813,8 +1783,6 @@ reference point.</body>
   <OpenModel_Profile:OpenModelClass xmi:id="_EwCLkV0VEemiOP02o5T8tA" base_Class="_EwCLkF0VEemiOP02o5T8tA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI1F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI010VEemiOP02o5T8tA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI2F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI110VEemiOP02o5T8tA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_J_9Fs10YEemiOP02o5T8tA" base_StructuralFeature="_J_9Fsl0YEemiOP02o5T8tA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_J_9Ft10YEemiOP02o5T8tA" base_StructuralFeature="_J_9Ftl0YEemiOP02o5T8tA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_lpEDIILdEemyVus8T4NvCQ">

     <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_lo6SIILdEemyVus8T4NvCQ"/>

   </OpenModel_Profile:OpenModelAttribute>