From 03991d6387401327cf17b3389521262ec2c89dea Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Tue, 12 Mar 2019 14:03:30 -0700 Subject: Changes to Common, Nf, and Vnf Issue-ID: MODELING-104 Change-Id: I1ca39153aa452d25a206400efe5263e31d7fe78e Signed-off-by: jjewitt58 --- ONAP Information Model/Common.uml | 20 +- ONAP Information Model/Nf.notation | 157 +++++++++++++- ONAP Information Model/Nf.uml | 41 ++++ ONAP Information Model/Vnf.notation | 411 ++++++++++++++++++------------------ ONAP Information Model/Vnf.uml | 256 +++++++++++----------- 5 files changed, 550 insertions(+), 335 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index 9fb5124..44ffcf0 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -234,9 +234,7 @@ White - Not Ready for Review Common part of the various VLDs. - - - + Uniquely identifies a VLD in the parent descriptor. @@ -537,6 +535,13 @@ Editor's note: the attribute "layerProtocol" still needs further discu + + + Reference of the security group rules bound to this CPD. + + + + @@ -783,6 +788,11 @@ NOTE: These attributes are used to control scaling boundaries. + + + + + @@ -4921,4 +4931,8 @@ Permitted Values: + + + + diff --git a/ONAP Information Model/Nf.notation b/ONAP Information Model/Nf.notation index bfa443b..fc2cc27 100644 --- a/ONAP Information Model/Nf.notation +++ b/ONAP Information Model/Nf.notation @@ -1,2 +1,157 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Nf.uml b/ONAP Information Model/Nf.uml index a463037..1c053c3 100644 --- a/ONAP Information Model/Nf.uml +++ b/ONAP Information Model/Nf.uml @@ -16,6 +16,37 @@ A functional block within a network infrastructure that has well-defined external interfaces and well-defined functional behaviour. NOTE: In practical terms, a Network Function is today often a network node or physical appliance + + + Identifier of the network function + + + + + + + + + + + Description of the type of network function + + + + + + Description of the network function + + + + + + + + Role the network function will be providing. + + + @@ -97,4 +128,14 @@ This tells the consumer where to send the subscription request. + + + + + + + + + + diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation index 70475db..e58f0b0 100644 --- a/ONAP Information Model/Vnf.notation +++ b/ONAP Information Model/Vnf.notation @@ -1161,6 +1161,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1848,6 +1950,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5225,27 +5368,6 @@ - - -

- - - - - - - - - - - - - - - - - -

@@ -5258,18 +5380,6 @@ - - -

- - - - - - - - -

@@ -5282,28 +5392,6 @@ - - -

- - - - - - - - - - - - - - - - - - @@ -5415,18 +5503,6 @@ - - -

- - - - - - - - -

@@ -5451,45 +5527,6 @@ - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

@@ -6244,28 +6281,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -7436,14 +7451,6 @@ - - - - - - - - @@ -7908,6 +7915,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -7964,16 +7995,6 @@ - - - - - - - - - - @@ -8224,6 +8245,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8933,45 +8984,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9044,13 +9056,13 @@ - + - + @@ -9368,16 +9380,6 @@ - - - - - - - - - - @@ -9399,17 +9401,6 @@ - - - - - - - - - - - @@ -9434,7 +9425,7 @@ - + @@ -9469,7 +9460,7 @@ - + diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml index c08942f..9950748 100644 --- a/ONAP Information Model/Vnf.uml +++ b/ONAP Information Model/Vnf.uml @@ -483,6 +483,12 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the + + +

+ + + @@ -570,16 +576,6 @@ This will probably need to move to common - - - - - - - - - - @@ -595,7 +591,7 @@ A VNFC will only be in one VNFDesc. If a vendor wants to use the VNFC in mupli - + Unique identifier of this Vdu in VNFD. @@ -909,6 +905,13 @@ NOTE: This shall be used to describe both the software image loaded on the vir + + + Defines security group rules to be used by the VNF. + + + + @@ -1698,68 +1701,40 @@ Diversity - Resources are geo-diverse ( cannot be co-located). An implementation of an NF that can be deployed on a Network Function Virtualisation Infrastructure (NFVI). - - - identifier of the VNF instance - - - - - - name of the VNF instance. Multiple names are possible. - - - - - + + + name to identify the VNF Product, invariant for the VNF Product lifetime - + - - - description of the VNF instance - - - - provider of the VNF model - - - - identifier of the VNF model - - - - - - version of the VNF model - Software version of the VNF. This is changed when there is any change to the software that is included in the VNF package - + - + identifier of the specific VNF package on which the VNF instance is based - + availability zone information of the VNF instance + @@ -1777,6 +1752,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). oam ip address, ipv4 + @@ -1784,6 +1760,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). oam ip address, ipv6 + @@ -1791,6 +1768,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). information specific to an instantiated VNF instance, e.g., vm information + @@ -1802,9 +1780,9 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - + - whether closed loop function is enabled + Indicates whether the closed loop function is enabled or disabled. @@ -1825,12 +1803,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - - - String assigned to this model used for naming purpose. - - - Identifier of the policy which has the naming logic for this VNF instance @@ -1843,32 +1815,9 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - - - Generic description of the type of network function - - - - - - English description of network function that the specific VNF deployment is providing. - - - - - - Role in the network this model will be providing - - - - - - Whether closed loop capabilities are enabled for this or not. - - - + - Relatonship to the NF components that are part of this VNF. + Relatonship to the VNF components that are part of this VNF. @@ -2007,7 +1956,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). whether the VNFC instance is instantiated - + Whether closed loop capabilities are enabled for this or not. @@ -2337,7 +2286,72 @@ This could include the number of CPU cores on this logical node, a memory config - + + + + + + + Security group rule specifies the matching criteria for the ingress and/or egress traffic to/from the visited connection points. If an ingress traffic is accepted, the corresponding egress response shall be allowed, regardless of the security group rules on the egress direction. If an egress traffic is allowed, the corresponding ingress response shall be accepted, regardless of the security group rules on the ingress direction. The design of security group rule follows a permissive model where all security group rules applied to a CP are dealt with in an "OR" logic fashion, i.e. the traffic is allowed if it matches any security group rule applied to this CP. + + + + Identifier of the security group rule. + + + + + + Human readable description of the security group rule + + + + + + + + The direction in which the security group rule is applied. + + + + + + + + Indicates the protocol carried over the Ethernet layer. + + + + + + + + + Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc. +Note: IFA011 defines this as an enum, but as the list is not complete, made this a string. + + + + + + + + Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints. + + + + + + + + + Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints. + + + + + + @@ -2753,10 +2767,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - - - - Provisioning status, used as a trigger for operational monitoring of this resource by service assurance systems. @@ -2769,8 +2779,8 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path. - - + + @@ -2971,6 +2981,13 @@ The attached VDUs shall connect to the same internal VLD. + + + Ingress or egress traffic + + + + @@ -3196,13 +3213,8 @@ The attached VDUs shall connect to the same internal VLD. - - - - + - - @@ -3215,13 +3227,8 @@ The attached VDUs shall connect to the same internal VLD. - - - - - @@ -3250,12 +3257,8 @@ The attached VDUs shall connect to the same internal VLD. - - - - @@ -3354,17 +3357,10 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - @@ -3379,9 +3375,6 @@ The attached VDUs shall connect to the same internal VLD. - - - @@ -3411,7 +3404,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3481,10 +3473,7 @@ The attached VDUs shall connect to the same internal VLD. - - - @@ -3613,7 +3602,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3756,7 +3744,33 @@ The attached VDUs shall connect to the same internal VLD. - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg