Updated Branches: refs/heads/4.2 8edaf63c4 -> eb8c0a7e1
CLOUDSTACK-4850 [UCS] using template instead of cloning profile Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb8c0a7e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb8c0a7e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb8c0a7e Branch: refs/heads/4.2 Commit: eb8c0a7e1727b013f4e1972cceda08540497d93c Parents: 8edaf63 Author: Frank.Zhang <[email protected]> Authored: Thu Oct 10 17:39:07 2013 -0700 Committer: Frank.Zhang <[email protected]> Committed: Thu Oct 10 17:39:07 2013 -0700 ---------------------------------------------------------------------- .../hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb8c0a7e/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java index 68c05f7..5f0d49f 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java @@ -370,7 +370,7 @@ public class UcsManagerImpl implements UcsManager { throw new CloudRuntimeException(String.format("cannot associated a profile to blade[dn:%s]. please check your UCS manasger for detailed error information", dn)); } - return xo.get("outConfig.lsServer.assocState").equals("associated"); + return xo.get("outConfig.computeBlade.association").equals("associated"); //return !xo.get("outConfig.computeBlade.assignedToDn").equals(""); } @@ -618,6 +618,7 @@ public class UcsManagerImpl implements UcsManager { } @Override + @DB public ListResponse<UcsBladeResponse> refreshBlades(Long mgrId) { SyncBladesThread synct = new SyncBladesThread(); synct.run();
