Multiple changes for June release

- Change inittest in warmuptest. This has now a warmuptime, warmupspeed,
packet size and flow size.
- Change in centos.json. This will now also copy deploycentostools.sh
during image building so that it can be used to re-compile prox in the VM
by typing "./deploycentostools.sh compile"
- runrapid.py parameters needing a file name, need to be complete file
names: no extensions will be added any more by the scripts.
- Changes in createrapid.py to handel the openstack CLI output in a
simpler way.
- The management interface of the VMs can now also be an SRIOV interface.
We have now an extra optional parameter in the VM sections of the
rapiVMs.vms file: SRIOV_mgmt_port
- Changed the name of some sections and keys in the environment file since
runrapid.py will not always communicate to OpenStack VMs. This could be
containers or any other (virtual) machine.
- The previous MachineMap.cfg has been renamed to machine.map
- A new test has been added: monitorswap is just showing the statistics of
a swap (virtual) machine, without generating any packets. This is useful
in situations where an external tester is used.
- Latency and core statistics can now be measured even if there are
multiple PROX cores and tasks running. A new parameter has been added in
the test files with following default value: tasks=[0]. During the
collection of statistics, all tasks in this list will be queried. It is
ok to have a non-existing task in such a query since it will be ignored.
- A --screenlog parameter was added for runrapid.py allowing for more
detailed output on the screen during debugging. No need to check the log
file.
- Previous tests to run multiple packet size with a given flow size and to
run multiple flow size, with a given packet size are now combined by
specifiying 2 lists: packetsizes & flows
- The screen output of this test has also been reworked with more
meaningful column names and the test result is now in the field "core
received". This allows also for faster termination of the test: When the
all packets sent by Gen NIC are received by the cores within the
thresholds for packet loss and latency, the test is now stopped, even we
were requesting more packets to be sent.

Change-Id: I3307e7a972f2140e739f376f146fe875df0303e6
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 26 insertions, 27 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/README b/VNFs/DPPD-PROX/helper-scripts/rapid/README
index 43243a6c..cb3a4fd8 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/README
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/README
@@ -18,21 +18,21 @@ rapid (Rapid Automated Performance Indication for Dataplane)
 ************************************************************
 
 rapid is a set of files offering an easy way to do a sanity check of the
-dataplane performance of an OpenStack environment.
+dataplane performance of an OpenStack or container environment.
 
-Copy the files in a directory on a machine that can run the OpenStack CLI
-commands and that can reach the OpenStack networks to connect to the VMs.
+In case of OpenStack, copy the files in a directory on a machine that can run the OpenStack CLI
+commands and that can reach the networks to connect to the VMs.
 
 You will need an image that has the PROX tool installed.
 A good way to do this is to use the packer tool to build an image for a target of your choice.
-You can also build this image manually by executing all the commands described in the deploycentos.sh.
+You can also build this image manually by executing all the commands described in the deploycentostools.sh.
 The default name of the qcow2 file is rapidVM.qcow2
 
 When using the packer tool, the first step is to upload an
 existing CentOS cloud image from the internet into OpenStack.
 Check out: https://cloud.centos.org/centos/7/images/
 You should now source the proper .rc file so Packer can connect to your OpenStack.
-There are 2 files: centos.json and deploycentos.sh, allowing you to create
+There are 2 files: centos.json and deploycentostools.sh, allowing you to create
 an image automatically. Run
   # packer build centos.json
 Edit centos.json to reflect the settings of your environment: The following fields need to
@@ -46,7 +46,7 @@ be the ID's of your system:
   - "security_groups": ID of the security group being used
 
 Note that this procedure is not only installing the necessary tools to run PROX,
-but also does some system optimizations (tuned). Check deploycentos.sh for more details.
+but also does some system optimizations (tuned). Check deploycentostools.sh for more details.
 
 Now you can run the createrapid.py file. Use help for more info on the usage:
   # ./createrapid.py --help
@@ -106,44 +106,43 @@ different way (not using the createrapid.py). This can be useful in case you are
 not using OpenStack as a VIM or when using special configurations that cannot be
 achieved using createrapid.py. Fields needed for runrapid are:
 * all info in the [Mx] sections
-* the key information in the [OpenStack] section
+* the key information in the [ssh] section
 * the total_number_of_vms information in the [rapid] section
 
-[DEFAULT]
-admin_ip = none
+[rapid]
+loglevel = DEBUG
+version = 19.6.30
+total_number_of_machines = 3
 
 [M1]
 name = rapid-VM1
-admin_ip = 10.25.1.116
-dp_ip = 10.10.10.7
-dp_mac = fa:16:3e:59:b8:28
+admin_ip = 10.25.1.109
+dp_ip = 10.10.10.4
+dp_mac = fa:16:3e:25:be:25
 
 [M2]
 name = rapid-VM2
-admin_ip = 10.25.1.126
-dp_ip = 10.10.10.11
-dp_mac = fa:16:3e:c9:54:c7
+admin_ip = 10.25.1.110
+dp_ip = 10.10.10.7
+dp_mac = fa:16:3e:72:bf:e8
 
 [M3]
 name = rapid-VM3
-admin_ip = 10.25.1.108
+admin_ip = 10.25.1.125
 dp_ip = 10.10.10.15
-dp_mac = fa:16:3e:72:90:3e
+dp_mac = fa:16:3e:69:f3:e7
 
-[OpenStack]
-stack = rapid
-vms = rapidVMs
+[ssh]
 key = prox
+
+[Varia]
+vim = OpenStack
+stack = rapid
+vms = rapidVMs.vms
 image = rapidVM
 image_file = rapidVM.qcow2
 dataplane_network = dataplane-network
 subnet = dpdk-subnet
 subnet_cidr = 10.10.10.0/24
 internal_network = admin_internal_net
-floating_network = floating-ip-net
-
-[rapid]
-loglevel = DEBUG
-version = 19.4.15
-total_number_of_machines = 3
-
+floating_network = admin_floating_net