fix ips to 'ips' in APIRouter

Actually ips in `ips in init_only` would not be valued as True because
ips is a moudle object not a string. Fixing this to string 'ips' could
prevent potential issues and improve readability.

Change-Id: I74564349e1fef00e7430cfb0547b3ad87c8e471c
XenAPI: Report the CPU details correctly

Driver was not filling in the cpu_count in the correct field.
Also added VM vcpu count

Change-Id: I6339d7fd4faffcd5320fd86b55ff3a5e3515e2bf
Closes-bug: 1192528
Merge "fix ips to 'ips' in APIRouter"
Merge "XenAPI: Report the CPU details correctly"