Merge "Test for the nova diagnostics API"