From bd6ff52a3bac52bd1d55654f0f33a4ded9783930 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 23 Nov 2018 14:46:21 -0600 Subject: Updates to common and vnf A number of updates to common, including root, network, and policy. A very slight update to Vnf (making a relationship from root and nf). Issue-ID: MODELING-104 Change-Id: Iac57d139b5b46d9c9b9012558fd4ce875190e720 Signed-off-by: Kevin Scaggs --- papyrus/ONAP Information Model/Common.uml | 552 ++++++++++++++++++------------ 1 file changed, 328 insertions(+), 224 deletions(-) (limited to 'papyrus/ONAP Information Model/Common.uml') diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml index b1356b4..793fba7 100644 --- a/papyrus/ONAP Information Model/Common.uml +++ b/papyrus/ONAP Information Model/Common.uml @@ -141,6 +141,7 @@ In the value set and its semantics, this type is equivalent to the Uri SMIv2 tex + @@ -2908,6 +2909,8 @@ Field Type Required? Description Administrative state: enum: ‘inService’, ‘outOfService’ + + @@ -2919,6 +2922,8 @@ Field Type Required? Description Operational state: enum: ‘inService’, ‘outOfService’ + + @@ -3008,71 +3013,99 @@ Field Type Required? Description Cumulative count of all packets received as read at the end of the measurement interval + + Count of all packets received within the measurement interval + + Cumulative count of unicast packets received as read at the end of the measurement interval + + Count of unicast packets received within the measurement interval + + Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise. + + Speed configured in mbps. + + Cumulative count of broadcast packets transmitted as read at the end of the measurement interval + + Count of broadcast packets transmitted within the measurement interval + + Cumulative count of discarded packets transmitted as read at the end of the measurement interval + + Count of discarded packets transmitted within the measurement interval + + Cumulative count of error packets transmitted as read at the end of the measurement interval + + Count of error packets transmitted within the measurement interval + + Cumulative count of multicast packets transmitted as read at the end of the measurement interval + + Count of multicast packets transmitted within the measurement interval + + @@ -3141,7 +3174,7 @@ Field Type Required? Description Enumeration: ‘true’ or ‘false’. If ‘true’ then the vNicPerformance values are likely inaccurate due to counter overflow or other conditions. - + @@ -4549,7 +4582,7 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field []. - + @@ -4558,7 +4591,7 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field [].

- + @@ -4571,7 +4604,10 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field [].

- + + + + @@ -4587,6 +4623,39 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field []. + + +

+ + + + + + + + + + + + +

+ + + + + + + +

+ + + + + + + + + @@ -4597,17 +4666,26 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field []. Policy actions have the semantics of "SET variable to value". There are two types of actions: + + + + + A PolicyEvent is an occurrence of an important event, and can be used to trigger the evaluation of a PolicyCondition or PolicyCondition clause in a PolicyRule. + + + This class is a generalized aggregation container. It enables PolicyRules and/or PolicyGroups to be aggregated in a single container. Note that loops, including the degenerate case of a PolicyGroup that contains itself, are not allowed when PolicyGroups contain other PolicyGroups. + This is a Boolean attribute that, if TRUE, signifies that evaluation (and possibly action execution) of this entity is mandatory and must be attempted. If the Mandatory property value of this entity is FALSE, then the evaluation of this entity is considered to be "best effort" and may be ignored. @@ -4683,6 +4761,7 @@ This attribute doesn’t exist in M.3100. The CIM has two attributes for this pu PolicyRules may be nested within PolicyRules. This is often needed in networking (e.g., bandwidth allocation). + This is a Boolean attribute that, if TRUE, defines the condition clause of this rule to be represented in Conjunctive Normal Form (e.g., an AND of ORs). If the value of this attribute is FALSE, then the condition clause will be represented in Disjunctive Normal Form (e.g., an OR of ANDs). @@ -4736,36 +4815,12 @@ Notes: Not present in the ITU specs; the CIM defines a PolicyKeyword attribute, - - - This is a generic naming attribute that can be used to identify different policy entities. This enables commonName to be used to enforce enterprise or service provider generic naming and this attribute to be used to fine tune the naming of policy entities. Thus, commonName is public in scope and policyName is private to policy. - -Notes: -Not present in the ITU specs or CIM specs. - - - - - - Represents a user-friendly identifier of an object. It is a (possibly ambiguous) name by which the object is commonly known in some limited scope (such as an organization) and conforms to the naming conventions of the country or culture with which it is associated. It is NOT used as a naming attribute (i.e., to uniquely identify an instance of the object). - - - - - - This is a string, and defines a textual free-form description of the object. - -Notes: -This attribute doesn’t exist in M.3100. The CIM has two attributes for this purpose, Caption (a short description) and Description. - - - - This is a concrete base class that is used to define the invariant characteristics (attributes, methods, constraints and relationships) of a PolicyRule entity. + This is an enumerated integer that defines the strategy to be used when executing the sequenced actions aggregated by this PolicyRule. Defined execution strategies include: @@ -4832,79 +4887,7 @@ MatchFirst enforces the actions of the first rule that evaluates to TRUE; policy MatchAll enforces the actions of all rules that evaluate to TRUE. This is equivalent to performing two passes through the rule set. The first pass gathers all PolicyRules that evaluate to true and places them in a group. The second pass then executes only those rules that evaluated to true. Execution of these rules is controlled through the Priority property (on the aggregation PolicySetComponent), which defines the order in which the PolicyRules execute. - - - Represents a user-friendly identifier of an object. It is a (possibly ambiguous) name by which the object is commonly known in some limited scope (such as an organization) and conforms to the naming conventions of the country or culture with which it is associated. It is NOT used as a naming attribute (i.e., to uniquely identify an instance of the object). - - - - - - his is a string, and defines a textual free-form description of the object. - -Notes: -This attribute doesn’t exist in M.3100. The CIM has two attributes for this purpose, Caption (a short description) and Description. - - - - - - Unambiguously distinguishes different object instances. It is the naming attribute of the object. - - - - - - - This is an enumerated integer that specifies the particular decision strategy to be used in this PolicySet. - -Permitted Values: - - 0: Unknown - 1: MatchFirst - 2: MatchAll - -MatchFirst enforces the actions of the first rule that evaluates to TRUE; policy evaluation then STOPS, meaning that all subsequent rules are no longer evaluated. - -MatchAll enforces the actions of all rules that evaluate to TRUE. This is equivalent to performing two passes through the rule set. The first pass gathers all PolicyRules that evaluate to true and places them in a group. The second pass then executes only those rules that evaluated to true. Execution of these rules is controlled through the Priority property (on the aggregation PolicySetComponent), which defines the order in which the PolicyRules execute. - - - - - - - - This is an enumerated integer that defines the strategy to be used when executing the sequenced actions aggregated by this PolicyRule. Defined execution strategies include: - - 0: Unknown - 1: Do Until Success - 2: Do All - 3: Do Until Failure - 4: Do All Without Failure or Do Nothing - -"Do Until Success" means that actions should be executed according to their predefined order, until successful execution of a single action. At that point, the process should stop (even if there are additional actions that could be executed). - -"Do All" means that all actions should be executed that are part of the set, according to their predefined order. This should continue, even if one or more of the actions fails. - -"Do Until Failure" means that all actions should be executed according to their predefined order until an action fails to execute. At that point, the entire sequence should be stopped. - -Finally, "Do All Without Failure or Do Nothing" means that all actions specified should be performed. However, if a failure occurs, then NONE of the actions should be performed. This implies EITHER the ability to look-ahead and ensure that the actions will be able to be performed successfully, or the ability to perform a rollback of that action and all previous actions when an error is encountered. - - - - - - - - - - - PolicyEvents can include a state chnage, a VES Event, or a configuration request. - - - Model Based Strongly On the TMF SID - This is the base class for all simple PolicyActions. A simple PolicyAction consists of a single Boolean clause, which is used to perform a single action. This consists of a single occurrence of a PolicyStatement, which is of the form: @@ -4950,6 +4933,8 @@ Notes: Not present in the ITU or CIM specs. + + @@ -4962,26 +4947,6 @@ Notes: default is “1” - - - This is an enumerated integer that defines the execution strategy to be used upon the sequenced actions aggregated by this PolicyActionComposite object. Defined execution strategies include: - - 0: Unknown - 1: Do Until Success - 2: Do All - 3: Do Until Failure - 4: Do All Without Failure or Do Nothing - -"Do Until Success" means that actions should be executed according to their predefined order, until successful execution of a single action. At that point, the process should stop (even if there are additional actions that could be executed). - -"Do All" means that all actions should be executed that are part of the set, according to their predefined order. This should continue, even if one or more of the actions fails. - -"Do Until Failure" means that actions should be executed according to their predefined order until an action fails to execute. At that point, the entire sequence should be stopped. - -Finally, "Do All Without Failure or Do Nothing" means that ALL actions specified should be performed. However, if a failure occurs, then NONE of the actions should be performed. This implies EITHER the ability to look-ahead and ensure that the actions will be able to be performed successfully, or the ability to perform a rollback of that action and all previous actions when an error is encountered. - - - This is a Boolean attribute that, if TRUE, signifies that this PolicyAction has one or more sub-actions. Sub-actions are used to enforce a hierarchical nesting of actions, so that parent actions may control the evaluation and other semantics of sub-actions that they contain. @@ -4993,19 +4958,72 @@ Notes: Not present in the ITU or CIM specs. + - - -

- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + This is an enumerated integer that specifies the particular decision strategy to be used in this PolicySet. + +Permitted Values: + + 0: Unknown + 1: MatchFirst + 2: MatchAll + +MatchFirst enforces the actions of the first rule that evaluates to TRUE; policy evaluation then STOPS, meaning that all subsequent rules are no longer evaluated. + +MatchAll enforces the actions of all rules that evaluate to TRUE. This is equivalent to performing two passes through the rule set. The first pass gathers all PolicyRules that evaluate to true and places them in a group. The second pass then executes only those rules that evaluated to true. Execution of these rules is controlled through the Priority property (on the aggregation PolicySetComponent), which defines the order in which the PolicyRules execute. + + + + + + + + This is an enumerated integer that defines the strategy to be used when executing the sequenced actions aggregated by this PolicyRule. Defined execution strategies include: + + 0: Unknown + 1: Do Until Success + 2: Do All + 3: Do Until Failure + 4: Do All Without Failure or Do Nothing + +"Do Until Success" means that actions should be executed according to their predefined order, until successful execution of a single action. At that point, the process should stop (even if there are additional actions that could be executed). + +"Do All" means that all actions should be executed that are part of the set, according to their predefined order. This should continue, even if one or more of the actions fails. + +"Do Until Failure" means that all actions should be executed according to their predefined order until an action fails to execute. At that point, the entire sequence should be stopped. + +Finally, "Do All Without Failure or Do Nothing" means that all actions specified should be performed. However, if a failure occurs, then NONE of the actions should be performed. This implies EITHER the ability to look-ahead and ensure that the actions will be able to be performed successfully, or the ability to perform a rollback of that action and all previous actions when an error is encountered. + + + + + + @@ -5029,6 +5047,20 @@ Not present in the ITU or CIM specs. + + + PolicyEvents can include a state chnage, a VES Event, or a configuration request. + + + Model Based Strongly On the TMF SID + + + Items in great added + + + Rooted PolicyEvent + + @@ -5429,13 +5461,6 @@ Any modification of the content of the NFD or the NF Package shall result in a Invariant ID that is shared across all versions of the descriptor - - - - - - - Software version of the NF. This is changed when there is any change to the software that is included in the NF Package. @@ -5447,24 +5472,6 @@ Any modification of the content of the NFD or the NF Package shall result in a - - - Human readable name for the NF Product. Can change during the NF Product lifetime. - - - - - - - - - Human readable description of the NF Product. Can change during the NF Product lifetime. - - - - - - Identifies the type of ONAP controller for the network function @@ -5478,37 +5485,6 @@ Any modification of the content of the NFD or the NF Package shall result in a - - - Information about localization languages of the NF (includes e.g. strings in the NFD). - -NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at NF instantiation time. - - - - valueRange: refer to ISO936 https://www.iso.org/iso-639-language-codes.html - - - - - - - - - Default localization language that is instantiated if no information about selected localization language is available. - - - - valueRange: refer to ISO936 https://www.iso.org/iso-639-language-codes.html - - - condition: Shall be present if "localizationLanguage" is present and shall be absent otherwise. - - - - - - Describes external interface(s) exposed by this NF enabling connection with a network. @@ -5571,6 +5547,7 @@ NOTE: This allows to provide one or more localization languages to support sel + @@ -5608,15 +5585,86 @@ This tells the consumer where to send the subscription request. - - + + + + + + - + - + + + + + + Human readable name for the NF Product. Can change during the NF Product lifetime. + + + + + + + + + Software version of the NF. This is changed when there is any change to the software that is included in the NF Package. + + + + + + + Information about localization languages of the NF (includes e.g. strings in the NFD). + +NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at NF instantiation time. + + + + valueRange: refer to ISO936 https://www.iso.org/iso-639-language-codes.html + + + + + + + + + Human readable description of the NF Product. Can change during the NF Product lifetime. + + + + + + + + + Default localization language that is instantiated if no information about selected localization language is available. + + + + valueRange: refer to ISO936 https://www.iso.org/iso-639-language-codes.html + + + condition: Shall be present if "localizationLanguage" is present and shall be absent otherwise. + + + + + + + + + + + + + + + @@ -5626,6 +5674,20 @@ This tells the consumer where to send the subscription request. + + + + + + + + + + + + + + @@ -5636,6 +5698,8 @@ This tells the consumer where to send the subscription request. + + @@ -5698,7 +5762,7 @@ This tells the consumer where to send the subscription request.

- + @@ -5728,7 +5792,7 @@ This tells the consumer where to send the subscription request.

- + @@ -5955,27 +6019,38 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - + + + Perhaps all these attributes can be moved up to OnboardingNfDescriptor + + + Add tosca.nodes.nfvl.nf attributes here (from https://wiki.onap.org/pages/viewpage.action?pageId=45303981) + + + + defaultLocalizationLangauge- string, not required (*) goes to OnboardingNfDescriptor + + + +

+ + + + + +

+ + + + - - - - - - - - - - + + - - - - - + @@ -5990,6 +6065,9 @@ Per VNF, the affinity/anti-affinity rules defined using this information element + + + @@ -6691,19 +6769,12 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - - - - - - - @@ -6715,7 +6786,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - @@ -6852,11 +6922,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - - - - - @@ -6883,4 +6948,43 @@ Per VNF, the affinity/anti-affinity rules defined using this information element + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg