You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/06/20 19:39:27 UTC
[1/2] git commit: updated refs/heads/master-6-17-stable to db4969e
Updated Branches:
refs/heads/master-6-17-stable 0e548d848 -> db4969e3d
CLOUDSTACK-3091: expect UUID instead of actual DB id, when read internallbvm.service.offering global config
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/121c1c72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/121c1c72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/121c1c72
Branch: refs/heads/master-6-17-stable
Commit: 121c1c72d8185adf2a19eb7da1e18cc340d9e525
Parents: 0e548d8
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 20 10:06:33 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Jun 20 10:39:13 2013 -0700
----------------------------------------------------------------------
.../lb/InternalLoadBalancerVMManagerImpl.java | 19 ++++++++++++++-----
server/src/com/cloud/configuration/Config.java | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/121c1c72/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
index d0a9771..2bdb28f 100644
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
+++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -129,7 +129,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
private String _instance;
private String _mgmtHost;
private String _mgmtCidr;
- private long _internalLbVmOfferingId;
+ private long _internalLbVmOfferingId = 0L;
@Inject VirtualMachineManager _itMgr;
@Inject DomainRouterDao _internalLbVmDao;
@@ -394,10 +394,19 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
_mgmtHost = configs.get("host");
_mgmtCidr = _configDao.getValue(Config.ManagementNetwork.key());
- String offIdStr = configs.get(Config.InternalLbVmServiceOfferingId.key());
- if (offIdStr != null && !offIdStr.isEmpty()) {
- _internalLbVmOfferingId = Long.parseLong(offIdStr);
- } else {
+ String offUUID = configs.get(Config.InternalLbVmServiceOfferingId.key());
+ if (offUUID != null && !offUUID.isEmpty()) {
+ //get the id by offering UUID
+ ServiceOfferingVO off = _serviceOfferingDao.findByUuid(offUUID);
+ if (off != null) {
+ _internalLbVmOfferingId = off.getId();
+ } else {
+ s_logger.warn("Invalid offering UUID is passed in " + Config.InternalLbVmServiceOfferingId.key() + "; the default offering will be used instead");
+ }
+ }
+
+ //if offering wasn't set, try to get the default one
+ if (_internalLbVmOfferingId == 0L) {
boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key()));
ServiceOfferingVO newOff = new ServiceOfferingVO("System Offering For Internal LB VM", 1, InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_RAMSIZE, InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_CPU_MHZ, null,
null, true, null, useLocalStorage, true, null, true, VirtualMachine.Type.InternalLoadBalancerVm, true);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/121c1c72/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 827b9bb..2b0ffaf 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -422,7 +422,7 @@ public enum Config {
BlacklistedRoutes("Advanced", VpcManager.class, String.class, "blacklisted.routes", null, "Routes that are blacklisted, can not be used for Static Routes creation for the VPC Private Gateway",
"routes", ConfigurationParameterScope.zone.toString()),
- InternalLbVmServiceOfferingId("Advanced", ManagementServer.class, Long.class, "internallbvm.service.offering", null, "Uuid of the service offering used by internal lb vm; if NULL - default system internal lb offering will be used", null),
+ InternalLbVmServiceOfferingId("Advanced", ManagementServer.class, String.class, "internallbvm.service.offering", null, "Uuid of the service offering used by internal lb vm; if NULL - default system internal lb offering will be used", null),
ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands", "false", "If set to true, StartCommand, StopCommand, CopyVolumeCommand, CreateCommand will be synchronized on the agent side." +
" If set to false, these commands become asynchronous. Default value is false.", null),
ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." +
[2/2] git commit: updated refs/heads/master-6-17-stable to db4969e
Posted by al...@apache.org.
CLOUDSTACK-3088: fixed listRouters/listInternalLbVms by name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db4969e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db4969e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db4969e3
Branch: refs/heads/master-6-17-stable
Commit: db4969e3d67e0d0c943ece4fcc1d6094ba1f7d71
Parents: 121c1c7
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 20 10:36:40 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Jun 20 10:39:19 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4969e3/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index c851e3b..8605c08 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1028,7 +1028,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
// pagination
_accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
- sb.and("name", sb.entity().getHostName(), SearchCriteria.Op.LIKE);
+ sb.and("name", sb.entity().getInstanceName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.IN);
sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);