X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docs%2Farchitecture%2Farchitecture.rst;h=7cfb276cf7bd92ceb4501d1b88fa384490d098b8;hb=97d434af5ea786bc21ba8d57a2e1e01696c064fa;hp=d59429a3665e407d307892907f33d66dc99438d1;hpb=6572514c4b2db8a13fdb7f255d6afc2e758b151b;p=so.git

diff --git a/docs/architecture/architecture.rst b/docs/architecture/architecture.rst
index d59429a366..7cfb276cf7 100644
--- a/docs/architecture/architecture.rst
+++ b/docs/architecture/architecture.rst
@@ -9,7 +9,7 @@ SO - Architecture
 SO Functional View
 ------------------
 
-.. image:: ../images/SO_Architecture_1.png
+.. image:: ../images/SO_Architecture_2.png
 
 SO Deployment View
 --------------------
@@ -110,9 +110,22 @@ SO Sub-Components
    * Create, Instantiate, Terminate and Delete VNF, including Granting, Subscription and Lifecycle Notifications
    * Tracking capability which VNFM instance has handled with which VNF instance
    * BPMN Building Block workflows and Java-based recipes for VNF LCM
+   * Conformance of SOL001 VNFD and SOL004 VNF package specifications
+   * Interfacing with the ETSI Catalog Manager (a.k.a. etsicatalog) for retrieving ETSI VNF descriptors and artifacts
    * VNFM Simulator for validating SO VNFM Adapter NBI and SBI for integration testing
-   * The SO ETSI CSIT Tests and running them, https://wiki.onap.org/display/DW/SO+ETSI+CSIT
-   * Testing the SO ETSI Alignment manually (Instantiate VNF using SVNFM), https://wiki.onap.org/pages/viewpage.action?pageId=68524128
+
+.. image:: ../images/SO-SOL003-Adapter-Architecture-1.png
+
+**SO ETSI NFVO**
+
+  Support ETSI NFVO functions which manages Network Service LCM
+   * Create, Instantiate, Terminate and Delete NS
+   * Decomposing an NS request into associated VNF request(s) and managing VNF LCM (Create, Instantiate, Terminate, Delete VNF) through SO VNFMN Adapter
+   * Leveraging SOL005 for its NBI and SOl003 for its SBI
+   * Conformance of SOL001 NSD and SOL007 NS package specifications
+   * Interfacing with the ETSI Catalog Manager (a.k.a. etsicatalog) for retrieving ETSI NS descriptors and artifacts
+
+.. image:: ../images/SO-NFVO-Architecture-1.png
 
 Third Party and Open Source
 ---------------------------