summaryrefslogtreecommitdiffstats
path: root/docs/labs
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-02-23 23:12:24 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-02-24 23:40:17 +0000
commitff9708c9ce539b2d742db00ff2ac6e92e4ee3681 (patch)
tree63e82faa04f6ded59b869838240b803718418445 /docs/labs
parent410a311af5aad91dba236defae5f54814814a218 (diff)
Removed index files from all doc directories, rearranged headings, fixed broken links and doc formatting issues, created platform overview file, edited content.
Change-Id: I08113c732dc6bc5967fe263aecfa8734e4c98ee5 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> (cherry picked from commit c8f8facec439fbc4fced0854845070caf9db38a5)
Diffstat (limited to 'docs/labs')
-rw-r--r--docs/labs/Dell.rst4
-rw-r--r--docs/labs/ZTE.rst5
-rw-r--r--docs/labs/huawei-us-lab/huawei-us-lab.rst9
-rw-r--r--docs/labs/huawei-us-lab/index.rst19
-rw-r--r--docs/labs/spirent.rst2
5 files changed, 6 insertions, 33 deletions
diff --git a/docs/labs/Dell.rst b/docs/labs/Dell.rst
index a427edbd..da934795 100644
--- a/docs/labs/Dell.rst
+++ b/docs/labs/Dell.rst
@@ -355,9 +355,9 @@ POD2 JumpServer
User: opnfv
Passwd: d3ll1234
-=======
+==================
Dell OPNFV Testlab
-==================================================
+==================
Overview
------------------
diff --git a/docs/labs/ZTE.rst b/docs/labs/ZTE.rst
index 809baf27..b6b04572 100644
--- a/docs/labs/ZTE.rst
+++ b/docs/labs/ZTE.rst
@@ -173,11 +173,6 @@ The Jump servers in the Testlab are pre-provisioned with the following software:
Networks
----------
-**POD-Fuel Diagram**
-
-.. image:: images/ZTE_POD.jpg
- :alt: ZTE POD Networking
-
**Subnet allocations**
+-------------------+----------------+-------------------+---------------+----------+
diff --git a/docs/labs/huawei-us-lab/huawei-us-lab.rst b/docs/labs/huawei-us-lab/huawei-us-lab.rst
index 48b34ba7..13bb8e56 100644
--- a/docs/labs/huawei-us-lab/huawei-us-lab.rst
+++ b/docs/labs/huawei-us-lab/huawei-us-lab.rst
@@ -1,5 +1,6 @@
-Introduction
-============
+===================================================
+Introduction of Huawei's lab located in Santa Clara
+===================================================
Huawei's lab located in Santa Clara, CA will provide 1 full POD for baremetal deployment environment, 2
standalone server for virtual deployment, and 1 server with 6 executors for project's building and gate-testing.
@@ -53,10 +54,6 @@ Below you'll find a topological view of the hosting set-up:
Figure 2: Full Pod network configuration
-
-How to use our resources?
-=========================
-
Build Resource
^^^^^^^^^^^^^^
diff --git a/docs/labs/huawei-us-lab/index.rst b/docs/labs/huawei-us-lab/index.rst
deleted file mode 100644
index 34549b95..00000000
--- a/docs/labs/huawei-us-lab/index.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-Introduction of Huawei's lab located in Santa Clara
-===================================================
-
-Contents:
-
-.. toctree::
- :numbered:
- :maxdepth: 8
-
- documentation-example.rst
-
-Indices and tables
-==================
-
-* :ref:`search`
-
-Revision: _sha1_
-
-Build date: |today|
diff --git a/docs/labs/spirent.rst b/docs/labs/spirent.rst
index d5804ac6..b0ba0ba9 100644
--- a/docs/labs/spirent.rst
+++ b/docs/labs/spirent.rst
@@ -36,4 +36,4 @@ For example:
* SSL and IPSec VPN will typically be leveraged to connect networks across the untrusted Internet or other third party networks.
* Stand-alone DUT servers using STCv and AVv traffic generators could easily scale to hundreds of servers as needed.
-.. image:: iamges/spirent_vptc-public-drawing.png
+.. image:: images/spirent_vptc-public-drawing.png