Merge "Fix QnQ issue"

author Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com>

Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)
author Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com>
Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)
diff --cc yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
Simple merge
diff --cc yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
Simple merge
diff --cc yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
Simple merge
diff --cc yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
Simple merge
author	Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com>
	Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 8 Feb 2019 16:14:30 +0000 (16:14 +0000)
		1	2
yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py	patch \|	diff1 \|	diff2 \|	blob \| history