Merge changes from topic 'storage'

* changes:
  Keep tests/data consistent with repository structure
  Add score calculation module for storperf

6 files changed, 0 insertions, 89 deletions

diff --git a/tests/data/benchmarks/metric/dhrystone.yaml b/tests/data/benchmarks/metric/dhrystone.yaml
deleted file mode 100644
index e4d26248..00000000
--- a/tests/data/benchmarks/metric/dhrystone.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: dhrystone
-description: >
-  A synthetic computing benchmark program intended to be representative of
-  system (integer) programming.
-links:
-  - https://en.wikipedia.org/wiki/Dhrystone
-workloads:
-  - single_cpu
-  - multi_cpu
diff --git a/tests/data/benchmarks/metric/dpi.yaml b/tests/data/benchmarks/metric/dpi.yaml
deleted file mode 100644
index c90075d2..00000000
--- a/tests/data/benchmarks/metric/dpi.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: dpi
-description: deep packet inspection
-workloads:
-  - bps
-  - pps
diff --git a/tests/data/benchmarks/metric/fake-metric.yaml b/tests/data/benchmarks/metric/fake-metric.yaml
deleted file mode 100644
index dd2875d7..00000000
--- a/tests/data/benchmarks/metric/fake-metric.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: fake compute
-description: >
-  a fake compute performance index which generate random result
-workloads:  # all supported workloads
-  - fake_workload_1
-  - fake_workload_2
-  - fake_workload_3
diff --git a/tests/data/benchmarks/metric/ramspeed.yaml b/tests/data/benchmarks/metric/ramspeed.yaml
deleted file mode 100644
index e2e2b98f..00000000
--- a/tests/data/benchmarks/metric/ramspeed.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: ramspeed
-description: a memory performance benchmarking
-workloads:
-    - int: [add, average, copy, scale, triad]
-    - float: [add, average, copy, scale, triad]
diff --git a/tests/data/benchmarks/metric/ssl.yaml b/tests/data/benchmarks/metric/ssl.yaml
deleted file mode 100644
index 2b01dccd..00000000
--- a/tests/data/benchmarks/metric/ssl.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: ssl
-description: a Secure Sockets Layer performance benchmarking
-workloads:
-  - aes_128_cbc: [512, 1024, 2048, 4096]
-  - rsa_sig: [16, 64, 256, 1024, 8192]
diff --git a/tests/data/benchmarks/metric/whetstone.yaml b/tests/data/benchmarks/metric/whetstone.yaml
deleted file mode 100644
index 625ea87f..00000000
--- a/tests/data/benchmarks/metric/whetstone.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-name: whetstone
-description: >
-  A synthetic benchmark for evaluating the performance of computers.
-  The Whetstone benchmark primarily measures the floating-point arithmetic
-  performance.
-links:
-  - https://en.wikipedia.org/wiki/Whetstone_(benchmark)
-workloads:
-  - single_cpu
-  - multi_cpu