Merge "VoltE fix" into release-1.1.0

diff --git a/docs/architecture.rst b/docs/architecture.rst
index 8daa0d3..232bbf0 100644 (file)
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
+============
 Architecture
 ============
 
@@ -14,14 +15,45 @@ Architecture
    
    * This note must be removed after content has been added.
 
+SDC As Part of ONAP
+===================
+
+.. image:: images/SDC_In_ONAP.png
+
+
+High Level Architecture
+=======================
+
+The following diagram shows the high-level relationship between the system components:
+
+.. image:: images/High_Level_Architecture_SDC.png
+
+The SDC architecture uses the Jetty server as an application server.
+
+- The **Jetty front end**:
+   - supplies the static content of web pages, and all resources that required by the GUI
+   - serves as a proxy for the REST API requests coming from the GUI
+   
+  Every request originating from the GUI is passed to the Jetty front-end server before it is executed.
+
+- The **Jetty back end** containes all the logic for the SDC.
+
+SDC uses two storage components: Elastic Search(ES) and Cassandra
+
+- **Elastic Search** is used to index the auditing data received from different operations in the SDC.
+
+  This information can then be analyzed with Kibana. The **Kibana server** enables statistical analysis of the operations done, according to the business logic.
+  
+- **Cassandra** is used to store auditing data, artifacts and data model objects.
+
 
 Capabilities
-------------
+============
 
 
 Usage Scenarios
----------------
+===============
 
 
 Interactions
-------------
+============

diff --git a/docs/humaninterfaces.rst b/docs/humaninterfaces.rst
index 4292846..44641e2 100644 (file)
--- a/docs/humaninterfaces.rst
+++ b/docs/humaninterfaces.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
+================
 Human Interfaces
 ================
 
@@ -13,5 +14,14 @@ Human Interfaces
    
    * This note must be removed after content has been added.
 
+User Guides In ONAP Confluence
+==============================
+
+Those are links to the SDC user guides found in ONAP Confluence:
+
+- `Resource Onboarding <https://wiki.onap.org/display/DW/Resource+Onboarding>`_
+- `Service Design <https://wiki.onap.org/display/DW/Service+Design>`_
+- `VF Creation and Testing <https://wiki.onap.org/display/DW/VF+Creation+and+Testing>`_
+- `Governance Approval and Service Distribution <https://wiki.onap.org/display/DW/Governance+Approval+and+Service+Distribution>`_
 
 

diff --git a/docs/images/High_Level_Architecture_SDC.png b/docs/images/High_Level_Architecture_SDC.png
new file mode 100644 (file)
index 0000000..57a564b
Binary files /dev/null and b/docs/images/High_Level_Architecture_SDC.png differ

diff --git a/docs/images/SDC_In_ONAP.png b/docs/images/SDC_In_ONAP.png
new file mode 100644 (file)
index 0000000..ddca064
Binary files /dev/null and b/docs/images/SDC_In_ONAP.png differ

diff --git a/docs/installation.rst b/docs/installation.rst
index be64a63..ab5d046 100644 (file)
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
+============
 Installation
 ============
 
@@ -12,9 +13,18 @@ Installation
 
    * This note must be removed after content has been added.
 
+Instalation Guides
+==================
+
+Those are links to the SDC installation guides found in ONAP Confluence:
+
+- `Deploying SDC on a Linux VM for Development <https://wiki.onap.org/display/DW/Deploying+SDC+on+a+Linux+VM+for+Development>`_
+- `Using Vagrant-Onap for local deployment of SDC project <https://wiki.onap.org/pages/viewpage.action?pageId=15999821>`_
+
+
 Environment
------------
+===========
 
 
 Steps
------
+=====

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
index c4323c2..53482a7 100644 (file)
--- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
@@ -6,7 +6,7 @@ cwd "#{tests_base}"
 code <<-EOH
    cd "#{tests_base}"
    jar_file=`ls test-apis*-jar-with-dependencies.jar`
-   ./startTest.sh $jar_file #{ci_test_suite} > #{tests_base}/target/startTest.out 2>&1
+   ./startTest.sh $jar_file #{ci_test_suite} > #{tests_base}/target/startTest.log 2>&1
    echo "return code from startTest.sh = [$?]"
 EOH
 timeout 72000