From fccd1a3ab548d67cda7735e0071f6af0dbf341d0 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Tue, 17 Sep 2019 18:15:37 +0800
Subject: Slight update to Service and Resource model

Delete configurableProperties from ServiceDescriptor, update stereotype
of ResourceDesc and ResourceInstance.

Issue-ID: MODELING-104

Change-Id: I20a757f576c41bcc19cad7cbcda938ccdb657f76
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 ONAP Information Model/Resource.uml     |  4 ++--
 ONAP Information Model/Service.notation | 24 +-----------------------
 ONAP Information Model/Service.uml      | 16 ----------------
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/ONAP Information Model/Resource.uml b/ONAP Information Model/Resource.uml
index 62a8f32..e868f1a 100644
--- a/ONAP Information Model/Resource.uml	
+++ b/ONAP Information Model/Resource.uml	
@@ -30,8 +30,8 @@ In this context, a resource is something that goes into a resource catalog from
       <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
     </profileApplication>
   </uml:Package>
-  <OpenModel_Profile:Experimental xmi:id="_fSQ5EBg1EembeqMx64UEWQ" base_Element="_DAQisJpXEeidy9iGT_F5-w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_DAQisZpXEeidy9iGT_F5-w" base_Class="_DAQisJpXEeidy9iGT_F5-w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_hZfC0TEkEemRSoIWRX3jNw" base_Class="_hZfC0DEkEemRSoIWRX3jNw"/>
-  <OpenModel_Profile:Experimental xmi:id="_n5mQoDJzEembsLjrwaSXHQ" base_Element="_hZfC0DEkEemRSoIWRX3jNw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_8o6ZQNkwEemhQNrkGQNN2A" base_Element="_DAQisJpXEeidy9iGT_F5-w"/>
+  <OpenModel_Profile:Preliminary xmi:id="__k_I0NkwEemhQNrkGQNN2A" base_Element="_hZfC0DEkEemRSoIWRX3jNw"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 28eab26..610e4b1 100644
--- a/ONAP Information Model/Service.notation	
+++ b/ONAP Information Model/Service.notation	
@@ -3135,7 +3135,7 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tyz_-x9dEemLMI6HKP6Lbw"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_Y0oyUB9cEemLMI6HKP6Lbw" type="PapyrusUMLClassDiagram" name="Network Slicing Model" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_Y0oyUB9cEemLMI6HKP6Lbw" type="PapyrusUMLClassDiagram" name="Enhanced Nested Service Model" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_bJ4LYB9cEemLMI6HKP6Lbw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_bJ9D4B9cEemLMI6HKP6Lbw" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_bJ9q8B9cEemLMI6HKP6Lbw" type="Class_FloatingNameLabel">
@@ -3354,20 +3354,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_sekREIdsEem5i7slCUMe6w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_siHUUYdsEem5i7slCUMe6w"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_E2tDsIMGEemyVus8T4NvCQ" type="Property_ClassAttributeLabel" fontColor="16711935" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_at-AcIdwEem5i7slCUMe6w" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_at-AcYdwEem5i7slCUMe6w" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_auEHEIdwEem5i7slCUMe6w" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_auEHEYdwEem5i7slCUMe6w" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_E2zKUIMGEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_E2zKUYMGEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2zKUoMGEemyVus8T4NvCQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_E2FYoIMGEemyVus8T4NvCQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_E2tDsYMGEemyVus8T4NvCQ"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_e9FFMIdwEem5i7slCUMe6w" type="Property_ClassAttributeLabel" fontColor="16711935" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rSVKoIdwEem5i7slCUMe6w" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rSVKoYdwEem5i7slCUMe6w" key="fontHeight" value="true"/>
@@ -3599,14 +3585,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_AZTRWDEiEemRSoIWRX3jNw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZTRWTEiEemRSoIWRX3jNw"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__G2FXTJxEembsLjrwaSXHQ" type="StereotypeLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2HHNUDJ1EembsLjrwaSXHQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2HHNUTJ1EembsLjrwaSXHQ" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:StringValueStyle" xmi:id="__G2FXjJxEembsLjrwaSXHQ" name="stereotype" stringValue="OpenModel_Profile::Experimental"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_FU4UgJ2EEeSk-dMsN-xZbw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__G2FXzJxEembsLjrwaSXHQ"/>
-      </children>
       <children xmi:type="notation:DecorationNode" xmi:id="__G_2RDJxEembsLjrwaSXHQ" visible="false" type="StereotypeLabel">
         <styles xmi:type="notation:StringValueStyle" xmi:id="__G_2RTJxEembsLjrwaSXHQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index 7b795fb..d5f1e41 100644
--- a/ONAP Information Model/Service.uml	
+++ b/ONAP Information Model/Service.uml	
@@ -621,19 +621,6 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZzkacJDrEei9Vqs7Ti8Wxg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zzm2sJDrEei9Vqs7Ti8Wxg" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_E2FYoIMGEemyVus8T4NvCQ" name="configurableProperties">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_f4O54IMSEemIU81rY2FFFw" annotatedElement="_E2FYoIMGEemyVus8T4NvCQ">
-            <body>Describes the configurable properties of the service.&#xD;
-</body>
-          </ownedComment>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_EUn-wKFtEemY46Vmc0cZBg">
-            <body>Describes the configurable properties of the service.&#xD;
-</body>
-          </ownedComment>
-          <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>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_sekREIdsEem5i7slCUMe6w" name="isShared">
           <ownedComment xmi:type="uml:Comment" xmi:id="_WZSfMIdwEem5i7slCUMe6w" annotatedElement="_sekREIdsEem5i7slCUMe6w">
             <body>Describe whether this service descriptor is shared or not in the service design. </body>
@@ -2038,8 +2025,6 @@ reference point.</body>
   <OpenModel_Profile:Experimental xmi:id="_H_r6wILuEemyVus8T4NvCQ">
     <base_Element xmi:type="uml:Property" href="Common.uml#_W1j0wILsEemyVus8T4NvCQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_E2F_sIMGEemyVus8T4NvCQ" base_StructuralFeature="_E2FYoIMGEemyVus8T4NvCQ" support="OPTIONAL"/>
-  <OpenModel_Profile:Experimental xmi:id="_QCAegIMGEemyVus8T4NvCQ" base_Element="_E2FYoIMGEemyVus8T4NvCQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_seqXsIdsEem5i7slCUMe6w" base_StructuralFeature="_sekREIdsEem5i7slCUMe6w"/>
   <OpenModel_Profile:Experimental xmi:id="_-Gmz4IduEem5i7slCUMe6w" base_Element="_sekREIdsEem5i7slCUMe6w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_e7RHUYdwEem5i7slCUMe6w" base_StructuralFeature="_e7RHUIdwEem5i7slCUMe6w" support="OPTIONAL"/>
@@ -2053,7 +2038,6 @@ reference point.</body>
   <OpenModel_Profile:Experimental xmi:id="_LJq9YId2Eemz_I38RrvOQg" base_Element="_gFg8sF0aEemiOP02o5T8tA"/>
   <ActionLanguage:TextualRepresentation xmi:id="_66AbYId2Eemz_I38RrvOQg" base_Comment="_656UwId2Eemz_I38RrvOQg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_OmeeoYd6Eemz_I38RrvOQg" base_StructuralFeature="_OmeeoId6Eemz_I38RrvOQg"/>
-  <ActionLanguage:TextualRepresentation xmi:id="_EUv6kKFtEemY46Vmc0cZBg" base_Comment="_EUn-wKFtEemY46Vmc0cZBg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_WNgRMLcsEemG6epU56F5-w" base_Class="_WNfqILcsEemG6epU56F5-w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_3s_tsbdWEemG6epU56F5-w" base_Class="_3s_tsLdWEemG6epU56F5-w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_4CcZQbdWEemG6epU56F5-w" base_Class="_4CcZQLdWEemG6epU56F5-w"/>
-- 
cgit 1.2.3-korg