From af3373c4d62b772a35322def38e8dfd1a66ff2e8 Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 20 Jan 2011 11:41:31 -0800 Subject: [PATCH] Deleted global config parameter direct.network.no.default.route that is no longer in use. --- server/src/com/cloud/configuration/Config.java | 1 - server/src/com/cloud/user/AccountManagerImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index dc32b45da9f..41225640431 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -59,7 +59,6 @@ public enum Config { MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null), NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed.", null), GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null), - DirectNetworkNoDefaultRoute("Network", ManagementServer.class, Boolean.class, "direct.network.no.default.route", "false", "Direct Network Dhcp Server should not send a default route", "true/false"), OvsNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.network", "false", "enable/disable open vswitch network", null), //VPN diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 655d6de54fe..af6e0290c06 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1508,7 +1508,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag return caller; } } else { - if (accountName == null || domainId == null) { + if ((accountName == null && domainId != null) || (accountName != null && domainId == null)) { throw new InvalidParameterValueException("AccountName and domainId must be specified together"); } //regular user can't create/list resources for other people