From feb660042cc21d863fa3abb2ca5667478614ca1f Mon Sep 17 00:00:00 2001 From: 10013968 Date: Fri, 15 Jul 2016 13:21:21 +0800 Subject: Update the wiki page link OPNFV community changes wiki toolchain from dokuwiki to confluence, which causes most of the links are changed. Most of wiki page links in pharos documents are unvlid any more esp. these pharos lab links. JIRA: PHAROS-226 Change-Id: Ic64e90a829fc1e1f6b849439cf7fef134e39484a Signed-off-by: 10013968 --- docs/information/pharos.rst | 107 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 53 deletions(-) (limited to 'docs/information/pharos.rst') diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst index 2f13f7ed..87739dd0 100644 --- a/docs/information/pharos.rst +++ b/docs/information/pharos.rst @@ -13,7 +13,8 @@ Pharos Project Information Introduction ------------ -The `Pharos Project `_ deals with developing an OPNFV lab infrastructure that is geographically and technically diverse. +The `Pharos Project `_ deals with developing an OPNFV lab infrastructure +that is geographically and technically diverse. 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 @@ -31,15 +32,15 @@ operational issues as well as for Pharos project activities. Future lab capabilities are currently focussed on 1) Deployment automation 2) Dashboards (for capability and usage) 3) *Virtual Labs* for developer on-boarding. -* Pharos page: https://www.opnfv.org/developers/pharos -* Pharos project Wiki: https://wiki.opnfv.org/pharos -* `Pharos Planning `_ +* `Pharos page `_ +* `Pharos project Wiki `_ +* `Pharos Planning `_ Project Communication --------------------- * `Jira `_ -* `Weekly Pharos meeting `_ +* `Weekly Pharos meeting `_ * `Weekly coordination meeting for Test related projects `_ * IRC: freenode.net #opnfv-pharos http://webchat.freenode.net/?channels=opnfv-pharos * Mailing List: use opnfv-tech-discuss and tag your emails with [Pharos] in the subject for filtering @@ -54,9 +55,9 @@ Project Release Artifacts Pharos Lab Process ------------------ -* Process for requesting lab access and support https://wiki.opnfv.org/pharos_rls_b_support -* Pharos Lab Governance and Policies https://wiki.opnfv.org/pharos_policies -* Status of Community labs https://wiki.opnfv.org/pharos_rls_b_labs +* Process for requesting lab access and support https://wiki.opnfv.org/display/pharos/Pharos+Rls+B+Support +* Pharos Lab Governance and Policies https://wiki.opnfv.org/display/pharos/Pharos+Policies +* Status of Community labs https://wiki.opnfv.org/display/pharos/#PharosHome-Overview Current Labs ------------ @@ -64,49 +65,49 @@ Current Labs An interactive map of OPNFV lab locations, lab owners and other lab information is maintained on the `Pharos Wiki `_ -+----+---------------+----------------------------------------------------------+----------------------+ -| | **Hosted by** | **Home page** | **Location** | -| # | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 1 | Linux | https://wiki.opnfv.org/get_started/lflab_hosting | Portland, Oregon | -| | Foundation | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 2 | Spirent | https://wiki.opnfv.org/pharos/spirentvctlab | Nephoscale, CA | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 3 | China Mobile | https://wiki.opnfv.org/lab2_chinamobile_hosting | Beijing, China | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 4 | Dell | https://wiki.opnfv.org/dell_hosting | Santa Clara, CA | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 5 | Enea | https://wiki.opnfv.org/enea-pharos-lab | Kista, Sweden | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 6 | Ericsson | https://wiki.opnfv.org/get_started/ericsson_hosting | Montreal, Canada | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 7 | Huawei | https://wiki.opnfv.org/lab4_huawei | Xi an, China | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 8 | Huawei | https://wiki.opnfv.org/get_started/huawei_sc_hosting | Santa Clara, CA | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 9 | Intel | https://wiki.opnfv.org/get_started/intel_hosting | Hillsboro, Oregon | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 10 | Orange | https://wiki.opnfv.org/opnfv-orange | Lannion, France | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 11 | Orange | https://wiki.opnfv.org/opnfv-orange | Paris, France | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 12 | ZTE | https://wiki.opnfv.org/zte-nj-testlab | Nan Jing, China | -| | | | | -+----+---------------+----------------------------------------------------------+----------------------+ -| 13 | Okinawa | https://wiki.opnfv.org/display/pharos/OOL+TestLab | Okinawa | -| | Open Lab | | | -+----+---------------+----------------------------------------------------------+----------------------+ ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| # | **Hosted by** | **Home page** | **Location** | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 1 | Linux | https://wiki.opnfv.org/display/pharos/Lflab+Hosting | Portland, Oregon | +| | Foundation | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 2 | Spirent | https://wiki.opnfv.org/display/pharos/Spirentvctlab | Nephoscale, CA | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 3 | China Mobile | https://wiki.opnfv.org/display/pharos/Lab2+Chinamobile+Hosting | Beijing, China | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 4 | Dell | https://wiki.opnfv.org/display/pharos/Dell+Hosting | Santa Clara, CA | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 5 | Enea | https://wiki.opnfv.org/display/pharos/Enea-pharos-lab | Kista, Sweden | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 6 | Ericsson | https://wiki.opnfv.org/display/pharos/Ericsson+Hosting+and+Request+Process | Montreal, Canada | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 7 | Huawei | https://wiki.opnfv.org/display/pharos/Lab4+Huawei | Xi an, China | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 8 | Huawei | https://wiki.opnfv.org/display/pharos/Huawei+Sc+Hosting | Santa Clara, CA | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 9 | Intel | https://wiki.opnfv.org/display/pharos/Intel+Hosting | Hillsboro, Oregon | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 10 | Orange | https://wiki.opnfv.org/display/pharos/Opnfv-orange | Lannion, France | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 11 | Orange | https://wiki.opnfv.org/display/pharos/Opnfv-orange | Paris, France | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 12 | ZTE | https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab | Nan Jing, China | +| | | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ +| 13 | Okinawa | https://wiki.opnfv.org/display/pharos/OOL+TestLab | Okinawa | +| | Open Lab | | | ++----+---------------+----------------------------------------------------------------------------+-------------------+ @@ -115,5 +116,5 @@ Pharos project Key Facts **Key Project Facts are maintained in the Pharos INFO file in the project repo** - * Can be viewed on the project Wiki `INFO `_ - * Project key facts in repo: pharos/INFO + * Can be viewed on the project Wiki `INFO `_ + * Project key facts in repo: pharos/INFO -- cgit 1.2.3-korg