Fix VPC issue due to VpcVirtualNetworkApplianceManagerImpl.java is not registered
It should be registered rather than VirtualNetworkApplianceManageImpl.java, since it would cover the isolated network case as well. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/271a7dff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/271a7dff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/271a7dff Branch: refs/heads/object_store_migration Commit: 271a7dff9eabfb5c2bdb79316899c2e32a90c629 Parents: 89d6e7e Author: Sheng Yang <[email protected]> Authored: Mon Oct 28 17:00:23 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Oct 28 17:55:51 2013 -0700 ---------------------------------------------------------------------- .../network/router/VirtualNetworkApplianceManagerImpl.java | 1 - .../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/271a7dff/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ee4c6f4..48fdc35 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -694,7 +694,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize); _agentMgr.registerForHostEvents(new SshKeysDistriMonitor(_agentMgr, _hostDao, _configDao), true, false, false); - _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this); boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); _offering = new ServiceOfferingVO("System Offering For Software Router", 1, _routerRamSize, _routerCpuMHz, null, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/271a7dff/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 2e0f411..63eb75b 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -27,6 +27,7 @@ import java.util.TreeSet; import javax.ejb.Local; import javax.inject.Inject; +import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -169,6 +170,12 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian EntityManager _entityMgr; @Override + public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException { + _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this); + return super.configure(name, params); + } + + @Override public List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map<Param, Object> params) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
