From 271a7dff9eabfb5c2bdb79316899c2e32a90c629 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 28 Oct 2013 17:00:23 -0700 Subject: [PATCH] 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. --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 1 - .../router/VpcVirtualNetworkApplianceManagerImpl.java | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ee4c6f4b6f9..48fdc351e19 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, diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 2e0f4114f86..63eb75b672e 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; @@ -168,6 +169,12 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian @Inject EntityManager _entityMgr; + @Override + public boolean configure(final String name, final Map params) throws ConfigurationException { + _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this); + return super.configure(name, params); + } + @Override public List deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map params) throws InsufficientCapacityException,