Docs: Update file structure

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I9422584caf87cb163c44ff4ac16df07f288581ce

diff --git a/README.md b/README.md
index 5b7d235..a5bbd29 100644 (file)
--- a/README.md
+++ b/README.md
@@ -116,10 +116,18 @@ resources
 ```
 .
 ├── docs                            # Main documentaion
+|── fdio.infra.ansible              # Infrastructure provisioning
+|── fdio.infra.pxe                  # Preboot eXecution Environment
+|── fdio.infra.terraform            # Virtual infrastructure deployment
+|── GPL                             # Files licensed under GPL
+│   ├── traffic_profiles            # Performance tests traffic profiles
+│   │   └── trex
+│   └── traffic_scripts             # Functional tests traffic profiles
 ├── PyPI                            # PyPI packages provided by CSIT
 │   ├── jumpavg
 │   └── MLRsearch
 ├── resources
+│   ├── api                         # API coverage
 │   ├── templates                   # Templates (vpp_api_test, kubernetes, ...)
 │   ├── test_data                   # Robot Test configuration
 │   ├── tools
@@ -128,16 +136,10 @@ resources
 │   │   ├── papi                    # PAPI driver
 │   │   ├── presentation            # Report generator
 │   │   ├── scripts                 # Various tools
-│   │   ├── testbed-setup           # Physical testbed setup scripts
 │   │   ├── topology                # Helper scripts for topology manipulation
 │   │   ├── trex                    # TRex driver
 │   │   └── vagrant                 # VPP device vagrant environment
 │   ├── topology_schemas
-│   ├── traffic_profiles            # Performance tests traffic profiles
-│   │   └── trex
-│   └── traffic_scripts             # Functional tests traffic profiles
-│       ├── dhcp
-│       └── lisp
 └── topologies                      # Linux Foundation topology files
     ├── available
     └── enabled
@@ -150,12 +152,6 @@ resources
 [Vagrant environment preparation](docs/testing_in_vagrant.rst) documentaion is
 describing local VPP Device functional testing.
 
-### Physical Testbed
-
-[Physical testbed preparation](resources/tools/testbed-setup/README.rst)
-documentation is describing PXE and Ansible setup process. All the software
-requirements for running Performance Teste are part of Ansible playbooks.
-
 ## Report
 
 [CSIT Report](https://docs.fd.io/csit/master/report/).

diff --git a/docs/report/vpp_device_tests/test_environment.rst b/docs/report/vpp_device_tests/test_environment.rst
index 6521e85..2d07586 100644 (file)
--- a/docs/report/vpp_device_tests/test_environment.rst
+++ b/docs/report/vpp_device_tests/test_environment.rst
@@ -568,6 +568,6 @@ Links
 .. [CsitShimDcrFile] `csit-shim-dcr-file <https://github.com/snergfdio/multivppcache/blob/master/csit-shim/Dockerfile>`_
 .. [CsitSutDcrFile] `csit-sut-dcr-file <https://github.com/snergfdio/multivppcache/blob/master/csit-sut/Dockerfile>`_
 .. [ansiblelink] `ansible <https://www.ansible.com/>`_
-.. [fdiocsitansible] `Fd.io/CSIT ansible <https://git.fd.io/csit/tree/resources/tools/testbed-setup/ansible>`_
+.. [fdiocsitansible] `Fd.io/CSIT ansible <https://git.fd.io/csit/tree/fdio.infra.ansible>`_
 .. [inteli40e] `Intel i40e <https://downloadmirror.intel.com/26370/eng/readme.txt>`_
 .. [pciids] `pci ids <http://pci-ids.ucw.cz/v2.2/pci.ids>`_

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 0533f23..24c5ddd 100644 (file)
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -81,7 +81,7 @@ rst_epilog = u"""
 .. _FD.io CSIT Testbeds - Xeon Haswell: https://git.fd.io/csit/tree/docs/lab/testbeds_ucs_hsw_hw_bios_cfg.md?h={release}
 .. _FD.io CSIT testbeds - Xeon Skylake, Arm, Atom: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_skx_hw_bios_cfg.md?h={release}
 .. _FD.io CSIT testbeds - Xeon Cascade Lake: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_clx_hw_bios_cfg.md?h={release}
-.. _Ansible inventory - hosts: https://git.fd.io/csit/tree/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars?h={release}
+.. _Ansible inventory - hosts: https://git.fd.io/csit/tree/fdio.infra.ansible/inventories/lf_inventory/host_vars?h={release}
 .. _FD.io test executor dpdk performance job 3n-hsw: https://jenkins.fd.io/job/csit-dpdk-perf-report-iterative-{srelease}-3n-hsw
 .. _FD.io test executor dpdk performance job 3n-skx: https://jenkins.fd.io/job/csit-dpdk-perf-report-iterative-{srelease}-3n-skx
 .. _FD.io test executor dpdk performance job 2n-skx: https://jenkins.fd.io/job/csit-dpdk-perf-report-iterative-{srelease}-2n-skx
@@ -102,7 +102,7 @@ rst_epilog = u"""
 .. _FD.io test executor vpp performance job 2n-zn2: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-2n-zn2
 .. _FD.io test executor vpp device jobs using Ubuntu: https://jenkins.fd.io/view/csit/job/csit-vpp-device-{srelease}-ubuntu1804-1n-skx
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1804-x86_64/
-.. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
+.. _CSIT Testbed Setup: https://git.fd.io/csit/tree/fdio.infra.ansible?h={release}
 .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id}
 """.format(release=u'rls2101',
            report_week=report_week,