Merge "Add tox execute pre-condition"

diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst
index dc7ef09..ca01579 100644 (file)
--- a/docs/platform/architecture.rst
+++ b/docs/platform/architecture.rst
@@ -4,22 +4,22 @@
 
 VF-C Architecture
 -----------------
-Following is the VF-C architecture.
+VF-C High Level Architecture.
 
 
 |image0|
 
 .. |image0| image:: vfc-arc.png
    :width: 5.97047in
-   :height: 5.63208in
+   :height: 4.63208in
    
-   
-VF-C as one controller in ONAP includes two components NFV-O and GVNFM. 
+As you can see in this picture, VF-C has many dependencies with other projects, such as SO, Policy, A&AI, SDC, DCAE, Multi-cloud and so on.
+
+* NFVO provides north bound interface to SO to take part in fulfilling the orchestration and operation of end2end service.And provides standard south bound interface to VNFMs. 
 
-For NFV-O, it provides north bound interface to SO to take part in fulfilling the orchestration and operation of end2end service.and provides standard south bound interface to VNFMs. 
+* GVNFM provides LCM for VNFs which do not require a vendor VNFM and works with NFV-O component to take part in fulfilling the LCM of NS.
 
-For GVNFM, it provides LCM for VNFs which do not require a vendor VNFM and works with NFV-O component to take part in fulfilling the LCM of NS.
+* VF-C provides VNFM driver interfaces, vendor can implement these integrates to integrate with VF-C. Now, VF-C has integrated with three vendor VNFM, including ZTE, Huawe, Nokia. 
 
-In addition, VF-C provides interface to Policy and works with DCAE for Close Loop Automation.
+* In addition, VF-C also provides interface to Policy and works with DCAE for Close Loop Automation.
    
-As you can see in this picture,VF-C has many dependencies with other projects,such as SO,Policy,A&AI,SDC,DCAE,Multi-cloud and so on.
\ No newline at end of file

diff --git a/docs/platform/index.rst b/docs/platform/index.rst
index 12fa0be..364a4c9 100644 (file)
--- a/docs/platform/index.rst
+++ b/docs/platform/index.rst
@@ -15,6 +15,30 @@ As part of the integration between OpenECOMP and OPEN-O, VF-C leverages ETSI NFV
 * support microservice architecture and model driven resource orchestration and management
 
 
+|image0|
+
+.. |image0| image:: vfc-component.png
+   :width: 3.97047in
+   :height: 2.63208in
+   
+VF-C as one controller in ONAP includes two components NFV-O and GVNFM. 
+
+* NFVO component
+
+       * compliant with ETSI NFV MANO architecture and information model,
+       * providing resource orchestration and full life cycle management and FCAPS for NS,
+       * providing standard south bound interface to VNFMs,
+       * providing north bound interface to SO, to take part in fulfilling the orchestraion and operation of end2end service,
+       * providing interface and work with DCAE and Policy for Close Loop Automation.
+
+* GVNFM component
+
+       * compliant with ETSI NFV MANO architecture and information model
+       * providing full life cycle management and FCAPS for VNFs which do not require a vendor VNFM,
+       * providing interface and work with NFV-O component, to take part in fulfiiling the LCM and FCAPS management of NS,
+       * providing interface and work with DCAE and Policy for Close Loop Automation.
+
+
 .. toctree::
    :maxdepth: 1
 

diff --git a/docs/platform/vfc-component.png b/docs/platform/vfc-component.png
new file mode 100644 (file)
index 0000000..8fbb83c
Binary files /dev/null and b/docs/platform/vfc-component.png differ