From 0656250308f3dd8a6991ee124a0fa3781214b327 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Mon, 11 Feb 2013 23:48:19 +0530 Subject: [PATCH] Moved VNMC provider creation to Network.java. The plugin code would have been the ideal place to keep it but current state of the code doesn't allow it. --- .../src/com/cloud/network/cisco/CiscoVnmcManager.java | 5 +++-- .../com/cloud/network/element/CiscoVnmcElementService.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java index 794f6cda0f7..0f3f9ced398 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java @@ -37,6 +37,7 @@ import com.cloud.host.Host; import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.Network; +import com.cloud.network.Network.Provider; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.CiscoVnmcDao; @@ -76,7 +77,7 @@ public class CiscoVnmcManager implements Manager, CiscoVnmcElementService { @Override public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd) { - String deviceName = CiscoVnmc.getName(); + String deviceName = Provider.CiscoVnmc.getName(); NetworkDevice networkDevice = NetworkDevice.getNetworkDevice(deviceName); Long physicalNetworkId = cmd.getPhysicalNetworkId(); CiscoVnmcController CiscoVnmcResource = null; @@ -113,7 +114,7 @@ public class CiscoVnmcManager implements Manager, CiscoVnmcElementService { Map hostdetails = new HashMap(); hostdetails.putAll(params); - ServerResource resource = new CiscoVnmcResource(cmd.getHost(), cmd.getUsername(), cmd.getPassword()); + ServerResource resource = new CiscoVnmcResource(); Transaction txn = Transaction.currentTxn(); try { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java index 3e2f09346a9..e69c5068eb9 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java @@ -30,7 +30,7 @@ import com.cloud.utils.component.PluggableService; public interface CiscoVnmcElementService extends PluggableService { - public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true); + //public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true); public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd);