Merge "port test_aggregates and test_hosts into nova v3 part2"