update the huawei's lab

Change-Id: I96c046b298bd915716b67790515ad9a555e6f62c
Signed-off-by: Wutianwei <wutianwei1@huawei.com>

11 files changed, 241 insertions, 108 deletions

diff --git a/docs/labs/huawei-us-lab/huawei-lab-pod.png b/docs/labs/huawei-us-lab/huawei-lab-pod.png
new file mode 100644
index 00000000..cfb51c9c
--- /dev/null
+++ b/docs/labs/huawei-us-lab/huawei-lab-pod.png
diff --git a/docs/labs/huawei-us-lab/huawei-lab-topology.png b/docs/labs/huawei-us-lab/huawei-lab-topology.png
new file mode 100644
index 00000000..681a10c5
--- /dev/null
+++ b/docs/labs/huawei-us-lab/huawei-lab-topology.png
diff --git a/docs/labs/huawei-us-lab/huawei-lab-virtual.png b/docs/labs/huawei-us-lab/huawei-lab-virtual.png
new file mode 100644
index 00000000..46c818d4
--- /dev/null
+++ b/docs/labs/huawei-us-lab/huawei-lab-virtual.png
diff --git a/docs/labs/huawei-us-lab/huawei-us-lab.png b/docs/labs/huawei-us-lab/huawei-us-lab.png
deleted file mode 100644
index 26bd5092..00000000
--- a/docs/labs/huawei-us-lab/huawei-us-lab.png
+++ /dev/null
diff --git a/docs/labs/huawei-us-lab/huawei-us-lab.rst b/docs/labs/huawei-us-lab/huawei-us-lab.rst
deleted file mode 100644
index fe7b0d31..00000000
--- a/docs/labs/huawei-us-lab/huawei-us-lab.rst
+++ /dev/null
@@ -1,107 +0,0 @@
-===================================================
-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.  All the resources have been attached to Jenkins master, you can view the
-slaves below in https://build.opnfv.org/ci/:
-
-* huawei-us-build-1
-* huawei-us-deploy-vm-1
-* huawei-us-deploy-vm-2
-* huawei-us-deploy-bare-1
-
-Overall Description
-===================
-
-Hardware
---------
-
-* 9 Huawei RH2285H V2 Rack Servers (128 GB RAM , 4.7 TB SATA SSDs, two Intel Xeon E5-2400 v2 series
-  processors)
-* 1 Huawei S9300 10G switch for storage, management and public traffic - 2x10GE to
-  each server.
-* 1 Huawei S5300 1G switch for installing and Lights+out management traffic - 2x1GE to each server.
-* 1 VPN concentrator for remote access and management.
-* 1 Huawei firewall and router for public network secure access.
-
-
-Hosting Topology
-----------------
-.. image:: ./huawei-us-lab.png
-  :height: 1000
-  :width: 900
-  :alt: OPNFV
-  :align: left
-
-|
-|
-
-Figure 1: Huawei US lab OPNFV hosting environment overview
-
-
-POD Network
------------
-Below you'll find a topological view of the hosting set-up:
-
-.. image:: ./pod-network.png
-  :height: 950
-  :width: 900
-  :alt: OPNFV
-  :align: left
-
-|
-|
-
-Figure 2: Full Pod network configuration
-
-Build Resource
-^^^^^^^^^^^^^^
-
-You can see the slaves named "huawei-us-build-[digit]" or "huawei-build-[digit]" in
-https://build.opnfv.org/ci/
-
-These resources are dedicated to CI. If you want to use Huawei resource to run some automated jobs,
-you do not need to apply for the credentials, just specify the node as "huawei-build" . For other
-purposes, please contact: [[weidong.shao@huawei.com]]
-
-
-Deployment Resource
-^^^^^^^^^^^^^^^^^^^
-
-You can see the slaves named "huawei-us-deploy-vm/bare-[digit]" or "huawei-deploy-vm/bare-[digit]"
-in https://build.opnfv.org/ci/
-
-We have two types of deployment resources, virtual deployment environment and baremetal deployment
-environment.  Both can be deployed by any types of installer, and provide the same testbed for
-testing and the same infrastructure for VNF.
-
-You can access our deployment resources by applying for the VPN credentials, please see the section
-below for details.
-
-
-Access
-======
-
-This environment is free to use by any OPNFV contributor or committer for the purpose of OPNFV
-approved activities, you just need to obtain VPN credentials to access.
-
-Access to this environment can be granted by sending a e-mail to:
-  * [[weidong.shao@huawei.com]]
-  * [[opnfv-helpdesk@rt.linuxfoundation.org]]
-
-Following information should be provided in the request:
-  * subject: opnfv_huawei_access
-  * Full name
-  * e-mail
-  * Phone
-  * Organization
-  * OPNFV Contributor/Committer name :
-  * OPNFV Project(s) Association:
-  * LF ID:
-  * Recommended by:
-  * PGP public key (preferably registered with a PGP PKI server)
-  * SSH public key
-
-Granting access normally takes 3-5 business days.
diff --git a/docs/labs/huawei-us-lab/index.rst b/docs/labs/huawei-us-lab/index.rst
new file mode 100644
index 00000000..e2a03ab2
--- /dev/null
+++ b/docs/labs/huawei-us-lab/index.rst
@@ -0,0 +1,16 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. Top level of Pharos templates and configuration files
+
+******************
+Huawei's OPNFV Lab
+******************
+
+
+.. toctree::
+   :maxdepth: 2
+
+   ./lab_specification.rst
+   ./pod_specification.rst
diff --git a/docs/labs/huawei-us-lab/lab_specification.rst b/docs/labs/huawei-us-lab/lab_specification.rst
new file mode 100644
index 00000000..99d2196f
--- /dev/null
+++ b/docs/labs/huawei-us-lab/lab_specification.rst
@@ -0,0 +1,100 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+**************************
+Huawei's Lab Specification
+**************************
+
+Introduction
+------------
+
+Huawei's lab providing 5 PODs for baremetal deployment, 4 standalone servers
+for virtual deployment. All the resources have been attached to jenkins master,
+you can view the slaves below in jenkins master. Current POD assignments and
+individual POD details are listed below.
+
+Lab Resources & Assignments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
++-----------------+-------------+-----------+--------+
+| Resource        | Project(s)  | POD Role  | Status |
++-----------------+-------------+-----------+--------+
+| huawei-pod1     | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-pod2     | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-pod3     | yardstick   | Dev/Test  | Active |
++-----------------+-------------+-----------+--------+
+| huawei-pod4     | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-pod5     | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-virtual1 | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-virtual2 | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-virtual3 | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+| huawei-virtual4 | compass4nfv | CI Stable | Active |
++-----------------+-------------+-----------+--------+
+
+Acceptable Usage Policy
+-----------------------
+
+All of these resources above are used for OPNFV CI, if there is any requirement by OPNFV
+contributor or committer for the purpose of OPNFV development, please apply to us for permission.
+
+
+Remote Access Infrastructure
+----------------------------
+
+Huawei provides VPN(OpenVPN) to connect the lab.
+
+Remote Access Procedure
+-----------------------
+
+This environment is free to use by any OPNFV contributor or committer for the
+purpose of OPNFV approved activities, you just need to obtain VPN credentials to access.
+
+Access to this environment can be granted by sending a e-mail to:
+  * chigang@huawei.com
+  * meimei@huawei.com
+
+Following information should be provided in the request:
+
+  * subject: opnfv_huawei_access
+  * Full name
+  * e-mail
+  * Phone
+  * Organization
+  * OPNFV Contributor/Committer name :
+  * OPNFV Project(s) Association:
+  * LF ID:
+  * Recommended by:
+  * PGP public key (preferably registered with a PGP PKI server)
+  * SSH public key
+
+Granting access normally takes 3-5 business days.
+
+Detailed access descriptions will be provided with your access grant e-mail.
+
+Lab Documentation
+-----------------
+
+
+Lab Topology
+------------
+
+Below you'll find a topological view of the hosting set-up,you can get more
+detailed information from the  individual POD.
+
+.. image:: ./huawei-lab-topology.png
+  :height: 566
+  :width: 1061
+  :alt: OPNFV
+  :align: left
+
+|
+|
+
+Figure 1: Huawei lab OPNFV hosting environment overview
diff --git a/docs/labs/huawei-us-lab/net.png b/docs/labs/huawei-us-lab/net.png
new file mode 100644
index 00000000..9a12c820
--- /dev/null
+++ b/docs/labs/huawei-us-lab/net.png
diff --git a/docs/labs/huawei-us-lab/pod-network.png b/docs/labs/huawei-us-lab/pod-network.png
deleted file mode 100644
index 8be1cf33..00000000
--- a/docs/labs/huawei-us-lab/pod-network.png
+++ /dev/null
diff --git a/docs/labs/huawei-us-lab/pod_specification.rst b/docs/labs/huawei-us-lab/pod_specification.rst
new file mode 100644
index 00000000..53565158
--- /dev/null
+++ b/docs/labs/huawei-us-lab/pod_specification.rst
@@ -0,0 +1,124 @@
+=========================
+Huawei PODs Specification
+=========================
+
+NOTE: Illustrated by the example of huawei-pod1&huawei-virtual1.
+
+huawei-pod1
+===========
+
+Introduction
+------------
+
+This is a bare metal deployment pod deployed by compass installer
+
+Hardware
+^^^^^^^^
+
+* the pod1 consist of 6 Rack servers, the following is detail
+
++------------+-----------------------+---------+--------+-----------------------------+
+| Hostname   | CPU                   | Storage | Memory | ipmi Mac &ip                |
++------------+-----------------------+---------+--------+-----------------------------+
+| jumpserver | Intel(R) Xeon(R) CPU  |  1.8TB  |  31G   |                             |
+|            | X5650  @ 2.67GHz      |         |        |                             |
++------------+-----------------------+---------+--------+-----------------------------+
+| Host1      | Intel(R) Xeon(R) CPU  |  4.2TB  |  188G  | eth3:Mac F8:4A:BF:55:A2:8E  |
+| controller | E5-2690 @ 2.90GHz     |         |        | ip 172.16.130.26            |
++------------+-----------------------+---------+--------+-----------------------------+
+| Host2      | Intel(R) Xeon(R) CPU  |  6TB    |  188G  | eth3:Mac D8:49:0B:DA:5A:B8  |
+| controller | E5-2670@ 2.60GHz      |         |        | ip 172.16.130.27            |
++------------+-----------------------+---------+--------+-----------------------------+
+| Host3      | Intel(R) Xeon(R) CPU  |  8.4TB  |  188G  | eth3:Mac 78:D7:52:A0:B1:9D  |
+| controller | E5-2670@ 2.60GHz      |         |        | ip 172.16.130.29            |
++------------+-----------------------+---------+--------+-----------------------------+
+| Host4      | Intel(R) Xeon(R) CPU  |  7.2TB  |  188G  | eth3:Mac D8:49:0B:DA:5B:5E  |
+| compute    | E5-2670@ 2.60GHz      |         |        | ip 172.16.130.30            |
++------------+-----------------------+---------+--------+-----------------------------+
+| Host5      | Intel(R) Xeon(R) CPU  |  4.8TB  |  188G  | eth3:Mac D8:49:0B:DA:56:86  |
+| compute    | E5-2670@ 2.60GHz      |         |        | ip 172.16.130.31            |
++------------+-----------------------+---------+--------+-----------------------------+
+
+
+* 1 Huawei S9300 10G switch for storage, management and public traffic - 2x10GE to
+  each server.
+* 1 Huawei S5300 1G switch for installing and Lights+out management traffic - 2x1GE to
+  each server.
+* 1 VPN concentrator for remote access and management.
+* 1 Huawei firewall and router for public network secure access.
+
+
+huawei-pod1 Topology
+--------------------
+
+.. image:: ./huawei-lab-pod.png
+  :height: 950
+  :width: 900
+  :alt: OPNFV
+  :align: left
+
+|
+|
+
+Figure 1: Huawei lab pod1 topology
+
+
+
+huawei-pod1 Network
+-------------------
+Below you'll find a topological view of the huawei-Pod1 set-up:
+
+
+.. image:: ./net.png
+  :height: 764
+  :width: 633
+  :alt: OPNFV
+  :align: left
+
+|
+|
+
+Figure 2: Full Pod network configuration
+
+
+
+huawei-virtual1
+===============
+
+Introduction
+------------
+
+This is a virtual deployment POD deployed  by compass installer
+
+Hardware
+^^^^^^^^
+virtual pod consist of one standalone server
+
++-----------+----------------------+
+| name      | huawei-virtual1      |
++-----------+----------------------+
+| CPU       | Intel(R) Xeon(R) CPU |
+|           | E5-2680 v3 @ 2.50GHz |
++-----------+----------------------+
+| Memory    | 251G                 |
++-----------+----------------------+
+| Storage   | 4TB                  |
++-----------+----------------------+
+| IP        | 192.168.107.2        |
++-----------+----------------------+
+
+Network
+-------
+Below you'll find a topological view of the huawei-virtual1 Pod set-up:
+
+.. image:: ./huawei-lab-virtual.png
+  :height: 950
+  :width: 900
+  :alt: OPNFV
+  :align: left
+
+|
+|
+
+Figure 3: virtual deployment pod network configuration
+
diff --git a/docs/labs/index.rst b/docs/labs/index.rst
index db07640b..b22ad5de 100755
--- a/docs/labs/index.rst
+++ b/docs/labs/index.rst
@@ -13,7 +13,7 @@ PHAROS Community Labs
 
    ./Dell.rst
    ./ericsson/index.rst
-   ./huawei-us-lab/huawei-us-lab.rst
+   ./huawei-us-lab/index.rst
    ./ool/index.rst
    ./orange-paris-lab/index.rst
    ./spirent.rst