Add availability_zone picking. Change flavor type return value.

Change-Id: I3f22aff9235a9e676cb1e525707e09c5dc43b486