diff options
-rw-r--r-- | docs/apidocs/index.rst | 2 | ||||
-rw-r--r-- | docs/release/release-notes/index.rst | 2 | ||||
-rw-r--r-- | docs/release/results/index.rst | 2 | ||||
-rw-r--r-- | docs/testing/user/userguide/index.rst | 2 | ||||
-rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 3 | ||||
-rwxr-xr-x | tools/ubuntu-server-cloudimg-modify.sh | 27 | ||||
-rw-r--r-- | yardstick/network_services/traffic_profile/fixed.py | 3 | ||||
-rw-r--r-- | yardstick/network_services/vnf_generic/vnf/tg_trex.py | 2 |
8 files changed, 29 insertions, 14 deletions
diff --git a/docs/apidocs/index.rst b/docs/apidocs/index.rst index 8bd407341..b7f49f536 100644 --- a/docs/apidocs/index.rst +++ b/docs/apidocs/index.rst @@ -1,3 +1,5 @@ +.. _yardstick-apidocs: + .. This work is licensed under a Creative Commons Attribution 4.0 International .. License. .. http://creativecommons.org/licenses/by/4.0 diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst index c9cadc539..11a508ca6 100644 --- a/docs/release/release-notes/index.rst +++ b/docs/release/release-notes/index.rst @@ -1,3 +1,5 @@ +.. _yardstick-releasenotes: + .. This work is licensed under a Creative Commons Attribution 4.0 International .. License. .. http://creativecommons.org/licenses/by/4.0 diff --git a/docs/release/results/index.rst b/docs/release/results/index.rst index 2b67f1b22..0560152e0 100644 --- a/docs/release/results/index.rst +++ b/docs/release/results/index.rst @@ -1,3 +1,5 @@ +.. _yardstick-results: + .. This work is licensed under a Creative Commons Attribution 4.0 International .. License. .. http://creativecommons.org/licenses/by/4.0 diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst index 1b963af61..75dcbcd82 100644 --- a/docs/testing/user/userguide/index.rst +++ b/docs/testing/user/userguide/index.rst @@ -1,3 +1,5 @@ +.. _yardstick-userguide: + .. This work is licensed under a Creative Commons Attribution 4.0 International .. License. .. http://creativecommons.org/licenses/by/4.0 diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp index e69371141..3741bacf2 100644 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp @@ -1,5 +1,4 @@ -$fuel_settings = parseyaml(file('/etc/astute.yaml')) -$master_ip = $::fuel_settings['master_ip'] +$master_ip = hiera('master_ip') $access_hash = hiera_hash('access', {}) $admin_tenant = $access_hash['tenant'] diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh index f0e2b4baa..fb2ae3fe8 100755 --- a/tools/ubuntu-server-cloudimg-modify.sh +++ b/tools/ubuntu-server-cloudimg-modify.sh @@ -76,36 +76,41 @@ apt-get install -y \ stress \ sysstat +CLONE_DEST=/opt/tempT + +# remove before cloning +rm -rf -- "${CLONE_DEST}" + if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then wget https://github.com/kdlucas/byte-unixbench/archive/master.zip unzip master.zip && rm master.zip - mkdir /opt/tempT - mv byte-unixbench-master/UnixBench /opt/tempT + mkdir "${CLONE_DEST}" + mv byte-unixbench-master/UnixBench "${CLONE_DEST}" sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \ - -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' /opt/tempT/UnixBench/Makefile + -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile" else - git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT + git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}" fi -make --directory /opt/tempT/UnixBench/ +make --directory "${CLONE_DEST}/UnixBench/" if [ "${YARD_IMG_ARCH}" = "arm64" ]; then wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip unzip master.zip && rm master.zip - mkdir /opt/tempT/RAMspeed - mv ramspeed-master/* /opt/tempT/RAMspeed/ + mkdir "${CLONE_DEST}/RAMspeed" + mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/" else - git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed + git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed" fi -cd /opt/tempT/RAMspeed/ramspeed-2.6.0 +cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0" mkdir temp bash build.sh if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then wget https://github.com/beefyamoeba5/cachestat/archive/master.zip unzip master.zip && rm master.zip - mv cachestat-master/cachestat /opt/tempT + mv cachestat-master/cachestat "${CLONE_DEST}" else - git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat + git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat" fi # restore symlink diff --git a/yardstick/network_services/traffic_profile/fixed.py b/yardstick/network_services/traffic_profile/fixed.py index a456c2bd7..ebc1e61f2 100644 --- a/yardstick/network_services/traffic_profile/fixed.py +++ b/yardstick/network_services/traffic_profile/fixed.py @@ -43,7 +43,8 @@ class FixedProfile(TrafficProfile): self._create_stream(src_ip, dst_ip), ports=[ports]) - traffic_generator.client.start(ports=traffic_generator.my_ports) + traffic_generator.client.start(ports=traffic_generator.my_ports, + force=True) self.first_run = False def _create_stream(self, src_ip, dst_ip): diff --git a/yardstick/network_services/vnf_generic/vnf/tg_trex.py b/yardstick/network_services/vnf_generic/vnf/tg_trex.py index 2731476e0..1e751bfce 100644 --- a/yardstick/network_services/vnf_generic/vnf/tg_trex.py +++ b/yardstick/network_services/vnf_generic/vnf/tg_trex.py @@ -31,6 +31,7 @@ from stl.trex_stl_lib.trex_stl_exceptions import STLError LOG = logging.getLogger(__name__) DURATION = 30 +WAIT_QUEUE = 1 TREX_SYNC_PORT = 4500 TREX_ASYNC_PORT = 4501 @@ -259,6 +260,7 @@ class TrexTrafficGen(GenericTrafficGen): "tx_throughput_mbps": float(xe_value.get("tx_bps", 0.0)), "in_packets": xe_value.get("ipackets", 0), "out_packets": xe_value.get("opackets", 0)} + time.sleep(WAIT_QUEUE) queue.put(samples) self.client.disconnect() |