Replaced hardcoded values with variables.
Replaced hardcoded values with variables.

Signed-off-by: Konstantina Chremmou <a7d1f757a659045fb6db8c1e3849a1c8ad00b97a@citrix.com>

srowe/xen-api,srowe/xen-api,srowe/xen-api,srowe/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,srowe/xen-api