From 7861f8912e291167c6782651a73ba1d9566d5c73 Mon Sep 17 00:00:00 2001
From: jjewitt58 <jessie.jewitt@oamtechnologies.com>
Date: Fri, 1 Feb 2019 07:27:26 -0800
Subject: Update PNFD class diagram

Issue-ID: MODELING-104

Change-Id: I305511888f8a474b9d2fbb8e434a51af181d7033
Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>
---
 ONAP Information Model/Pnf.notation | 23 +----------------------
 ONAP Information Model/Pnf.uml      | 21 ---------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/ONAP Information Model/Pnf.notation b/ONAP Information Model/Pnf.notation
index 060d0df..4bdc646 100644
--- a/ONAP Information Model/Pnf.notation	
+++ b/ONAP Information Model/Pnf.notation	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_PJLTcOw0EeiDiIttoROOIw" type="PapyrusUMLClassDiagram" name="PnfdModel" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_PJLTcOw0EeiDiIttoROOIw" type="PapyrusUMLClassDiagram" name="PnfdModel" measurementUnit="Pixel">
   <children xmi:type="notation:Shape" xmi:id="_PJLTcew0EeiDiIttoROOIw" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_PJLTcuw0EeiDiIttoROOIw" type="Class_NameLabel"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_PJLTc-w0EeiDiIttoROOIw" type="Class_FloatingNameLabel">
@@ -108,27 +108,6 @@
         <element xmi:type="uml:Property" href="Pnf.uml#_le5Q4Ow3EeiDiIttoROOIw"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="__GFtgew3EeiDiIttoROOIw"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_CbHSEP4fEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">
-        <children xmi:type="notation:DecorationNode" xmi:id="_CcH-sP4fEeirJOiRiTRpBw" visible="false" type="StereotypeLabel">
-          <styles xmi:type="notation:StringValueStyle" xmi:id="_CcH-sf4fEeirJOiRiTRpBw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CcH-sv4fEeirJOiRiTRpBw"/>
-        </children>
-        <element xmi:type="uml:Property" href="Pnf.uml#_EFTyYPGPEeiSnciiH95D-g"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CbHSEf4fEeirJOiRiTRpBw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_kCeI8A-TEemEj74AZiZr9A" type="Property_ClassAttributeLabel" fontColor="10265827" bold="true" gradient="10265827, -1, 0" lineColor="8047085">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kJ_wcA-XEemQMahCaSVsSg" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kKAXgA-XEemQMahCaSVsSg" key="fontColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_kDEl4A-TEemEj74AZiZr9A" visible="false" type="StereotypeLabel">
-          <styles xmi:type="notation:StringValueStyle" xmi:id="_kDEl4Q-TEemEj74AZiZr9A" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDEl4g-TEemEj74AZiZr9A"/>
-        </children>
-        <element xmi:type="uml:Property" href="Pnf.uml#_GkGmcA-TEemEj74AZiZr9A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kCeI8Q-TEemEj74AZiZr9A"/>
-      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_PJL7L-w0EeiDiIttoROOIw"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_PJL7MOw0EeiDiIttoROOIw"/>
       <styles xmi:type="notation:FilteringStyle" xmi:id="_PJL7Mew0EeiDiIttoROOIw"/>
diff --git a/ONAP Information Model/Pnf.uml b/ONAP Information Model/Pnf.uml
index 1d4ff26..79ce372 100644
--- a/ONAP Information Model/Pnf.uml	
+++ b/ONAP Information Model/Pnf.uml	
@@ -69,16 +69,6 @@ NOTE: 	The provider of the PNFD might be different from the provider of the PNF.
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_EFTyYPGPEeiSnciiH95D-g" name="geographicLocationInfo" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_TSOogPGPEeiSnciiH95D-g" annotatedElement="_EFTyYPGPEeiSnciiH95D-g">
-            <body>It provides information about the geographical location (e.g. geographic&#xD;
-coordinates or address of the building, etc.) of the PNF. The cardinality 0 is used when the location is unknown.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MLyxUPGPEeiSnciiH95D-g"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MM6LoPGPEeiSnciiH95D-g" value="1"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_kgLS4P4fEeirJOiRiTRpBw" name="_pnfExtCpd " type="_bd53ADzFEeiWMf5FLWfdLA" aggregation="composite" association="_kf17sP4fEeirJOiRiTRpBw">
           <ownedComment xmi:type="uml:Comment" xmi:id="_3bGPUP4gEeirJOiRiTRpBw" annotatedElement="_kgLS4P4fEeirJOiRiTRpBw">
             <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>
@@ -86,13 +76,6 @@ coordinates or address of the building, etc.) of the PNF. The cardinality 0 is u
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kgSAkP4fEeirJOiRiTRpBw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kgTOsP4fEeirJOiRiTRpBw" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_GkGmcA-TEemEj74AZiZr9A" name="swVersionList" visibility="public" type="_tlyigBgIEembeqMx64UEWQ">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Z1OR0A-TEemEj74AZiZr9A" annotatedElement="_GkGmcA-TEemEj74AZiZr9A">
-            <body>Describes the software the PNF supports</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qq0-0A-TEemEj74AZiZr9A" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QrnB8A-TEemEj74AZiZr9A" value="*"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_bd53ADzFEeiWMf5FLWfdLA" name="PnfExtCpd ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_bd53ATzFEeiWMf5FLWfdLA" annotatedElement="_bd53ADzFEeiWMf5FLWfdLA">
@@ -207,9 +190,7 @@ coordinates or address of the building, etc.) of the PNF. The cardinality 0 is u
   <OpenModel_Profile:OpenModelAttribute xmi:id="_x8Zv4Ow2EeiDiIttoROOIw" base_StructuralFeature="_x8ZI0Ow2EeiDiIttoROOIw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_WDCm4ew3EeiDiIttoROOIw" base_StructuralFeature="_WDCm4Ow3EeiDiIttoROOIw" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_le538Ow3EeiDiIttoROOIw" base_StructuralFeature="_le5Q4Ow3EeiDiIttoROOIw"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_EF5oQPGPEeiSnciiH95D-g" base_StructuralFeature="_EFTyYPGPEeiSnciiH95D-g"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kgMhAP4fEeirJOiRiTRpBw" base_StructuralFeature="_kgLS4P4fEeirJOiRiTRpBw"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_GkSMoA-TEemEj74AZiZr9A" base_StructuralFeature="_GkGmcA-TEemEj74AZiZr9A"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_phXtUBRDEembeqMx64UEWQ" base_StructuralFeature="_kgUc0P4fEeirJOiRiTRpBw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_361DsBgIEembeqMx64UEWQ" base_StructuralFeature="_36z1kBgIEembeqMx64UEWQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="__fpgABgIEembeqMx64UEWQ" base_StructuralFeature="__fnq0BgIEembeqMx64UEWQ"/>
@@ -221,8 +202,6 @@ coordinates or address of the building, etc.) of the PNF. The cardinality 0 is u
   <OpenModel_Profile:Experimental xmi:id="_5vnJIBgKEembeqMx64UEWQ" base_Element="_x8ZI0Ow2EeiDiIttoROOIw"/>
   <OpenModel_Profile:Experimental xmi:id="_7aq8wBgKEembeqMx64UEWQ" base_Element="_WDCm4Ow3EeiDiIttoROOIw"/>
   <OpenModel_Profile:Experimental xmi:id="_9EeMIBgKEembeqMx64UEWQ" base_Element="_le5Q4Ow3EeiDiIttoROOIw"/>
-  <OpenModel_Profile:Experimental xmi:id="_-vim0BgKEembeqMx64UEWQ" base_Element="_EFTyYPGPEeiSnciiH95D-g"/>
-  <OpenModel_Profile:Experimental xmi:id="_Ah4uMBgLEembeqMx64UEWQ" base_Element="_GkGmcA-TEemEj74AZiZr9A"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_n0I0UKe3Eeixw5Ke5QD1pQ" base_Class="_13TCEDzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_n0PiAKe3Eeixw5Ke5QD1pQ" base_StructuralFeature="_13TCEjzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_n0UagKe3Eeixw5Ke5QD1pQ" base_StructuralFeature="_13TCFDzEEeiWMf5FLWfdLA"/>
-- 
cgit 1.2.3-korg