Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 629CB10030 for ; Tue, 11 Mar 2014 13:14:04 +0000 (UTC) Received: (qmail 53301 invoked by uid 500); 11 Mar 2014 13:13:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 53101 invoked by uid 500); 11 Mar 2014 13:13:35 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 49224 invoked by uid 99); 11 Mar 2014 13:13:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 13:13:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C9D493EB34; Tue, 11 Mar 2014 13:12:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Tue, 11 Mar 2014 13:13:32 -0000 Message-Id: In-Reply-To: <5875e6c868544ef8aee529bd3e883e37@git.apache.org> References: <5875e6c868544ef8aee529bd3e883e37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] git commit: updated refs/heads/distributedrouter to 6b5e234 Fixed nonoss build Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/466825a1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/466825a1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/466825a1 Branch: refs/heads/distributedrouter Commit: 466825a167b3ee465a92297b96fb517bb35a810f Parents: a4d3ec4 Author: Alena Prokharchyk Authored: Mon Mar 10 15:27:13 2014 -0700 Committer: Alena Prokharchyk Committed: Mon Mar 10 15:29:18 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/element/CiscoNexusVSMElement.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/466825a1/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index c33af27..0e2a911 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java @@ -79,6 +79,8 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme ClusterDao _clusterDao; @Inject ClusterVSMMapDao _clusterVSMDao; + @Inject + ManagementService _mgr; @Override public Map> getCapabilities() { @@ -190,7 +192,8 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme // Else if there is only a zoneId defined, get a list of all vmware clusters // in the zone, and then for each cluster, pull the VSM and prepare a list. if (zoneId != null && zoneId.longValue() != 0) { - ManagementService ref = cmd.getMgmtServiceRef(); + ManagementService ref = _mgr; + ; List clusterList = ref.searchForClusters(zoneId, cmd.getStartIndex(), cmd.getPageSizeVal(), "VMware"); if (clusterList.size() == 0) {