From 1a7cea91cbf2b1086f9de8d96b8e8d145bf87fba Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 1 Mar 2019 15:09:05 -0600 Subject: Updates to Vnf Fixed allotted resource diagram, which had a number of broken classes and associations. Also started draft work on configuration concept. Issue-ID: MODELING-104 Change-Id: Ia3cda6e19fdb5e2ae4fced3c36875dc2f3534f80 Signed-off-by: Kevin Scaggs --- ONAP Information Model/Vnf.notation | 679 +++++++++++++++++++++--------------- ONAP Information Model/Vnf.uml | 66 +++- 2 files changed, 445 insertions(+), 300 deletions(-) diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation index 32edc05..70475db 100644 --- a/ONAP Information Model/Vnf.notation +++ b/ONAP Information Model/Vnf.notation @@ -8573,32 +8573,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8730,32 +8704,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8764,37 +8712,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8886,32 +8803,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8925,7 +8816,7 @@ - + @@ -8962,7 +8853,7 @@ - + @@ -8993,7 +8884,7 @@ - + @@ -9003,22 +8894,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -9029,20 +9115,6 @@ - - -

- - - - - - - - - - - @@ -9091,110 +9163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9205,17 +9173,6 @@ - - - - - - - - - - - @@ -9288,27 +9245,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -9319,17 +9255,6 @@ - - - - - - - - - - - @@ -9371,5 +9296,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml index 52cba72..c08942f 100644 --- a/ONAP Information Model/Vnf.uml +++ b/ONAP Information Model/Vnf.uml @@ -336,21 +336,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the - - -

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

@@ -552,6 +537,49 @@ This will probably need to move to common Attributes in beige - added or changed + + Orange classes are either 'temp' classes, or need to be moved to a different model + + + +

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

+ + + + + + + + + + + + + + + + + + + + + + @@ -2309,6 +2337,7 @@ This could include the number of CPU cores on this logical node, a memory config + @@ -3413,8 +3442,6 @@ The attached VDUs shall connect to the same internal VLD. - - @@ -3727,4 +3754,9 @@ The attached VDUs shall connect to the same internal VLD. + + + + + -- cgit 1.2.3-korg