Merge "Updated VFW/VDNS Flows"

1 files changed, 25 insertions, 50 deletions

diff --git a/docs/use-cases/vfw.rst b/docs/use-cases/vfw.rst
index bc216502d..7c230ca0d 100644
--- a/docs/use-cases/vfw.rst
+++ b/docs/use-cases/vfw.rst
@@ -15,23 +15,15 @@ Onboarding
 .. uml::
 
    @startuml
-   title vFW and vDNS VNF Onboarding (R1)\nvFW and vDNS use the same flows but they are separate VNFs/Services
+   title vFW/vFWCL and vDNS VNF Onboarding (R1)\nVFW/vFWCL and vDNS use the same flows but they are separate VNFs/Services
    ONAP_User -> SDC : vFW_vDNS resource onboarding  (HEAT)
-   note right : vFW ( vpg, vfw, vsn)\nvDNS (vpg, vlb,vdns) + DNSScaling (vdns)\nCLAMP not shown
+   note right : vFWCL (vpg & vfw,vsn)\nvFW (vpg, vfw, vsn)\nvDNS (vpg, vlb,vdns) + DNSScaling (vdns)\
    ONAP_User -> SDC : vFW_vDNS service onboarding
    ONAP_User -> SDC : vFW_vDNS distribution
    |||
-   ONAP_User -> SDC : vFW2_vDNS2 resource onboarding (TOSCA)
-   ONAP_User -> SDC : vFW2_vDNS2 service onboarding
-   ONAP_User -> SDC : vFW2_vDNS2 distribution
-   |||
-   SDC -> SO : artifact distribution
-   SDC -> AAI : artifact distribution
-   SDC -> APPC : artifact distribution
-   SDC -> SDNC : VNF preload data (vFW_vDNS and vFW2_vDNS2) ?
-   SDC -> DCAE : Telemetry to Collect and CLAMP triggers
-   SDC -> Policy : Control Loop Policies (see CLAMP flow)
-   note left: policy may cut through to Policy GUI
+   SDC -> SO : artifact distribution\nNOTIFY,DOWNLOAD,DEPLOY_OK
+   SDC -> AAI : artifact distribution\nNOTIFY,DOWNLOAD,DEPLOY_OK
+   SDC -> SDNC : artifact distribution\nNOTIFY,DOWNLOAD,DEPLOY_OK
    @enduml
 
 Instantiation
@@ -39,22 +31,30 @@ Instantiation
 
 .. uml::
 
-   @startuml
+ @startuml
    title vFW vDNS Instantiation (R1)\nvFW and vDNS use the same flows but they are separate VNFs/Services
-   participant UseCaseUI
    participant ONAP_User
+   participant Robot
    Participant SDC
    Participant VID
    Participant SO
-   UseCaseUI -> AAI : populate cloud inventory
+   ONAP_User -> AAI : populate cloud inventory
+   note left of AAI:  manual via curl or POSTMAN
+   |||
    ONAP_User -> VID : vFW_vDNS deployment
    VID -> SDC : Lookup VNF artifacts
    VID -> AAI : Lookup cloud locations, subscriber
-   VID -> SO : vFW_vDNS instantiation\n(base modules)
+   VID -> SO : vFW_vDNS Service \nInstantiation\n(base modules)
+   SO -> AAI : inventory update
+   VID -> SO : vFW_vDNS VNF Instantiation\n(base modules)
+   note left of AAI : VFWCL is two VNFs in one service\nso VNF instantiate occurs twice
    SO -> AAI : inventory update
-   SO -> SDNC : Generic VNF API\n(reserved)
-   SO -> Multi_VIM : vFW_vDNS Heat template + ENV file
-   Multi_VIM -> CloudAPI : vFW_vDNS Heat template + ENV file or\n ARM Tempalte + Parameters + LinuxExtensionScripts
+   ONAP_User -> SDNC : VNF API Preload VNF/VF data
+   VID -> SO : vFW_vDNS VF Instantiation\n(base modules)
+   SO -> AAI : inventory update
+   SO -> SDNC : Generic VNF API\n(assign)
+   SO -> Multi_VIM : vFW_vDNS Heat template, \nENV file, preload parameters
+   Multi_VIM -> CloudAPI : vFW_vDNS Heat template,\nENV file, preload parameters or
    CloudAPI -> Hypervisor : vFW_vDNS Infrastructure instantiation
    Hypervisor -> vFW_vDNS : Nova/Neutron Instantiation
    Hypervisor -> CloudAPI : complete
@@ -62,38 +62,13 @@ Instantiation
    Multi_VIM -> SO : complete
    note right : SO may poll for completion
    SO -> SDNC:  Generic VNF API\n(activated)
-   note right : on failure from Openstack SO issues rollback to SDNC
+   note left : on failure from Openstack SO issues rollback to SDNC
    SDNC -> AAI : L3 Network resource update
    SO -> VID : complete
-   note right : VID will poll for competion
-   SO -> Multi_VIM : Replaces Robot HEATBridge to pull data from cloud
-   Multi_VIM -> CloudAPI : VM data from cloud\n(public cloud will be less than if owner operated)
-   Multi_VIM -> SO : cloud data
-   SO -> AAI : Update with cloud data
+   note right : VID will poll for completion
+   ONAP_User -> Robot : run Heat Bridge
+   Robot -> CloudAPI  :  retrieve cloud data 
+   Robot -> AAI :  Update with cloud data
    |||
-   ONAP_User -> VID : vFW2_vDNS2 deployment (TOCA based)
-   VID -> SDC : Lookup VNF artifacts
-   VID -> AAI : Lookup cloud locations, subscriber
-   VID -> SO : vFW2_vDNS2 instantiation\n(base modules)
-   SO -> AAI : inventory update
-   SO -> SDNC : Generic VNF API\n(reserved)
-   SO -> Multi_VIM : vFW2_vDNS2 TOSCA template + ENV file
-   Multi_VIM -> CloudAPI : vFW_vDNS TOSCA template + ENV file or\n ARM Template + Parameters + LinuxExtensionScripts
-   CloudAPI -> Hypervisor : vFW2_vDNS2 Infrastructure instantiation
-   Hypervisor -> vFW2_vDNS2 : Nova/Neutron Instantiation
-   Hypervisor -> CloudAPI : complete
-   CloudAPI -> Multi_VIM : complete
-   Multi_VIM -> SO : complete
-   note right : SO may poll for completion
-   SO -> SDNC:  Generic VNF API\n(activated)
-   note right : on failure from Openstack SO issues rollback to SDNC
-   SDNC -> AAI : L3 Network resource update
-   SO -> VID : complete
-   note right : VID will poll for competion
-   SO -> Multi_VIM : Replaces Robot HEATBridge to pull data from cloud
-   Multi_VIM -> CloudAPI : VM data from cloud\n(public cloud will be less than if owner operated)
-   Multi_VIM -> SO : cloud data
-   SO -> AAI : Update with cloud data
    @enduml
 
-