Merge "Fixed the calculation of dropped packets and other changes"

11 files changed, 142 insertions, 93 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMrapid.yaml b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMrapid.yaml
index 44099d9d..8424897b 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMrapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMrapid.yaml
@@ -47,11 +47,15 @@ parameters:
     label: Floating network name or ID
     description: Public Network to attach instance to.
     default: admin_floating_net
-  availability_zone:
+  vm1_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
-  vm1_availability_zone:
+  vm2_availability_zone:
+    type: string
+    description: The Availability Zone to launch the instance.
+    default: nova
+  vm3_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
@@ -106,7 +110,7 @@ resources:
   vm2:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm2_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
@@ -135,7 +139,7 @@ resources:
   vm3:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm3_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMsriovrapid.yaml b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMsriovrapid.yaml
index 0ad39b8a..0037d27d 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMsriovrapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/3VMsriovrapid.yaml
@@ -47,11 +47,15 @@ parameters:
     label: Floating network name or ID
     description: Public Network to attach instance to.
     default: admin_floating_net
-  availability_zone:
+  vm1_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
-  vm1_availability_zone:
+  vm2_availability_zone:
+    type: string
+    description: The Availability Zone to launch the instance.
+    default: nova
+  vm3_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
@@ -106,7 +110,7 @@ resources:
   vm2:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm2_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
@@ -129,7 +133,7 @@ resources:
   vm3:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm3_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
index 4a94c35f..58851cce 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
@@ -25,7 +25,7 @@ script_control = false
 group1cores = not_used
 group2cores = not_used
 group3cores = not_used
-drop_rate_treshold = 1
+drop_rate_treshold = 0.01
 accuracy = 0.01
 
 
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/createrapid.py b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/createrapid.py
index f40cc8b8..867ce324 100755
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/createrapid.py
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/createrapid.py
@@ -31,7 +31,7 @@ from logging import handlers
 from prox_ctrl import prox_ctrl
 import ConfigParser
 
-version="18.2.3"
+version="18.2.12"
 stack = "rapid" #Default string for stack
 yaml = "rapid.yaml" #Default string for yaml file
 key = "prox" # This is also the default in the yaml file....
@@ -43,6 +43,9 @@ subnet = "dpdk-subnet" #subnet for dataplane
 subnet_cidr="10.10.10.0/24" # cidr for dataplane
 internal_network="admin_internal_net"
 floating_network="admin_floating_net"
+vm1_availability_zone="nova"
+vm2_availability_zone="nova"
+vm3_availability_zone="nova"
 loglevel="DEBUG" # sets log level for writing to file
 runtime=10 # time in seconds for 1 test run
 
@@ -59,6 +62,9 @@ def usage():
 	print("                   [--subnet_cidr SUBNET_CIDR]")
 	print("                   [--internal_network ADMIN_NETWORK]")
 	print("                   [--floating_network ADMIN_NETWORK]")
+	print("                   [--vm1_availability_zone ZONE_FOR_VM1]")
+	print("                   [--vm2_availability_zone ZONE_FOR_VM2]")
+	print("                   [--vm3_availability_zone ZONE_FOR_VM3]")
 	print("                   [--log DEBUG|INFO|WARNING|ERROR|CRITICAL")
 	print("                   [-h] [--help]")
 	print("")
@@ -77,6 +83,9 @@ def usage():
 	print("  --subnet_cidr SUBNET_CIDR  	Specify the subnet CIDR to be used for the dataplane. Default is %s."%subnet_cidr)
 	print("  --internal_network NETWORK 	Specify the network name to be used for the control plane. Default is %s."%internal_network)
 	print("  --floating_network NETWORK 	Specify the external floating ip network name. Default is %s. NO if no floating ip used."%floating_network)
+	print("  --vm1_availability_zone ZONE 	Specify the availability zone for VM1. Default is %s."%vm1_availability_zone)
+	print("  --vm2_availability_zone ZONE 	Specify the availability zone for VM2. Default is %s."%vm2_availability_zone)
+	print("  --vm3_availability_zone ZONE 	Specify the availability zone for VM3. Default is %s."%vm3_availability_zone)
 	print("  --log				Specify logging level for log file output, screen output level is hard coded")
 	print("  -h, --help               	Show help message and exit.")
 	print("")
@@ -85,7 +94,7 @@ def usage():
 	print("Note that %s is the default stack name. Replace with STACK_NAME if needed"%stack)
 
 try:
-	opts, args = getopt.getopt(sys.argv[1:], "vh", ["version","help", "yaml=","stack=","key=","flavor=","image=","image_file=","dataplane_network=","subnet=","subnet_cidr=","internal_network=","floating_network=","log="])
+	opts, args = getopt.getopt(sys.argv[1:], "vh", ["version","help", "yaml=","stack=","key=","flavor=","image=","image_file=","dataplane_network=","subnet=","subnet_cidr=","internal_network=","floating_network=","vm1_availability_zone=","vm2_availability_zone=","vm3_availability_zone=","log="])
 except getopt.GetoptError as err:
 	print("===========================================")
 	print(str(err))
@@ -135,6 +144,15 @@ for opt, arg in opts:
 	elif opt in ("--floating_network"):
 		floating_network = arg
 		print ("Using floating ip network: "+ floating_network)
+	elif opt in ("--vm1_availability_zone"):
+		vm1_availability_zone = arg
+		print ("Using VM1 availability zone: "+ vm1_availability_zone)
+	elif opt in ("--vm2_availability_zone"):
+		vm2_availability_zone = arg
+		print ("Using VM2 availability zone: "+ vm2_availability_zone)
+	elif opt in ("--vm3_availability_zone"):
+		vm3_availability_zone = arg
+		print ("Using VM3 availability zone: "+ vm3_availability_zone)
 	elif opt in ("--log"):
 		loglevel = arg
 		print ("Log level: "+ loglevel)
@@ -279,7 +297,7 @@ else:
 	cmd = cmd + ' |grep "name " | tr -s " " | cut -d" " -f 4'
 	FlavorExist = subprocess.check_output(cmd , shell=True).strip()
 	if FlavorExist == flavor:
-		cmd = 'openstack flavor set '+ flavor +' --property hw:mem_page_size="large" --property hw:cpu_policy="dedicated" --property hw:cpu_threads_policy="isolate"'
+		cmd = 'openstack flavor set '+ flavor +' --property hw:mem_page_size="large" --property hw:cpu_policy="dedicated" --property hw:cpu_thread_policy="isolate"'
 		log.debug(cmd)
 		subprocess.check_call(cmd , shell=True)
 		log.info("Flavor created")
@@ -335,7 +353,7 @@ cmd = cmd+' |grep "stack_status " | tr -s " " | cut -d"|" -f 3'
 StackRunning = subprocess.check_output(cmd , shell=True).strip()
 if StackRunning == '':
 	log.info('Creating Stack ...')
-	cmd = 'openstack stack create -t '+ yaml +  ' --parameter flavor="'+flavor  +'" --parameter key="'+ key + '" --parameter image="'+image  + '" --parameter dataplane_network="'+dataplane_network+ '" --parameter internal_network="'+internal_network+'" --parameter floating_network="'+floating_network+'" --wait '+stack 
+	cmd = 'openstack stack create -t '+ yaml +  ' --parameter flavor="'+flavor  +'" --parameter key="'+ key + '" --parameter image="'+image  + '" --parameter dataplane_network="'+dataplane_network+ '" --parameter internal_network="'+internal_network+'" --parameter floating_network="'+floating_network+'" --parameter vm1_availability_zone="'+vm1_availability_zone+'" --parameter vm2_availability_zone="'+vm2_availability_zone+'" --parameter vm3_availability_zone="'+vm3_availability_zone+'" --wait '+stack 
 	log.debug(cmd)
 	cmd = cmd + ' |grep "stack_status " | tr -s " " | cut -d"|" -f 3'
 	StackRunning = subprocess.check_output(cmd , shell=True).strip()
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen.cfg b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen.cfg
index 7ef0159c..a87ce758 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen.cfg
@@ -43,8 +43,8 @@ mode=gen
 sub mode=l3
 tx port=p0
 bps=1250000000
-pkt inline=00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 10 55 7b
-pkt size=50
+pkt inline=00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 00 2e 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 1a 55 7b
+pkt size=60
 ;gateway ipv4=${gw_ip}
 local ipv4=${local_ip}
 min bulk size=$mbs
@@ -52,6 +52,9 @@ max bulk size=16
 drop=no
 lat pos=42
 accuracy pos=46
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
 
 [core ${group2}]
 name=lat
@@ -61,5 +64,7 @@ sub mode=l3
 rx port=p0
 lat pos=42
 accuracy pos=46
-
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
 
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen_gw.cfg b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen_gw.cfg
index 2e900dcf..7feaa7fd 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen_gw.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/gen_gw.cfg
@@ -43,8 +43,8 @@ mode=gen
 sub mode=l3
 tx port=p0
 bps=1250000000
-pkt inline=00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 10 55 7b
-pkt size=50
+pkt inline=00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 00 2e 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 1a 55 7b
+pkt size=60
 gateway ipv4=${gw_ip}
 local ipv4=${local_ip}
 min bulk size=$mbs
@@ -52,6 +52,9 @@ max bulk size=16
 drop=no
 lat pos=42
 accuracy pos=46
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
 
 [core ${group2}]
 name=lat
@@ -61,5 +64,6 @@ sub mode=l3
 rx port=p0
 lat pos=42
 accuracy pos=46
-
-
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/l2gen.cfg b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/l2gen.cfg
index bf8b6ded..1347c3b2 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/l2gen.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/l2gen.cfg
@@ -42,20 +42,27 @@ task=0
 mode=gen
 tx port=p0
 bps=1250000000
-pkt inline=${dest_hex_mac} 00 00 00 00 00 00 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 10 55 7b
-pkt size=50
+pkt inline=${dest_hex_mac} 00 00 00 00 00 00 08 00 45 00 00 2e 00 01 00 00 40 11 f7 7d ${local_hex_ip} ${dest_hex_ip} 0b b8 0b b9 00 1a 55 7b
+pkt size=60
+;gateway ipv4=${gw_ip}
+local ipv4=${local_ip}
 min bulk size=$mbs
 max bulk size=16
 drop=no
 lat pos=42
 accuracy pos=46
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
 
 [core ${group2}]
 name=lat
 task=0
 mode=lat
+sub mode=l3
 rx port=p0
 lat pos=42
 accuracy pos=46
-
-
+packet id pos=50
+signature=0x6789abcd
+signature pos=56
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
index a5da4e28..86efa892 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
@@ -47,11 +47,15 @@ parameters:
     label: Floating network name or ID
     description: Public Network to attach instance to.
     default: admin_floating_net
-  availability_zone:
+  vm1_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
-  vm1_availability_zone:
+  vm2_availability_zone:
+    type: string
+    description: The Availability Zone to launch the instance.
+    default: nova
+  vm3_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
@@ -106,7 +110,7 @@ resources:
   vm2:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm2_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
@@ -135,7 +139,7 @@ resources:
 #  vm3:
 #    type: OS::Nova::Server
 #    properties:
-#      availability_zone: { get_param: availability_zone }
+#      availability_zone: { get_param: vm3_availability_zone }
 #      user_data:
 #        get_file: prox_user_data.sh
 #      key_name: { get_param: key }
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/runrapid.py b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/runrapid.py
index 7bbfa2a7..fca7a573 100755
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/runrapid.py
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/runrapid.py
@@ -37,12 +37,14 @@ env = "rapid" #Default string for environment
 test = "basicrapid" #Default string for test
 loglevel="DEBUG" # sets log level for writing to file
 runtime=10 # time in seconds for 1 test run
+configonly = False # IF True, the system will upload all the necessary config fiels to the VMs, but not start PROX and the actual testing
 
 def usage():
 	print("usage: runrapid    [--version] [-v]")
 	print("                   [--env ENVIRONMENT_NAME]")
 	print("                   [--test TEST_NAME]")
 	print("                   [--runtime TIME_FOR_TEST]")
+	print("                   [--configonly False|True]")
 	print("                   [--log DEBUG|INFO|WARNING|ERROR|CRITICAL]")
 	print("                   [-h] [--help]")
 	print("")
@@ -53,12 +55,13 @@ def usage():
 	print("  --env ENVIRONMENT_NAME       	Parameters will be read from ENVIRONMENT_NAME.env Default is %s."%env)
 	print("  --test TEST_NAME       	Test cases will be read from TEST_NAME.test Default is %s."%test)
 	print("  --runtime			Specify time in seconds for 1 test run")
+	print("  --configonly			If True, only upload all config files to the VMs, do not run the tests. Default is %s."%configonly)
 	print("  --log				Specify logging level for log file output, screen output level is hard coded")
 	print("  -h, --help               	Show help message and exit.")
 	print("")
 
 try:
-	opts, args = getopt.getopt(sys.argv[1:], "vh", ["version","help", "env=", "test=","runtime=","log="])
+	opts, args = getopt.getopt(sys.argv[1:], "vh", ["version","help", "env=", "test=","runtime=","configonly=","log="])
 except getopt.GetoptError as err:
 	print("===========================================")
 	print(str(err))
@@ -84,6 +87,9 @@ for opt, arg in opts:
 	if opt in ("--runtime"):
 		runtime = arg
 		print ("Runtime: "+ runtime)
+	if opt in ("--configonly"):
+		configonly = arg
+		print ("configonly: "+ configonly)
 	if opt in ("--log"):
 		loglevel = arg
 		print ("Log level: "+ loglevel)
@@ -178,6 +184,7 @@ def connect_client(client):
 def run_iteration(gensock,sutsock):
 	sleep_time = 2
 	# Sleep_time is needed to be able to do accurate measurements to check for packet loss. We need to make this time large enough so that we do not take the first measurement while some packets from the previous tests migth still be in flight
+	time.sleep(sleep_time)
 	abs_old_rx, abs_old_tx, abs_old_drop, abs_old_tsc, abs_tsc_hz = gensock.core_stats(genstatcores)
 	gensock.start(gencores)
 	time.sleep(sleep_time)
@@ -214,7 +221,7 @@ def run_iteration(gensock,sutsock):
 	if (tx == 0):
         	log.critical("TX = 0. Test interrupted since no packet has been sent.")
 		raise Exception("TX = 0")
-	return(pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,abs_dropped)
+	return(pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,lat_max,abs_dropped,(abs_new_tx - abs_old_tx))
 
 def new_speed(speed,minspeed,maxspeed,success):
 	# Following calculates the ratio for the new speed to be applied
@@ -239,31 +246,20 @@ def new_speed(speed,minspeed,maxspeed,success):
 def get_pps(speed,size):
 	return (speed * 100.0 / (8*(size+24)))
 
-def get_drop_rate(speed,pps_rx,size):
-	# pps_rx are all the packets that are received by the generator. That is substracted
-	# from the pps that we wanted to send. This is calculated by taking the variable speed
-	# which is the requested percentage of a 10Gb/s link. So we take  10000bps (10Gbps, note
-	# that the speed variable is already expressed in % so we only take 100 and not 10000)
-	# divided by the number of bits in 1 packet. That is 8 bits in a byte times the size of
-	# a frame (=our size + 24 bytes overhead).
-	tried_to_send = get_pps(speed,size)
-	return abs(100.0*(tried_to_send - pps_rx)/tried_to_send)
-
 def run_speedtest(gensock,sutsock):
-        log.info("+-------------------------------------------------------------------------------------------------------------------------------------------------------------+")
-        log.info("| Generator is sending UDP (1 flow) packets (64 bytes) to SUT. SUT sends packets back                                                                         |")
-        log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+-------------------------+")
-        log.info("| Test   |  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Packets Lost  | Loss Ratio | Result     |")
-        log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
-	speed = 100
-	maxspeed = speed
+        log.info("+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+")
+        log.info("| Generator is sending UDP (1 flow) packets (64 bytes) to SUT. SUT sends packets back                                                                                          |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
+	log.info("| Test   |  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Max. Latency  |  Packets Lost  | Loss Ratio | Result     |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
+	maxspeed = speed = 100
 	minspeed = 0
 	size=60
 	attempts = 0
 	endpps_sut_tx_str = 'NO_RESULTS'
 	gensock.set_size(gencores,0,size) # This is setting the frame size
-	gensock.set_value(gencores,0,16,(size-18),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
-	gensock.set_value(gencores,0,38,(size-38),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
+	gensock.set_value(gencores,0,16,(size-14),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
+	gensock.set_value(gencores,0,38,(size-34),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
 	# This will only work when using sending UDP packets. For different protocls and ehternet types, we would need a differnt calculation
         while (maxspeed-minspeed > ACCURACY):
                 attempts += 1
@@ -273,44 +269,44 @@ def run_speedtest(gensock,sutsock):
                 gensock.speed(speed, gencores)
                 time.sleep(1)
                 # Get statistics now that the generation is stable and NO ARP messages any more
-		pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,abs_dropped = run_iteration(gensock,sutsock)
-		drop_rate = get_drop_rate(speed,pps_rx,size)
-	        if (drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0):
-	                log.info('|{:>7}'.format(str(attempts))+" | " + '{:>5.1f}'.format(speed) + '% ' +'{:>6.3f}'.format(get_pps(speed,size)) + ' Mpps | '+ '{:>9.3f}'.format(pps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(pps_tx) +' Mpps | ' + '{:>9}'.format(pps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(pps_rx)+' Mpps | '+ '{:>9.0f}'.format(lat_avg)+' us   | '+ '{:>14d}'.format(abs_dropped)+ ' |''{:>9.2f}'.format(drop_rate)+ '%  | SUCCESS    |')
+		pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,lat_max, abs_dropped, abs_tx = run_iteration(gensock,sutsock)
+		drop_rate = 100.0*abs_dropped/abs_tx
+        	if ((get_pps(speed,size) - pps_tx)/pps_tx)<0.001 and ((drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0)):
+	                log.info('|{:>7}'.format(str(attempts))+" | " + '{:>5.1f}'.format(speed) + '% ' +'{:>6.3f}'.format(get_pps(speed,size)) + ' Mpps | '+ '{:>9.3f}'.format(pps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(pps_tx) +' Mpps | ' + '{:>9}'.format(pps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(pps_rx)+' Mpps | '+ '{:>9.0f}'.format(lat_avg)+' us   | '+  '{:>9.0f}'.format(lat_max)+' us   | '+ '{:>14d}'.format(abs_dropped)+ ' |''{:>9.2f}'.format(drop_rate)+ '%  | SUCCESS    |')
 			endspeed = speed
 			endpps_req_tx = pps_req_tx
 			endpps_tx = pps_tx
 			endpps_sut_tx_str = pps_sut_tx_str
 			endpps_rx = pps_rx
 			endlat_avg = lat_avg
+			endlat_max = lat_max
 			endabs_dropped = abs_dropped
 			enddrop_rate = drop_rate
 			success = True 
 	        else:
-	                log.info('|{:>7}'.format(str(attempts))+" | " + '{:>5.1f}'.format(speed) + '% ' +'{:>6.3f}'.format(get_pps(speed,size)) + ' Mpps | '+ '{:>9.3f}'.format(pps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(pps_tx) +' Mpps | ' + '{:>9}'.format(pps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(pps_rx)+' Mpps | '+ '{:>9.0f}'.format(lat_avg)+' us   | '+ '{:>14d}'.format(abs_dropped)+ ' |''{:>9.2f}'.format(drop_rate)+ '%  | FAILED     |')
+	                log.info('|{:>7}'.format(str(attempts))+" | " + '{:>5.1f}'.format(speed) + '% ' +'{:>6.3f}'.format(get_pps(speed,size)) + ' Mpps | '+ '{:>9.3f}'.format(pps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(pps_tx) +' Mpps | ' + '{:>9}'.format(pps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(pps_rx)+' Mpps | '+ '{:>9.0f}'.format(lat_avg)+' us   | '+ '{:>9.0f}'.format(lat_max)+' us   | '+ '{:>14d}'.format(abs_dropped)+ ' |''{:>9.2f}'.format(drop_rate)+ '%  | FAILED     |')
 			success = False 
 		speed,minspeed,maxspeed = new_speed(speed,minspeed,maxspeed,success)
 	if endpps_sut_tx_str <>  'NO_RESULTS':
-        	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
-                log.info('|{:>7}'.format('END')+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+ '{:>14d}'.format(endabs_dropped)+ ' |''{:>9.2f}'.format(enddrop_rate)+ '%  | SUCCESS    |')
-        	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
+		log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
+                log.info('|{:>7}'.format('END')+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+ '{:>9.0f}'.format(endlat_max)+' us   | '+'{:>14d}'.format(endabs_dropped)+ ' |''{:>9.2f}'.format(enddrop_rate)+ '%  | SUCCESS    |')
+		log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+------------+")
 	else:
 		log.info('| Speed 0 or close to 0')
 
 def run_flowtest(gensock,sutsock):
-	log.info("+------------------------------------------------------------------------------------------------------------------------------------------------+")
-	log.info("| UDP, 64 bytes, different number of flows by randomizing SRC & DST UDP port                                                                     |")
-        log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
-        log.info("| Flows  |  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Packets Lost  | Loss Ratio |")
-        log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
-	speed = 100
+	log.info("+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+")
+	log.info("| UDP, 64 bytes, different number of flows by randomizing SRC & DST UDP port                                                                                      |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
+	log.info("| Flows  |  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Max. Latency  |  Packets Lost  | Loss Ratio |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
 	size=60
 	# To generate a desired number of flows, PROX will randomize the bits in source and destination ports, as specified by the bit masks in the flows variable. 
 	flows={128:['1000000000000XXX','100000000000XXXX'],1024:['10000000000XXXXX','10000000000XXXXX'],8192:['1000000000XXXXXX','100000000XXXXXXX'],65535:['10000000XXXXXXXX','10000000XXXXXXXX'],524280:['1000000XXXXXXXXX','100000XXXXXXXXXX']}
 #	flows={524280:['1000000XXXXXXXXX','100000XXXXXXXXXX']}
 	gensock.set_size(gencores,0,size) # This is setting the frame size
-	gensock.set_value(gencores,0,16,(size-18),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
-	gensock.set_value(gencores,0,38,(size-38),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
+	gensock.set_value(gencores,0,16,(size-14),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
+	gensock.set_value(gencores,0,38,(size-34),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
 	# This will only work when using sending UDP packets. For different protocls and ehternet types, we would need a differnt calculation
 	for flow_number in sorted(flows.iterkeys()):
 		#speed = 100 Commented out: Not starting from 100% since we are trying more flows, so speed will not be higher than the speed achieved in previous loop
@@ -321,7 +317,7 @@ def run_flowtest(gensock,sutsock):
 		gensock.set_random(gencores,0,34,source_port,2)
 		gensock.set_random(gencores,0,36,destination_port,2)
 		endpps_sut_tx_str = 'NO_RESULTS'
-		maxspeed = speed
+		maxspeed = speed = 100
 		minspeed = 0
 		while (maxspeed-minspeed > ACCURACY):
 			print(str(flow_number)+' flows: Measurement ongoing at speed: ' + str(round(speed,2)) + '%      ',end='\r')
@@ -330,15 +326,16 @@ def run_flowtest(gensock,sutsock):
 			gensock.speed(speed, gencores)
 			time.sleep(1)
 			# Get statistics now that the generation is stable and NO ARP messages any more
-			pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,abs_dropped = run_iteration(gensock,sutsock)
-			drop_rate = get_drop_rate(speed,pps_rx,size)
-	        	if (drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0):
+			pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,lat_max, abs_dropped, abs_tx = run_iteration(gensock,sutsock)
+			drop_rate = 100.0*abs_dropped/abs_tx
+	        	if ((get_pps(speed,size) - pps_tx)/pps_tx)<0.001 and ((drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0)):
 				endspeed = speed
 				endpps_req_tx = pps_req_tx
 				endpps_tx = pps_tx
 				endpps_sut_tx_str = pps_sut_tx_str
 				endpps_rx = pps_rx
 				endlat_avg = lat_avg 
+				endlat_max = lat_max 
 				endabs_dropped = abs_dropped
 				enddrop_rate = drop_rate
 				success = True
@@ -346,18 +343,17 @@ def run_flowtest(gensock,sutsock):
 				success = False 
 			speed,minspeed,maxspeed = new_speed(speed,minspeed,maxspeed,success)
 		if endpps_sut_tx_str <>  'NO_RESULTS':
-                	log.info('|{:>7}'.format(str(flow_number))+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+ '{:>14d}'.format(endabs_dropped)+ ' |'+'{:>9.2f}'.format(enddrop_rate)+ '% |')
-        		log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
+                	log.info('|{:>7}'.format(str(flow_number))+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+ '{:>9.0f}'.format(endlat_max)+' us   | '+ '{:>14d}'.format(endabs_dropped)+ ' |'+'{:>9.2f}'.format(enddrop_rate)+ '%  |')
+			log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
 		else:
 			log.info('|{:>7}'.format(str(flow_number))+" | Speed 0 or close to 0")
 
 def run_sizetest(gensock,sutsock):
-	log.info("+------------------------------------------------------------------------------------------------------------------------------------------------+")
-	log.info("| UDP, 1 flow, different packet sizes                                                                                                            |")
-	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
-	log.info("| Pktsize|  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Packets Lost  | Loss Ratio |")
-	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
-	speed = 100
+	log.info("+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+")
+	log.info("| UDP, 1 flow, different packet sizes                                                                                                                             |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
+	log.info("| Pktsize|  Speed requested   | Sent to NIC    |  Sent by Gen   | Forward by SUT |  Rec. by Gen   |  Avg. Latency  |  Max. Latency  |  Packets Lost  | Loss Ratio |")
+	log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
 	# PROX will use different packet sizes as defined in sizes[]
 #	sizes=[1496,1020,508,252,124,60]
 	sizes=[1020,508,252,124,60]
@@ -367,11 +363,11 @@ def run_sizetest(gensock,sutsock):
 		if sutsock!='none':
 			sutsock.reset_stats()
 		gensock.set_size(gencores,0,size) # This is setting the frame size
-		gensock.set_value(gencores,0,16,(size-18),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
-		gensock.set_value(gencores,0,38,(size-38),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
+		gensock.set_value(gencores,0,16,(size-14),2) # 18 is the difference between the frame size and IP size = size of (MAC addresses, ethertype and FCS)
+		gensock.set_value(gencores,0,38,(size-34),2) # 38 is the difference between the frame size and UDP size = 18 + size of IP header (=20)
 		# This will only work when using sending UDP packets. For different protocls and ehternet types, we would need a differnt calculation
 		endpps_sut_tx_str = 'NO_RESULTS'
-		maxspeed = speed
+		maxspeed = speed = 100
 		minspeed = 0
 		while (maxspeed-minspeed > ACCURACY):
 			print(str(size+4)+' bytes: Measurement ongoing at speed: ' + str(round(speed,2)) + '%      ',end='\r')
@@ -379,15 +375,16 @@ def run_sizetest(gensock,sutsock):
 			# Start generating packets at requested speed (in % of a 10Gb/s link)
 			gensock.speed(speed, gencores)
 			# Get statistics now that the generation is stable and NO ARP messages any more
-			pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg, abs_dropped = run_iteration(gensock,sutsock)
-			drop_rate = get_drop_rate(speed,pps_rx,size)
-	        	if (drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0):
+			pps_req_tx,pps_tx,pps_sut_tx_str,pps_rx,lat_avg,lat_max, abs_dropped, abs_tx = run_iteration(gensock,sutsock)
+			drop_rate = 100.0*abs_dropped/abs_tx
+	        	if ((get_pps(speed,size) - pps_tx)/pps_tx)<0.001 and ((drop_rate < DROP_RATE_TRESHOLD) or (abs_dropped==DROP_RATE_TRESHOLD ==0)):
 				endspeed = speed
 				endpps_req_tx = pps_req_tx
 				endpps_tx = pps_tx
 				endpps_sut_tx_str = pps_sut_tx_str
 				endpps_rx = pps_rx
 				endlat_avg = lat_avg 
+				endlat_max = lat_max 
 				endabs_dropped = abs_dropped
 				enddrop_rate = drop_rate
 				success = True
@@ -395,8 +392,8 @@ def run_sizetest(gensock,sutsock):
 				success = False 
 			speed,minspeed,maxspeed = new_speed(speed,minspeed,maxspeed,success)
 		if endpps_sut_tx_str <>  'NO_RESULTS':
-                	log.info('|{:>7}'.format(size+4)+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+ '{:>14d}'.format(endabs_dropped)+ ' |'+'{:>9.2f}'.format(enddrop_rate)+ '% |')
-        		log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
+                	log.info('|{:>7}'.format(size+4)+" | " + '{:>5.1f}'.format(endspeed) + '% ' +'{:>6.3f}'.format(get_pps(endspeed,size)) + ' Mpps | '+ '{:>9.3f}'.format(endpps_req_tx)+' Mpps | '+ '{:>9.3f}'.format(endpps_tx) +' Mpps | ' + '{:>9}'.format(endpps_sut_tx_str) +' Mpps | '+ '{:>9.3f}'.format(endpps_rx)+' Mpps | '+ '{:>9.0f}'.format(endlat_avg)+' us   | '+'{:>9.0f}'.format(endlat_max)+' us   | '+ '{:>14d}'.format(endabs_dropped)+ ' |'+'{:>9.2f}'.format(enddrop_rate)+ '%  |')
+        		log.info("+--------+--------------------+----------------+----------------+----------------+----------------+----------------+----------------+----------------+------------+")
 		else:
 			log.debug('|{:>7}'.format(str(size))+" | Speed 0 or close to 0")
 
@@ -552,9 +549,11 @@ for vm in range(0, int(required_number_of_VMs)):
 		cmd = '/root/prox/build/prox -e -t -o cli -f /root/%s'%config_file[vm]
 	else:
 		cmd = '/root/prox/build/prox -t -o cli -f /root/%s'%config_file[vm]
-	client[-1].fork_cmd(cmd, 'PROX Testing on VM%d'%(vm+1))
-	sock.append(connect_socket(client[-1]))
-
+	if configonly == False:
+		client[-1].fork_cmd(cmd, 'PROX Testing on VM%d'%(vm+1))
+		sock.append(connect_socket(client[-1]))
+if configonly:
+	sys.exit()
 init_code = testconfig.get('DEFAULT', 'init_code')
 if init_code <> 'not_used':
 	eval(init_code)
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/secgw.test b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/secgw.test
index 4db089f9..fed1e375 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/secgw.test
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/secgw.test
@@ -25,7 +25,7 @@ script_control = false
 group1cores = not_used
 group2cores = not_used
 group3cores = not_used
-drop_rate_treshold = 1
+drop_rate_treshold = 0.01
 accuracy = 0.01
 
 [VM1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/sriovrapid.yaml b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/sriovrapid.yaml
index 3bfca4ed..36d7544b 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/sriovrapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/sriovrapid.yaml
@@ -47,14 +47,18 @@ parameters:
     label: Floating network name or ID
     description: Public Network to attach instance to.
     default: admin_floating_net
-  availability_zone:
+  vm1_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
-  vm1_availability_zone:
+  vm2_availability_zone:
     type: string
     description: The Availability Zone to launch the instance.
     default: nova
+#  vm3_availability_zone:
+#    type: string
+#    description: The Availability Zone to launch the instance.
+#    default: nova
   vm1_sriov_port:
     type: string
     description: The sriov port to be used by VM1
@@ -106,7 +110,7 @@ resources:
   vm2:
     type: OS::Nova::Server
     properties:
-      availability_zone: { get_param: availability_zone }
+      availability_zone: { get_param: vm2_availability_zone }
       user_data:
         get_file: prox_user_data.sh
       key_name: { get_param: key }
@@ -129,7 +133,7 @@ resources:
 #  vm3:
 #    type: OS::Nova::Server
 #    properties:
-#      availability_zone: { get_param: availability_zone }
+#      availability_zone: { get_param: vm3_availability_zone }
 #      user_data:
 #        get_file: prox_user_data.sh
 #      key_name: { get_param: key }