X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Ftesting%2Fuser%2Fuserguide%2F03-architecture.rst;h=622002ee4ce067969c9b58cc542c090852d367ff;hb=3248682fcc789f95ff8246a8d1f208a6a3abd46d;hp=03bf00f588db8a510f0da0d20f42400703185285;hpb=270d6092c809e8de039a08efd8c108f865cf860e;p=yardstick.git

diff --git a/docs/testing/user/userguide/03-architecture.rst b/docs/testing/user/userguide/03-architecture.rst
index 03bf00f58..622002ee4 100755
--- a/docs/testing/user/userguide/03-architecture.rst
+++ b/docs/testing/user/userguide/03-architecture.rst
@@ -9,8 +9,9 @@ Architecture
 
 Abstract
 ========
-This chapter describes the yardstick framework software architecture. we will introduce it from Use-Case View,
-Logical View, Process View and Deployment View. More technical details will be introduced in this chapter.
+This chapter describes the yardstick framework software architecture. We will
+introduce it from Use-Case View, Logical View, Process View and Deployment
+View. More technical details will be introduced in this chapter.
 
 Overview
 ========
@@ -23,8 +24,8 @@ files. Yardstick is inspired by Rally. Yardstick is intended to run on a
 computer with access and credentials to a cloud. The test case is described
 in a configuration file given as an argument.
 
-How it works: the benchmark task configuration file is parsed and converted into
-an internal model. The context part of the model is converted into a Heat
+How it works: the benchmark task configuration file is parsed and converted
+into an internal model. The context part of the model is converted into a Heat
 template and deployed into a stack. Each scenario is run using a runner, either
 serially or in parallel. Each runner runs in its own subprocess executing
 commands in a VM using SSH. The output of each scenario is written as json
@@ -43,13 +44,15 @@ names, image names, affinity rules and network configurations. A context is
 converted into a simplified Heat template, which is used to deploy onto the
 Openstack environment.
 
-**Data** - Output produced by running a benchmark, written to a file in json format
+**Data** - Output produced by running a benchmark, written to a file in json
+format
 
 **Runner** - Logic that determines how a test scenario is run and reported, for
 example the number of test iterations, input value stepping and test duration.
 Predefined runner types exist for re-usage, see `Runner types`_.
 
-**Scenario** - Type/class of measurement for example Ping, Pktgen, (Iperf, LmBench, ...)
+**Scenario** - Type/class of measurement for example Ping, Pktgen, (Iperf,
+LmBench, ...)
 
 **SLA** - Relates to what result boundary a test case must meet to pass. For
 example a latency limit, amount or ratio of lost packets and so on. Action
@@ -128,8 +131,8 @@ Snippet of an Iteration runner configuration:
 Use-Case View
 =============
 Yardstick Use-Case View shows two kinds of users. One is the Tester who will
-do testing in cloud, the other is the User who is more concerned with test result
-and result analyses.
+do testing in cloud, the other is the User who is more concerned with test
+result and result analyses.
 
 For testers, they will run a single test case or test case suite to verify
 infrastructure compliance or bencnmark their own infrastructure performance.
@@ -187,9 +190,9 @@ run test measurement scripts through the ssh tunnel. After all TestScenaio
 is finished, TaskCommands will undeploy the heat stack. Then the whole test is
 finished.
 
-.. image:: images/Logical_view.png
+.. image:: images/Yardstick_framework_architecture_in_D.png
    :width: 800px
-   :alt: Yardstick Logical View
+   :alt: Yardstick framework architecture in Danube
 
 Process View (Test execution flow)
 ==================================
@@ -236,7 +239,7 @@ Yardstick Directory structure
 
 **yardstick/** - Yardstick main directory.
 
-*ci/* - Used for continuous integration of Yardstick at different PODs and
+*tests/ci/* - Used for continuous integration of Yardstick at different PODs and
         with support for different installers.
 
 *docs/* - All documentation is stored here, such as configuration guides,
@@ -254,7 +257,8 @@ Yardstick Directory structure
 
 *tools/* - Currently contains tools to build image for VMs which are deployed
            by Heat. Currently contains how to build the yardstick-trusty-server
-           image with the different tools that are needed from within the image.
+           image with the different tools that are needed from within the
+           image.
 
 *plugin/* - Plug-in configuration files are stored here.