From 93d78694924c6fe51cc6b4e05bab97af05fc002d Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 26 Nov 2018 15:49:02 +0000 Subject: [PATCH] [docs][nsb][install] Update source for sample pod files The command for copying the sample pod files was incorrect in one instance (baremetal config) and inconsistent in other instances (using ./etc vs /etc vs /etc) This updates 13-nsb-installation.rst for consistency. Paths within the yardstick repo are preface with ``./``, as initially, the user was instructed to ``cd yardstick``. JIRA: YARDSTICK-1335 Change-Id: Ia5d5fae29373a177f775ea433c56f38bdeca536e Signed-off-by: Emma Foley --- .../testing/user/userguide/13-nsb-installation.rst | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/testing/user/userguide/13-nsb-installation.rst b/docs/testing/user/userguide/13-nsb-installation.rst index 71ced43ea..80e42685f 100644 --- a/docs/testing/user/userguide/13-nsb-installation.rst +++ b/docs/testing/user/userguide/13-nsb-installation.rst @@ -1,7 +1,7 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International .. License. .. http://creativecommons.org/licenses/by/4.0 -.. (c) OPNFV, 2016-2018 Intel Corporation. +.. (c) OPNFV, 2016-2019 Intel Corporation. .. Convention for heading levels in Yardstick documentation: @@ -232,7 +232,7 @@ OpenStack:: Finally, you should be able to run the testcase:: - yardstick --debug task start yardstick/samples/vnf_samples/nsut// + yardstick --debug task start ./yardstick/samples/vnf_samples/nsut// Network Service Benchmarking - Bare-Metal ----------------------------------------- @@ -273,7 +273,7 @@ Bare-Metal Config pod.yaml Before executing Yardstick test cases, make sure that ``pod.yaml`` reflects the topology and update all the required fields.:: - cp /etc/yardstick/nodes/pod.yaml.nsb.sample /etc/yardstick/nodes/pod.yaml + cp ./etc/yardstick/nodes/pod.yaml.nsb.sample /etc/yardstick/nodes/pod.yaml .. code-block:: YAML @@ -481,8 +481,8 @@ topology and update all the required fields. .. code-block:: console - cp /etc/yardstick/nodes/standalone/trex_bm.yaml.sample /etc/yardstick/nodes/standalone/pod_trex.yaml - cp /etc/yardstick/nodes/standalone/host_sriov.yaml /etc/yardstick/nodes/standalone/host_sriov.yaml + cp ./etc/yardstick/nodes/standalone/trex_bm.yaml.sample /etc/yardstick/nodes/standalone/pod_trex.yaml + cp ./etc/yardstick/nodes/standalone/host_sriov.yaml /etc/yardstick/nodes/standalone/host_sriov.yaml .. note:: Update all the required fields like ip, user, password, pcis, etc... @@ -529,7 +529,7 @@ SR-IOV Config host_sriov.yaml password: "" SR-IOV testcase update: -``/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml`` +``./samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml`` Update contexts section ''''''''''''''''''''''' @@ -719,8 +719,8 @@ OVS-DPDK 3-Node setup - Correlated Traffic Before executing Yardstick test cases, make sure that the ``pod.yaml`` reflects the topology and update all the required fields:: - cp /etc/yardstick/nodes/standalone/trex_bm.yaml.sample /etc/yardstick/nodes/standalone/pod_trex.yaml - cp /etc/yardstick/nodes/standalone/host_ovs.yaml /etc/yardstick/nodes/standalone/host_ovs.yaml + cp ./etc/yardstick/nodes/standalone/trex_bm.yaml.sample /etc/yardstick/nodes/standalone/pod_trex.yaml + cp ./etc/yardstick/nodes/standalone/host_ovs.yaml /etc/yardstick/nodes/standalone/host_ovs.yaml .. note:: Update all the required fields like ip, user, password, pcis, etc... @@ -766,7 +766,7 @@ OVS-DPDK Config host_ovs.yaml password: "" ovs_dpdk testcase update: -``/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml`` +``./samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml`` Update contexts section ''''''''''''''''''''''' @@ -1110,8 +1110,8 @@ IxLoad .. code-block:: console - cp /etc/yardstick/nodes/pod.yaml.nsb.sample.ixia \ - etc/yardstick/nodes/pod_ixia.yaml + cp ./etc/yardstick/nodes/pod.yaml.nsb.sample.ixia \ + /etc/yardstick/nodes/pod_ixia.yaml Config ``pod_ixia.yaml`` @@ -1134,7 +1134,7 @@ IxLoad 4. Create a folder ``Results`` in c:\ and share the folder on the network. 5. Execute testcase in samplevnf folder e.g. - ``/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml`` + ``./samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml`` IxNetwork ^^^^^^^^^ @@ -1146,8 +1146,8 @@ installed as part of the requirements of the project. .. code-block:: console - cp /etc/yardstick/nodes/pod.yaml.nsb.sample.ixia \ - etc/yardstick/nodes/pod_ixia.yaml + cp ./etc/yardstick/nodes/pod.yaml.nsb.sample.ixia \ + /etc/yardstick/nodes/pod_ixia.yaml Configure ``pod_ixia.yaml`` @@ -1167,7 +1167,7 @@ installed as part of the requirements of the project. (or ``IxNetworkApiServer``) 3. Execute testcase in samplevnf folder e.g. - ``/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml`` + ``./samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml`` Spirent Landslide ----------------- -- 2.16.6