From 313ae1f44978462052726de4a3dbc7479a7381f2 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 1 Feb 2021 09:45:47 +0100 Subject: [PATCH] server: fix wrong error message when create isolated network without SourceNat (#4624) This PR fixes wrong message when create isolated network without SourceNat. --- .../engine/orchestration/NetworkOrchestrator.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 363d38eebd0..560ca50ec8c 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -2412,8 +2412,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra && (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))); if (cidr == null && ip6Cidr == null && cidrRequired) { - throw new InvalidParameterValueException("StartIp/endIp/gateway/netmask are required when create network of" + " type " + Network.GuestType.Shared - + " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled"); + if (ntwkOff.getGuestType() == GuestType.Shared) { + throw new InvalidParameterValueException("StartIp/endIp/gateway/netmask are required when create network of" + " type " + Network.GuestType.Shared); + } else { + throw new InvalidParameterValueException("gateway/netmask are required when create network of" + " type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled"); + } } checkL2OfferingServices(ntwkOff);