Sonar: code clean up for functest

Misc code smell fixes.

Change-Id: I7645d008667e34c6244783717cf1731477ffc6c3
Issue-ID: VNFSDK-320
Signed-off-by: Kailun Qin <kailun.qin@intel.com>
14 files changed