Skip to content

Commit 5a2f3a2

Browse files
daviftorresDaanHooglandnvazquez
authored andcommitted
Improve message "Network is unavailable. Please contact administrator" (apache#11981)
* Improve message "Network is unavailable. Please contact administrator" This trivial change provide more details for root administrators during troubleshooting. See discussion apache#11980 * Improve error message for unavailable guest network * Update engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com> * Fix and refactor --------- Co-authored-by: dahn <daan.hoogland@gmail.com> Co-authored-by: nvazquez <nicovazquez90@gmail.com>
1 parent 91280be commit 5a2f3a2

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,11 @@ public void start(final String vmUuid, final Map<VirtualMachineProfile.Param, Ob
942942
throw new CloudRuntimeException(String.format("Unable to start a VM [%s] due to [%s].", vmUuid, e.getMessage()), e).add(VirtualMachine.class, vmUuid);
943943
} catch (final ResourceUnavailableException e) {
944944
if (e.getScope() != null && e.getScope().equals(VirtualRouter.class)){
945-
throw new CloudRuntimeException("Network is unavailable. Please contact administrator", e).add(VirtualMachine.class, vmUuid);
945+
Account callingAccount = CallContext.current().getCallingAccount();
946+
String errorSuffix = (callingAccount != null && callingAccount.getType() == Account.Type.ADMIN) ?
947+
String.format("Failure: %s", e.getMessage()) :
948+
"Please contact administrator.";
949+
throw new CloudRuntimeException(String.format("The Network for VM %s is unavailable. %s", vmUuid, errorSuffix), e).add(VirtualMachine.class, vmUuid);
946950
}
947951
throw new CloudRuntimeException(String.format("Unable to start a VM [%s] due to [%s].", vmUuid, e.getMessage()), e).add(VirtualMachine.class, vmUuid);
948952
}

0 commit comments

Comments
 (0)