From e3a3333fadb6047c9292118f71ad39099507ef19 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 11 Jan 2019 16:39:18 -0600 Subject: Updates to Common Updates include changes to Policy and limited updates to Event packages under common Issue-ID: MODELING-104 Change-Id: I2605b17b3f87abe82322dbd9bc83325effb259b0 Signed-off-by: Kevin Scaggs --- papyrus/ONAP Information Model/Common.notation | 509 +++++++++++++++++++------ papyrus/ONAP Information Model/Common.uml | 183 ++++++--- 2 files changed, 535 insertions(+), 157 deletions(-) (limited to 'papyrus/ONAP Information Model') diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation index 72be7d0..e15e0f5 100644 --- a/papyrus/ONAP Information Model/Common.notation +++ b/papyrus/ONAP Information Model/Common.notation @@ -496,7 +496,7 @@ - + @@ -655,7 +655,7 @@ - + @@ -684,7 +684,7 @@ - + @@ -775,7 +775,7 @@ - + @@ -805,7 +805,7 @@ - + @@ -831,28 +831,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1147,6 +1125,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -6499,15 +6499,6 @@ - - - - - - - - - @@ -6535,32 +6526,59 @@ - - - + + + + + + + + + + + + - + + + + + + + + + + - + - - - + + + - + - + - - - + + + - + - + + + + + + + + + + @@ -6585,7 +6603,7 @@ - + @@ -6640,6 +6658,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6663,7 +6753,7 @@ - + @@ -6853,6 +6943,15 @@ + + + + + + + + + @@ -6876,7 +6975,7 @@ - + @@ -6979,7 +7078,7 @@ - + @@ -7025,6 +7124,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -7109,8 +7231,8 @@ - - + + @@ -7140,7 +7262,7 @@ - + @@ -7277,9 +7399,19 @@ - + + + + + + + + + + + @@ -12649,6 +12781,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12672,7 +12831,7 @@ - + @@ -12817,6 +12976,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12850,6 +13036,14 @@ + + + + + + + + @@ -12914,7 +13108,7 @@ - + @@ -12940,7 +13134,17 @@ - + + + + + + + + + + + @@ -13043,15 +13247,6 @@ - - - - - - - - - @@ -13061,33 +13256,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13124,6 +13292,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13261,13 +13474,21 @@ - + + +

+ + + + + + - + @@ -13277,10 +13498,74 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13368,7 +13653,7 @@ - + @@ -13954,7 +14239,7 @@ - + @@ -13993,7 +14278,7 @@ - + @@ -14032,7 +14317,7 @@ - + @@ -14085,9 +14370,9 @@ - + - + @@ -14097,8 +14382,8 @@ - - + + diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml index 45f636d..8b0f2ce 100644 --- a/papyrus/ONAP Information Model/Common.uml +++ b/papyrus/ONAP Information Model/Common.uml @@ -1,5 +1,5 @@ - + @@ -3850,13 +3850,6 @@ Field Type Required? Description lastEpochMicrosec - the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds - - - Defines the network address type. - - - - Array of named hashMaps @@ -3983,10 +3976,8 @@ Field Type Required? Description - - - - + + @@ -4263,6 +4254,13 @@ Debug 7 debug-level messages + + + Threshold Crossing Alert counter criticality - possible values of CRIT and MAJ. + + + + @@ -5113,9 +5111,9 @@ Not applicable when license type is Perpetual. - Presently the scope of policy is imperitive only (not declaritive or intent). + Presently the scope of policy is imperitive (event, condition, action) only - not declaritive or intent. -Approach will be pragmatic in nature, establishing a model that meets the Policy team's near term needs, and then evolve from there. +Approach will be pragmatic in nature, establishing a model that meets the Policy team's near term needs, and then evolve from that base. @@ -5206,6 +5204,12 @@ Approach will be pragmatic in nature, establishing a model that meets the Policy + + +

+ + + @@ -5219,9 +5223,16 @@ Certain actions will take place if the condition clause is TRUE, others if the c + + Additional metadata pertinant to the action. + - + + + Defines the strategy to be used when executing the aggregated actions + + @@ -5232,11 +5243,25 @@ Certain actions will take place if the condition clause is TRUE, others if the c eventOrigin provides information on the entity that generates the event (DCAE, Vnf, monitors). + The environment or entity in which the event occurred (Eg - Vnf, switch, eNodeB, or data center). + + + + + The payload for the event. + + + + + + Classification that captures the symantics of that particular event categorization (enodeb, vnf) + + @@ -5327,11 +5352,8 @@ PolicyRules may be nested within PolicyRules. This is often needed in networking This attribute controls the setting of how multiple condition clauses (as represented by multiple PolicyConditionComposite objects) are treated in the PolicyRule. As such, it is different from the attribute PolicyConditionComposite.IsCNF, which controls how multiple PolicyConditionAtomic objects are treated in a (single) PolicyConditionComposite object. - - - - - This is a Boolean attribute that, if TRUE, signifies that this PolicyRule has one or more sub-rules. Sub-rules are used to enforce a hierarchical nesting of rules, so that parent rules may control the execution and other semantics of sub-rules that they contain. + + @@ -5374,6 +5396,20 @@ Notes: Not present in the ITU specs; the CIM defines a PolicyKeyword attribute, + + + Version of the policy as defined by the developer. + + + + + + his 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). + +This attribute controls the setting of how multiple condition clauses (as represented by multiple PolicyConditionComposite objects) are treated in the PolicyRule. As such, it is different from the attribute PolicyConditionComposite.IsCNF, which controls how multiple PolicyConditionAtomic objects are treated in a (single) PolicyConditionComposite object. + + + @@ -5446,6 +5482,14 @@ 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. + + + List of Event Types to be considered by this event. + + + + + @@ -5467,8 +5511,28 @@ Notes: Not present in the ITU specs; CIM 2.7 has a subset of these values. - - + + + 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 the sub-actions that they contain. + +Notes: Not present in the ITU or CIM specs. + + + + + + Tthe entity that is executing the policy. + + + + + + he set of entities that are affect-ed by the policy. + + + + + This is an enumerated integer that is set by a policy application to define the state of execution of this policyAction. Permited Values: @@ -5484,16 +5548,6 @@ Not present in the ITU or CIM specs. - - - 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 the sub-actions that they contain. - -Notes: Not present in the ITU or CIM specs. - - - - - @@ -5504,6 +5558,12 @@ Notes: default is “1” + + This attribute is a non-negative integer and represents the particular sequence in which this element is executed as part of the overall policy structure. +For example if a composite is part of another composite policy structure. + +Notes: default is “1” + @@ -5515,9 +5575,16 @@ Notes: Not present in the ITU or CIM specs. + + Specifies if the action is in confunctive normal form. + - + + + Execution Strategy that applies to the entire workflow. + + @@ -5525,6 +5592,9 @@ Notes: Not present in the ITU or CIM specs. + + Composite event has events + @@ -5628,18 +5698,21 @@ Not present in the ITU or CIM specs. Model Based Strongly On the TMF SID - - Items in green added - Rooted PolicyEvent - - -

- - - + + Some rules may not be created from a template + + + Kevin to verify atomic having a subaction boolean + + + Kevin to investigate execution Strategy and seqenced actions at rule level. + + + "Guard" Policies - serve as overarching conditions. + @@ -6469,7 +6542,7 @@ If it is set to True, it is the management and orchestration function responsibi - + Define address type. @@ -7405,7 +7478,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - @@ -7428,7 +7500,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - @@ -7727,4 +7798,26 @@ Per VNF, the affinity/anti-affinity rules defined using this information element + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg