Fix QoS scenario

QoS performance scenario should run between 2 instances only.

Change-Id: I05d875d7f8e3a6811b6672ca9bb88b66dd8a5aea

shaker/scenarios/openstack/qos/perf_l2.yaml

@@ -3,13 +3,12 @@ title: OpenStack L2 QoS Performance
 description:
   In this scenario Shaker launches 1 pair of instances in the same tenant
   network. Each instance is hosted on a separate compute node. The traffic goes
-  within the tenant network (L2 domain). Neutron QoS feature is used to limit 
+  within the tenant network (L2 domain). Neutron QoS feature is used to limit
   traffic throughput to 10 Mbit/s.
 
 deployment:
   template: l2_qos.hot
-#  accommodation: [pair, single_room, compute_nodes: 2]
-  accommodation: [pair, double_room]
+  accommodation: [pair, single_room, compute_nodes: 2]
 
 execution:
   tests:
@@ -25,7 +24,6 @@ execution:
     class: iperf3
     sla:
     - "[type == 'agent'] >> (stats.bandwidth.avg < 11)"
-    - "[type == 'agent'] >> (stats.retransmits.max < 10)"
   -
     title: UDP
     class: iperf3
@@ -33,4 +31,4 @@ execution:
     bandwidth: 0
     datagram_size: 32
     sla:
-    - "[type == 'agent'] >> (stats.packets.avg < 40000)"
+    - "[type == 'agent'] >> (stats.packets.avg * (100 - stats.loss.avg) / 100 < 40000)"