You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2014/03/11 15:26:56 UTC
[34/50] [abbrv] git commit: updated refs/heads/regionvpc to edf12eb
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/regionvpc
Commit: 466825a167b3ee465a92297b96fb517bb35a810f
Parents: a4d3ec4
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Mar 10 15:27:13 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
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<Service, Map<Capability, String>> 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<? extends Cluster> clusterList = ref.searchForClusters(zoneId, cmd.getStartIndex(), cmd.getPageSizeVal(), "VMware");
if (clusterList.size() == 0) {