summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-01-29 17:14:10 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-01-29 17:42:31 -0800
commit83f037c1959efde4bf3fba48dfcc03d0f4871956 (patch)
tree8bbf18d61a242f7a1629427788a3ba9823ae3909
parent2a0aa0850096c68372a2630be4b0655dd3c924d1 (diff)
Cleaned up docs for toolchain errors.
Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Fixed doc formatting errors Change-Id: Ice15401d1c09b9a29e163cbec53e72f53d12b294 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat
-rw-r--r--.INFO.swpbin12288 -> 0 bytes
-rw-r--r--docs/information/pharos.rst12
-rw-r--r--docs/labs/Dell.rst998
-rw-r--r--docs/specification/objectives.rst5
4 files changed, 515 insertions, 500 deletions
diff --git a/.INFO.swp b/.INFO.swp
deleted file mode 100644
index cd247ee3..00000000
--- a/.INFO.swp
+++ /dev/null
Binary files differ
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst
index f65d2158..20f96b46 100644
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -2,11 +2,19 @@ Pharos Project: OPNFV Lab Infrastructure
########################################
The **Pharos Project** deals with developing an OPNFV lab infrastructure that is geographically and technically diverse.
+<<<<<<< HEAD
This will greatly assist in developing a highly robust and stable OPNFV platform. Community labs are hosted by
individual companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access for key
development and production activities. The **Pharos Specification** defines a "compliant" deployment and test
environment. Pharos is responsible for defining lab capabilities, developing management/usage policies and process;
and a support plan for reliable access to project and release resources. Community labs are provided as a service
+=======
+This will greatly assist in developing a highly robust and stable OPNFV platform. Community labs are hosted by
+individual companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access for key
+development and production activities. The **Pharos Specification** defines a "compliant" deployment and test
+environment. Pharos is responsible for defining lab capabilities, developing management/usage policies and process;
+and a support plan for reliable access to project and release resources. Community labs are provided as a service
+>>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
by companies and are not controlled by Pharos however our goal is to provide easy visibility of all lab capabilities
and their usage at all-times.
@@ -40,7 +48,11 @@ A map of OPNFV lab locations, lab owners and other individual lab information is
| # | Organization | | |
+----+---------------+----------------------------------------------------------+----------------------+
| 1 | Linux | https://wiki.opnfv.org/get_started/lflab_hosting | Portland, Oregon |
+<<<<<<< HEAD
| | Foundation | | |
+=======
+| | Foundation | | |
+>>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
+--- +---------------+----------------------------------------------------------+----------------------+
| 2 | Cable Labs | Internal use only at present | Denver, Colorado |
| | | | |
diff --git a/docs/labs/Dell.rst b/docs/labs/Dell.rst
index b2fddeaf..a427edbd 100644
--- a/docs/labs/Dell.rst
+++ b/docs/labs/Dell.rst
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
Dell OPNFV Testlab
==================================================
@@ -357,502 +356,501 @@ POD2 JumpServer
Passwd: d3ll1234
=======
-Dell OPNFV Testlab
-==================================================
-
-Overview
-------------------
-
-Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project
-
-
-The Dell Testlab consists of 3 PODs for the use of the community
- * POD1 (Jenkins slave: dell-us-testing-bm-1)
- * POD2 (Jenkins slave: dell-us-deploying-bm2)
- * POD3 (Jenkins slave: dell-us-delpoyingbm3)
-
-.. image:: images/Dell_Overview.jpg
- :height: 648
- :width: 735
- :alt: Dell Testlab Overiew
- :align: left
-
-Each of the 2 PODs consists of 6 servers that consist of
- * 1 Jump Server
- * 3 Servers for Control Nodes
- * 2 Servers for Compute Nodes
-
-
-
-Hardware details
------------------
-
-For POD1 and POD2, the servers reside within a single Dell PowerEdge 620 chassis and have the following specifications:
-
-
-
-**POD1**
-
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname | Model | Memory | Storage | Processor | Socket |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Jump Server | Dell PowerEdge M620 | 64 GB | 1200GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node2 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node3 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node4 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node5 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node6 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-
-
-
-
-**POD2**
-
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname | Model | Memory | Storage | Processor | Socket |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Jump Server | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2630 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node7 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node8 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node9 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node11 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node12 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-
-
-POD3 consists of 6 R630 Rack servers with the following specifications:
-
-**POD3**
-
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Hostname | Model | Memory | Storage | Processor | Socket |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Jump Server | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node2 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node3 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node4 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node5 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node6 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
-+---------------------+----------------------+----------------+---------------+---------------------+------------+
-
-
-
-Software
----------
-
-The Jump servers in the Testlab are pre-provisioned with the following softwares:
-
- * POD1-Jump Server:
-
- 1. OS: Ubuntu 14.04
-
-
- * POD2-Jump Server:
-
- 1. OS: CentOS7.1
-
-
- * POD3-Jump Server:
-
- 1. OS: CentOS7.1
-
-
-Networks
-----------
-
-
-
-**POD1**
-
-.. image:: images/Dell_POD1.jpg
- :height: 649
- :width: 815
- :alt: POD1-Fuel Overview
- :align: left
-
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname | NIC Model | Ports|MAC | BW | VLANs/Roles |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Jump Server | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:81 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:84 | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:85 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:87 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node2 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:8E | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:91 | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:92 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:94 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:96 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:98 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node3 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:9B | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:9E | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:9F | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:A1 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:A3 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:A5 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node4 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:A8 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:AB | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:AC | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:AE | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:B0 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:B1 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node5 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:B5 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:B8 | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:B9 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:BB | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:BD | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:C0 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node6 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:C2 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:C5 | 10G | Internal Networks (101-106) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:C6 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:C8 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:CA | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:CD | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-
-
-
-**POD2**
-
-.. image:: images/Dell_POD2.jpg
- :height: 602
- :width: 815
- :alt: POD2 Overview
- :align: left
-
-
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname | NIC Model | Ports|MAC | BW | Roles |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Foreman Jump | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:1D | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B5:20 | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:21 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B5:23 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, TBD | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node7 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:CF | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:D2 | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:D3 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:D5 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:D7 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:DA | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node8 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:DC | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:DF | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:E0 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:E2 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:E4 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:E7 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node9 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:E9 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B4:EC | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:ED | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B4:EF | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:F1 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:F3 | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node11 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:03 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B5:06 | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:07 | 10G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B5:09 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B5:0B | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B5:0D | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node12 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:10 | 10G | PXE |
-| | +------+-------------------+-------+----------------------------------+
-| | | em2 | A4:1F:72:11:B5:13 | 10G | Internal Networks (201-205) |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:14 | 1G | Public |
-| | +------+-------------------+-------+----------------------------------+
-| | | p3p2 | A4:1F:72:11:B5:16 | 10G | Unused |
-| +----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | 3, TBD | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
-| | +------+-------------------+-------+----------------------------------+
-| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-
-
-
-
-**POD3**
-
-
-
-.. image:: images/Dell_POD3.jpg
- :height: 652
- :width: 815
- :alt: POD3 Overview
- :align: left
-
-
-
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname | NIC Model | Ports|MAC | BW | Roles (VLANs) |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Jump Server | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:14:20 | 1G | PXE |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D7:14:22 | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D7:14:24 | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Node1 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:F2:98 | 10G | PXE |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D6:F2:9A | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D6:F2:9C | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Node2 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:F9:10 | 1G | PXE |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D6:F9:12 | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D6:F9:14 | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Node3 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:C9:B8 | 1G | PXE |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D7:C9:BA | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D7:C9:BC | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Node4 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:16:E8 | 10G | PXE |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D7:16:EA | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D7:16:EA | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| | | | | | |
-| Node5 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:FE:98 | 1G | Unused |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | em2 | EC:F4:BB:D6:FE:9A | 10G | Internal Networks (201,202,203) |
-| | | | | | |
-| | +------+-------------------+-------+----------------------------------+
-| | | | | | |
-| | | p3p1 | EC:F4:BB:D6:FE:9C | 1G | Public |
-| | | | | | |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-
-
-**Subnet allocations**
-
-+-------------------+----------------+-------------------+---------------+----------+
-| Network name | Address | Mask | Gateway | VLAN id |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD1 Public | 172.18.0.64 | 255.255.255.192 | 172.18.0.65 | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD2 Public | 172.18.0.0 | 255.255.255.192 | 172.18.0.1 | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD3 Public | 172.18.1.0 | 255.255.255.0 | 172.18.1.1 | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Lights Out | 172.18.0.128 | 255.255.255.128 | 172.18.0.129 | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-
-
-**Lights out Network**
-
-**POD1**
-
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname | Lights-out address | MAC | Username | Password |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump | 172.18.0.131 | A4:1F:72:11:B4:80| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node2 | 172.18.0.132 | A4:1F:72:11:B4:8D| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node3 | 172.18.0.133 | A4:1F:72:11:B4:9A| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node4 | 172.18.0.134 | A4:1F:72:11:B4:A7| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node5 | 172.18.0.135 | A4:1F:72:11:B4:B4| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node6 | 172.18.0.136 | A4:1F:72:11:B4:C1| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-
-**POD2**
-
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname | Lights-out address | MAC | Username | Password |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump | 172.18.0.143 | A4:1F:72:11:B5:1C| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node7 | 172.18.0.137 | A4:1F:72:11:B4:CE| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node8 | 172.18.0.138 | A4:1F:72:11:B4:DB| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node9 | 172.18.0.139 | A4:1F:72:11:B4:E8| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node11 | 172.18.0.141 | A4:1F:72:11:B5:02| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node12 | 172.18.0.142 | A4:1F:72:11:B5:0F| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-
-
-
-**POD3**
-
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname | Lights-out address | MAC | Username | Password |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump | 172.18.0.181 | 74:E6:E2:FA:BB:D8| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node1 | 172.18.0.182 | 74:E6:E2:FA:E9:2E| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node2 | 172.18.0.183 | 74:E6:E2:FA:FC:E2| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node3 | 172.18.0.184 | 74:E6:E2:FB:05:68| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node4 | 172.18.0.185 | 74:E6:E2:FA:A4:02| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node5 | 172.18.0.186 | 74:E6:E2:FA:E4:18| root | calvin |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-
-
-Remote access infrastructure
------------------------------
-
-The Dell OPNFV testlab is free to use for the OPNFV community.
-
-A VPN is used to provide access to the Dell Testlab.
-
-To access the Testlab, please visit the Dell OPNFV Lab's wiki page (https://wiki.opnfv.org/dell_hosting) for details.
-
-
-*Accessing the Teslab*
------------------------
-
-* POD1 JumpServer
-
- IP: 172.18.0.67
-
- User: opnfv
-
- Passwd: d3ll1234
-
-
-
-* POD2 JumpServer
-
- IP: 172.18.0.11
-
- User: opnfv
-
- Passwd: d3ll1234
-
-
-
-* POD3 JumpServer
-
- IP: 172.18.1.3
-
- User: opnfv
-
- Passwd: d3ll1234
->>>>>>> f71f6b6... Updated Dell Lab's Documentation
+Dell OPNFV Testlab
+==================================================
+
+Overview
+------------------
+
+Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project
+
+
+The Dell Testlab consists of 3 PODs for the use of the community
+ * POD1 (Jenkins slave: dell-us-testing-bm-1)
+ * POD2 (Jenkins slave: dell-us-deploying-bm2)
+ * POD3 (Jenkins slave: dell-us-delpoyingbm3)
+
+.. image:: images/Dell_Overview.jpg
+ :height: 648
+ :width: 735
+ :alt: Dell Testlab Overiew
+ :align: left
+
+Each of the 2 PODs consists of 6 servers that consist of
+ * 1 Jump Server
+ * 3 Servers for Control Nodes
+ * 2 Servers for Compute Nodes
+
+
+
+Hardware details
+-----------------
+
+For POD1 and POD2, the servers reside within a single Dell PowerEdge 620 chassis and have the following specifications:
+
+
+
+**POD1**
+
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Hostname | Model | Memory | Storage | Processor | Socket |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Jump Server | Dell PowerEdge M620 | 64 GB | 1200GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node2 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node3 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node4 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node5 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node6 | Dell PowerEdge M620 | 64 GB | 600GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+
+
+
+
+**POD2**
+
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Hostname | Model | Memory | Storage | Processor | Socket |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Jump Server | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2630 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node7 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node8 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node9 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node11 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+| Node12 | Dell PowerEdge M620 | 64 GB | 300GB HDD | Intel Xeon E5-2640 | 2 |
++---------------------+----------------------+----------------+--------------+---------------------+------------+
+
+
+POD3 consists of 6 R630 Rack servers with the following specifications:
+
+**POD3**
+
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Hostname | Model | Memory | Storage | Processor | Socket |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Jump Server | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Node2 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Node3 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Node4 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Node5 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+-----------------+--------------+---------------------+------------+
+| Node6 | Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel Xeon E5-2698 | 2 |
++---------------------+----------------------+----------------+---------------+---------------------+------------+
+
+
+
+Software
+---------
+
+The Jump servers in the Testlab are pre-provisioned with the following softwares:
+
+ * POD1-Jump Server:
+
+ 1. OS: Ubuntu 14.04
+
+
+ * POD2-Jump Server:
+
+ 1. OS: CentOS7.1
+
+
+ * POD3-Jump Server:
+
+ 1. OS: CentOS7.1
+
+
+Networks
+----------
+
+
+
+**POD1**
+
+.. image:: images/Dell_POD1.jpg
+ :height: 649
+ :width: 815
+ :alt: POD1-Fuel Overview
+ :align: left
+
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Hostname | NIC Model | Ports|MAC | BW | VLANs/Roles |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Jump Server | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:81 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:84 | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:85 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:87 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node2 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:8E | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:91 | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:92 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:94 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:96 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:98 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node3 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:9B | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:9E | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:9F | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:A1 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:A3 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:A5 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node4 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:A8 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:AB | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:AC | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:AE | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:B0 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:B1 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node5 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:B5 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:B8 | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:B9 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:BB | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:BD | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:C0 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node6 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:C2 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:C5 | 10G | Internal Networks (101-106) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:C6 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:C8 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:CA | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:CD | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+
+
+
+**POD2**
+
+.. image:: images/Dell_POD2.jpg
+ :height: 602
+ :width: 815
+ :alt: POD2 Overview
+ :align: left
+
+
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Hostname | NIC Model | Ports|MAC | BW | Roles |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Foreman Jump | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:1D | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B5:20 | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:21 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B5:23 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, TBD | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node7 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:CF | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:D2 | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:D3 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:D5 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:D7 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:DA | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node8 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:DC | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:DF | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:E0 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:E2 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Broadcom NetXtreme II BCM57810 | p1p1 | A4:1F:72:11:B4:E4 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:E7 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node9 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B4:E9 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B4:EC | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B4:ED | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B4:EF | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B4:F1 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:F3 | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node11 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:03 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B5:06 | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:07 | 10G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B5:09 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, Intel 82599 | p1p1 | A4:1F:72:11:B5:0B | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B5:0D | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Node12 | 1, Broadcom NetXtreme II BCM57810 | em1 | A4:1F:72:11:B5:10 | 10G | PXE |
+| | +------+-------------------+-------+----------------------------------+
+| | | em2 | A4:1F:72:11:B5:13 | 10G | Internal Networks (201-205) |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 2, Intel 82599 | p3p1 | A4:1F:72:11:B5:14 | 1G | Public |
+| | +------+-------------------+-------+----------------------------------+
+| | | p3p2 | A4:1F:72:11:B5:16 | 10G | Unused |
+| +----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | 3, TBD | p1p1 | A4:1F:72:11:B4:89 | 10G | Unused |
+| | +------+-------------------+-------+----------------------------------+
+| | | p1p2 | A4:1F:72:11:B4:8B | 10G | Unused |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+
+
+
+
+**POD3**
+
+
+
+.. image:: images/Dell_POD3.jpg
+ :height: 652
+ :width: 815
+ :alt: POD3 Overview
+ :align: left
+
+
+
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| Hostname | NIC Model | Ports|MAC | BW | Roles (VLANs) |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Jump Server | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:14:20 | 1G | PXE |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D7:14:22 | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D7:14:24 | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Node1 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:F2:98 | 10G | PXE |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D6:F2:9A | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D6:F2:9C | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Node2 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:F9:10 | 1G | PXE |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D6:F9:12 | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D6:F9:14 | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Node3 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:C9:B8 | 1G | PXE |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D7:C9:BA | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D7:C9:BC | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Node4 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D7:16:E8 | 10G | PXE |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D7:16:EA | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D7:16:EA | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+| | | | | | |
+| Node5 | 1, Intel 2P X520/2P I350 rNDC | em1 | EC:F4:BB:D6:FE:98 | 1G | Unused |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | em2 | EC:F4:BB:D6:FE:9A | 10G | Internal Networks (201,202,203) |
+| | | | | | |
+| | +------+-------------------+-------+----------------------------------+
+| | | | | | |
+| | | p3p1 | EC:F4:BB:D6:FE:9C | 1G | Public |
+| | | | | | |
++---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
+
+
+**Subnet allocations**
+
++-------------------+----------------+-------------------+---------------+----------+
+| Network name | Address | Mask | Gateway | VLAN id |
++-------------------+----------------+-------------------+---------------+----------+
+| POD1 Public | 172.18.0.64 | 255.255.255.192 | 172.18.0.65 | Untagged |
++-------------------+----------------+-------------------+---------------+----------+
+| POD2 Public | 172.18.0.0 | 255.255.255.192 | 172.18.0.1 | Untagged |
++-------------------+----------------+-------------------+---------------+----------+
+| POD3 Public | 172.18.1.0 | 255.255.255.0 | 172.18.1.1 | Untagged |
++-------------------+----------------+-------------------+---------------+----------+
+| Lights Out | 172.18.0.128 | 255.255.255.128 | 172.18.0.129 | Untagged |
++-------------------+----------------+-------------------+---------------+----------+
+
+
+**Lights out Network**
+
+**POD1**
+
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Hostname | Lights-out address | MAC | Username | Password |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Jump | 172.18.0.131 | A4:1F:72:11:B4:80| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node2 | 172.18.0.132 | A4:1F:72:11:B4:8D| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node3 | 172.18.0.133 | A4:1F:72:11:B4:9A| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node4 | 172.18.0.134 | A4:1F:72:11:B4:A7| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node5 | 172.18.0.135 | A4:1F:72:11:B4:B4| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node6 | 172.18.0.136 | A4:1F:72:11:B4:C1| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+
+**POD2**
+
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Hostname | Lights-out address | MAC | Username | Password |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Jump | 172.18.0.143 | A4:1F:72:11:B5:1C| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node7 | 172.18.0.137 | A4:1F:72:11:B4:CE| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node8 | 172.18.0.138 | A4:1F:72:11:B4:DB| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node9 | 172.18.0.139 | A4:1F:72:11:B4:E8| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node11 | 172.18.0.141 | A4:1F:72:11:B5:02| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node12 | 172.18.0.142 | A4:1F:72:11:B5:0F| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+
+
+
+**POD3**
+
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Hostname | Lights-out address | MAC | Username | Password |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Jump | 172.18.0.181 | 74:E6:E2:FA:BB:D8| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node1 | 172.18.0.182 | 74:E6:E2:FA:E9:2E| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node2 | 172.18.0.183 | 74:E6:E2:FA:FC:E2| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node3 | 172.18.0.184 | 74:E6:E2:FB:05:68| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node4 | 172.18.0.185 | 74:E6:E2:FA:A4:02| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+| Node5 | 172.18.0.186 | 74:E6:E2:FA:E4:18| root | calvin |
++----------------+-------------------------------+------------------+---------------------+---------------------+
+
+
+Remote access infrastructure
+----------------------------
+
+The Dell OPNFV testlab is free to use for the OPNFV community.
+
+A VPN is used to provide access to the Dell Testlab.
+
+To access the Testlab, please visit the Dell OPNFV Lab's wiki page (https://wiki.opnfv.org/dell_hosting) for details.
+
+
+*Accessing the Teslab*
+-----------------------
+
+* POD1 JumpServer
+
+ IP: 172.18.0.67
+
+ User: opnfv
+
+ Passwd: d3ll1234
+
+
+
+* POD2 JumpServer
+
+ IP: 172.18.0.11
+
+ User: opnfv
+
+ Passwd: d3ll1234
+
+
+
+* POD3 JumpServer
+
+ IP: 172.18.1.3
+
+ User: opnfv
+
+ Passwd: d3ll1234
diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst
index efa69ed5..40460ff9 100644
--- a/docs/specification/objectives.rst
+++ b/docs/specification/objectives.rst
@@ -1,8 +1,13 @@
Objectives / Scope
-------------------
+<<<<<<< HEAD
The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
+=======
+The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
+platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
+>>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
management/usage policies and process; and a support plan for reliable access to project and release resources.
Community labs are provided as a service by companies and are not controlled by Pharos however our objective is
to provide easy visibility of all lab capabilities and their usage at all-times.