X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Flmbench.yaml;h=7050243f961d7c88fc9f141d8a40ac17bcb991b2;hb=622a85f72bea2679ef4849abb083616bff3da0e7;hp=256d8c67e8c43bbd6693ee453197b28d3676efdc;hpb=2aa1cd3922f26b9d8c9bdad310463caa5eeb8136;p=yardstick.git

diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml
index 256d8c67e..7050243f9 100644
--- a/samples/lmbench.yaml
+++ b/samples/lmbench.yaml
@@ -1,6 +1,21 @@
+##############################################################################
+# Copyright (c) 2017 kristian.hunt@gmail.com 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
+##############################################################################
 ---
 # Sample benchmark task config file
-# measure memory read latency using lmbench
+# measure memory read latency and memory bandwidth using lmbench
+# can be used both on Openstack and Kubernetes with "context_type"
+
+{% set context_type = context_type or "Heat" %}
+{% set separator = separator or "." %}
+{% if context_type == "Kubernetes" %}
+{% set separator = "-" %}
+{% endif %}
 
 schema: "yardstick:task:0.1"
 
@@ -8,26 +23,66 @@ scenarios:
 -
   type: Lmbench
   options:
-    stride: 64
-    stop_size: 32
+    test_type: "latency"
+    stop_size: 32.0
 
-  host: demeter.demo
+  host: demeter{{ separator }}demo
 
   runner:
     type: Arithmetic
-    name: stride
-    stop: 128
-    step: 64
+    iterators:
+    -
+      name: stride
+      start: 64
+      stop: 128
+      step: 64
 
   sla:
     max_latency: 35
     action: monitor
+-
+  type: Lmbench
+  options:
+    test_type: "bandwidth"
+    benchmark: "wr"
+
+  host: demeter{{ separator }}demo
+
+  runner:
+    type: Arithmetic
+    iterators:
+    -
+      name: size
+      start: 500
+      stop: 2000
+      step: 500
+
+  sla:
+    min_bandwidth: 10000
+    action: monitor
 
 context:
+  type: {{ context_type }}
   name: demo
-  image: yardstick-trusty-server
+  {% if context_type == "Kubernetes" %}
+  servers:
+    demeter:
+      image: opnfv/yardstick-image-k8s
+      resources:
+        limits:
+          cpu: 1
+          memory: 1Gi
+        requests:
+          cpu: 1
+          memory: 1Gi
+      command: /bin/bash
+      args: ['-c', 'mkdir /root/.ssh; cp /tmp/.ssh/authorized_keys ~/.ssh/.;
+                    chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;
+                    while true ; do sleep 10000; done']
+  {% else %}
+  image: yardstick-image
   flavor: yardstick-flavor
-  user: ec2-user
+  user: ubuntu
 
   placement_groups:
     pgrp1:
@@ -40,6 +95,5 @@ context:
 
   networks:
     test:
-      cidr: '10.0.1.0/24'
-
-
+      cidr: "10.0.1.0/24"
+  {% endif %}