etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter

This commit is contained in:
Alena Prokharchyk 2012-06-25 11:31:53 -07:00
parent 4eee9246d8
commit 4e7b65ef71
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -711,7 +711,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override
public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(),
getVirtualRouterProvider());
if (element == null) {
return false;
}
@ -722,7 +723,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context)
throws ConcurrentOperationException,
ResourceUnavailableException {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(),
getVirtualRouterProvider());
if (element == null) {
return true;
}
@ -874,4 +876,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
public IpDeployer getIpDeployer(Network network) {
return this;
}
protected VirtualRouterProviderType getVirtualRouterProvider() {
return VirtualRouterProviderType.VirtualRouter;
}
}

6
server/src/com/cloud/network/element/VpcVirtualRouterElement.java
View File

@ -32,6 +32,7 @@ import com.cloud.network.Network;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.network.NetworkService;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.router.VirtualRouter;
@ -395,4 +396,9 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
return true;
}
}
@Override
protected VirtualRouterProviderType getVirtualRouterProvider() {
return VirtualRouterProviderType.VPCVirtualRouter;
}
}