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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/06562503 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/06562503 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/06562503 Branch: refs/heads/cisco-vnmc-api-integration Commit: 0656250308f3dd8a6991ee124a0fa3781214b327 Parents: dc402ea Author: Koushik Das <[email protected]> Authored: Mon Feb 11 23:48:19 2013 +0530 Committer: Koushik Das <[email protected]> Committed: Mon Feb 11 23:48:19 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/network/cisco/CiscoVnmcManager.java | 5 +++-- .../network/element/CiscoVnmcElementService.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/06562503/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java ---------------------------------------------------------------------- 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 794f6cd..0f3f9ce 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<String, Object> hostdetails = new HashMap<String,Object>(); hostdetails.putAll(params); - ServerResource resource = new CiscoVnmcResource(cmd.getHost(), cmd.getUsername(), cmd.getPassword()); + ServerResource resource = new CiscoVnmcResource(); Transaction txn = Transaction.currentTxn(); try { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/06562503/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java ---------------------------------------------------------------------- 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 3e2f093..e69c506 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);
