Merge "Modify handling Ixia traffic profile parameters"

author Abhijit Sinha <abhijit.sinha@intel.com>

Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)
author Abhijit Sinha <abhijit.sinha@intel.com>
Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)
diff --cc yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
Simple merge
diff --cc yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
Simple merge
author	Abhijit Sinha <abhijit.sinha@intel.com>
	Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 12 Oct 2018 15:16:55 +0000 (15:16 +0000)
		1	2
yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py	patch \|	diff1 \|	diff2 \|	blob \| history