diff options
author | FernandoOliveira <fernando.oliveira@verizon.com> | 2020-09-16 13:59:13 -0400 |
---|---|---|
committer | FernandoOliveira <fernando.oliveira@verizon.com> | 2020-10-29 16:45:37 -0400 |
commit | 2d9a0e5cc3ec032c3b401d09eedca8f197d6eace (patch) | |
tree | 994c9dd9910e5a84af0d297fd2b7785e41d112a7 /ONAP_Information_Model/Ns.uml | |
parent | 6e69139fd316b618affea6511974763ecfa63da6 (diff) |
Updated the VNF model to align with IFA011 v3.3.1
- Added VnfPackageChangeInfo Class used in the VNFD and various subclasses
- Added VnfLcmOperationCoordination Class used in the VNFD and various subclasses
- A few minor changes to the NS model to align with ETSI IFA014 v3.3.1
- Added new VNF types to the VNF type diagram
Issue-ID: MODELING-334
Signed-off-by: Fernando Oliveira <fernando.oliveira@verizon.com>
Change-Id: Icd1fa97f2d519d0d208c989f0cc1b8689fb4a440
Diffstat (limited to 'ONAP_Information_Model/Ns.uml')
-rw-r--r-- | ONAP_Information_Model/Ns.uml | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/ONAP_Information_Model/Ns.uml b/ONAP_Information_Model/Ns.uml index 946eedd..0472b73 100644 --- a/ONAP_Information_Model/Ns.uml +++ b/ONAP_Information_Model/Ns.uml @@ -385,6 +385,20 @@ NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF sh <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YgQisJmiEeiSm9XNElOsxQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YgtOoJmiEeiSm9XNElOsxQ" value="*"/> </ownedAttribute> + <ownedAttribute xmi:type="uml:Property" xmi:id="_sPSdIPhOEeqmQbGVBesp1w" name="priority"> + <ownedComment xmi:type="uml:Comment" xmi:id="_9LkYEPhOEeqmQbGVBesp1w"> + <body>Specifies the priority for the NS instance.</body> + </ownedComment> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x8M8oPhOEeqmQbGVBesp1w"/> + </ownedAttribute> + <ownedAttribute xmi:type="uml:Property" xmi:id="__TtwUPhOEeqmQbGVBesp1w" name="serviceAvailabilityLevel"> + <ownedComment xmi:type="uml:Comment" xmi:id="_PRKEcPhPEeqmQbGVBesp1w"> + <body>If present, specifies the service availability level for the NS instance created from this DF.</body> + </ownedComment> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EyshgPhPEeqmQbGVBesp1w"/> + </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_45XE4DzEEeiWMf5FLWfdLA" name="VnfProfile"> <ownedComment xmi:type="uml:Comment" xmi:id="_45XE4TzEEeiWMf5FLWfdLA" annotatedElement="_45XE4DzEEeiWMf5FLWfdLA"> @@ -457,6 +471,13 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45XE_TzEEeiWMf5FLWfdLA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45XE_jzEEeiWMf5FLWfdLA" value="*"/> </ownedAttribute> + <ownedAttribute xmi:type="uml:Property" xmi:id="_nMjGkPhPEeqmQbGVBesp1w" name="serviceAvailabilityLevel"> + <ownedComment xmi:type="uml:Comment" xmi:id="_6lt6sPhPEeqmQbGVBesp1w"> + <body>If present, specifies the service availability level for the VNF instance created from this profile.</body> + </ownedComment> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tUFFgPhPEeqmQbGVBesp1w"/> + </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_GYYOwDzFEeiWMf5FLWfdLA" name="PnfProfile"> <ownedComment xmi:type="uml:Comment" xmi:id="_GYYOwTzFEeiWMf5FLWfdLA" annotatedElement="_GYYOwDzFEeiWMf5FLWfdLA"> @@ -1089,13 +1110,14 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kEZBpzzEEeiWMf5FLWfdLA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kEZBqDzEEeiWMf5FLWfdLA" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZBqTzEEeiWMf5FLWfdLA" name="serviceAvaibilityLevel" type="_xl3E0KY9Eeixw5Ke5QD1pQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZBqTzEEeiWMf5FLWfdLA" name="serviceAvaibilityLevel"> <ownedComment xmi:type="uml:Comment" xmi:id="_kEZBqjzEEeiWMf5FLWfdLA" annotatedElement="_kEZBqTzEEeiWMf5FLWfdLA"> <body>Specifies one of the three levels defined in ETSI GS NFV-REL 001:
 • Level 1
 • Level 2
 • Level 3</body> </ownedComment> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kEZBqzzEEeiWMf5FLWfdLA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kEZBrDzEEeiWMf5FLWfdLA" value="1"/> </ownedAttribute> @@ -1287,18 +1309,6 @@ When only one value is provided, the ingress and egress traffic is associated to <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> </packagedElement> - <packagedElement xmi:type="uml:Enumeration" xmi:id="_xl3E0KY9Eeixw5Ke5QD1pQ" name="ServiceAvailabilityLevel"> - <ownedComment xmi:type="uml:Comment" xmi:id="_30piUKY9Eeixw5Ke5QD1pQ" annotatedElement="_xl3E0KY9Eeixw5Ke5QD1pQ"> - <body>Specifies one of the three levels defined in ETSI GS NFV-REL 001:
 -• Level 1
 -• Level 2
 -• Level 3
 -</body> - </ownedComment> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6KjCsKY9Eeixw5Ke5QD1pQ" name="LEVEL_1"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9VdfgKY9Eeixw5Ke5QD1pQ" name="LEVEL_2"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AOydEKY-Eeixw5Ke5QD1pQ" name="LEVEL_3"/> - </packagedElement> </packagedElement> <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Epmi8Bg2EembeqMx64UEWQ"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BavMADksEemjyLkBMGZA1g" source="PapyrusVersion"> @@ -1560,7 +1570,7 @@ When only one value is provided, the ingress and egress traffic is associated to <OpenModel_Profile:Experimental xmi:id="_kxM1sPHREeqoIpAKV26OqA" base_Element="_kEaPVjzEEeiWMf5FLWfdLA"/> <OpenModel_Profile:Reference xmi:id="_kxiM4PHREeqoIpAKV26OqA" base_Element="_kEaPVjzEEeiWMf5FLWfdLA" reference="IFA014 v2.7.1"/> <OpenModel_Profile:Experimental xmi:id="_XadooPHSEeqoIpAKV26OqA" base_Element="_kEZBoTzEEeiWMf5FLWfdLA"/> - <OpenModel_Profile:Reference xmi:id="_Xay_0PHSEeqoIpAKV26OqA" base_Element="_kEZBoTzEEeiWMf5FLWfdLA" reference="IFA014 v2.7.1"/> + <OpenModel_Profile:Reference xmi:id="_Xay_0PHSEeqoIpAKV26OqA" base_Element="_kEZBoTzEEeiWMf5FLWfdLA" reference="IFA014 v3.3.1"/> <OpenModel_Profile:OpenModelAttribute xmi:id="_BAA_YfHTEeqoIpAKV26OqA" base_StructuralFeature="_BAA_YPHTEeqoIpAKV26OqA"/> <OpenModel_Profile:OpenModelAttribute xmi:id="_E3pYQfHTEeqoIpAKV26OqA" base_StructuralFeature="_E3pYQPHTEeqoIpAKV26OqA"/> <OpenModel_Profile:OpenModelAttribute xmi:id="_J9VfsfHTEeqoIpAKV26OqA" base_StructuralFeature="_J9VfsPHTEeqoIpAKV26OqA"/> @@ -1572,4 +1582,14 @@ When only one value is provided, the ingress and egress traffic is associated to <OpenModel_Profile:Reference xmi:id="_Qv_QgPHZEeqoIpAKV26OqA" base_Element="_13WFYDzEEeiWMf5FLWfdLA" reference="IFA014 v2.7.1"/> <OpenModel_Profile:OpenModelClass xmi:id="_1Wb7QzzFEeiWMf5FLWfdLA" base_Class="_1Wb7QDzFEeiWMf5FLWfdLA"/> <OpenModel_Profile:Future xmi:id="_aRpj4KewEeixw5Ke5QD1pQ" base_Element="_1Wb7QDzFEeiWMf5FLWfdLA"/> + <OpenModel_Profile:Reference xmi:id="_yDPTYPg7EeqczaleenSRZA" base_Element="_13KfMDzEEeiWMf5FLWfdLA" reference="IFA011 v3.3.1"/> + <OpenModel_Profile:OpenModelAttribute xmi:id="_sPWHgPhOEeqmQbGVBesp1w" base_StructuralFeature="_sPSdIPhOEeqmQbGVBesp1w"/> + <OpenModel_Profile:OpenModelAttribute xmi:id="__TtwUfhOEeqmQbGVBesp1w" base_StructuralFeature="__TtwUPhOEeqmQbGVBesp1w"/> + <OpenModel_Profile:Experimental xmi:id="_GyAG0PhPEeqmQbGVBesp1w" base_Element="__TtwUPhOEeqmQbGVBesp1w"/> + <OpenModel_Profile:Reference xmi:id="_GyQlgPhPEeqmQbGVBesp1w" base_Element="__TtwUPhOEeqmQbGVBesp1w" reference="IFA014 v3.3.1"/> + <OpenModel_Profile:Experimental xmi:id="_LV5IwPhPEeqmQbGVBesp1w" base_Element="_sPSdIPhOEeqmQbGVBesp1w"/> + <OpenModel_Profile:Reference xmi:id="_LWKOgPhPEeqmQbGVBesp1w" base_Element="_sPSdIPhOEeqmQbGVBesp1w" reference="IFA014 v3.3.1"/> + <OpenModel_Profile:OpenModelAttribute xmi:id="_nMjGkfhPEeqmQbGVBesp1w" base_StructuralFeature="_nMjGkPhPEeqmQbGVBesp1w"/> + <OpenModel_Profile:Experimental xmi:id="_u4xycPhPEeqmQbGVBesp1w" base_Element="_nMjGkPhPEeqmQbGVBesp1w"/> + <OpenModel_Profile:Reference xmi:id="_u5C4MPhPEeqmQbGVBesp1w" base_Element="_nMjGkPhPEeqmQbGVBesp1w" reference="IFA014 v3.3.1"/> </xmi:XMI> |