apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

NaaS: Rename VirtualRouterProviderType

Browse Source
This commit is contained in:
Sheng Yang 2011-11-09 15:10:35 -08:00
parent c09b2b94b3
commit 0876cbeda7
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/network/VirtualRouterProvider.java
View File

@ -20,8 +20,8 @@ package com.cloud.network;
public interface VirtualRouterProvider { public interface VirtualRouterProvider {
public enum VirtualRouterProviderType { public enum VirtualRouterProviderType {
VirtualRouterElement, VirtualRouter,
RedundantVirtualRouterElement, RedundantVirtualRouter,
ElasticLoadBalancerVm ElasticLoadBalancerVm
} }
public VirtualRouterProviderType getType(); public VirtualRouterProviderType getType();

12
server/src/com/cloud/network/element/RedundantVirtualRouterElement.java
View File

@ -92,7 +92,7 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
@Override @Override
public boolean configure(ConfigureRedundantVirtualRouterElementCmd cmd) { public boolean configure(ConfigureRedundantVirtualRouterElementCmd cmd) {
VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.RedundantVirtualRouterElement); VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.RedundantVirtualRouter);
if (element == null) { if (element == null) {
s_logger.trace("Can't find element with UUID " + cmd.getNspId()); s_logger.trace("Can't find element with UUID " + cmd.getNspId());
return false; return false;
@ -105,19 +105,19 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
@Override @Override
public VirtualRouterProvider addElement(Long nspId) { public VirtualRouterProvider addElement(Long nspId) {
VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement); VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouter);
if (element != null) { if (element != null) {
s_logger.trace("There is already a redundant virtual router element with service provider id " + nspId); s_logger.trace("There is already a redundant virtual router element with service provider id " + nspId);
return null; return null;
} }
element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.RedundantVirtualRouterElement); element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.RedundantVirtualRouter);
_vrElementsDao.persist(element); _vrElementsDao.persist(element);
return element; return element;
} }
@Override @Override
public boolean isReady(PhysicalNetworkServiceProvider provider) { public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouter);
if (element == null) { if (element == null) {
return false; return false;
} }
@ -126,14 +126,14 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
@Override @Override
public Long getIdByNspId(Long nspId) { public Long getIdByNspId(Long nspId) {
VirtualRouterProviderVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement); VirtualRouterProviderVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouter);
return vr.getId(); return vr.getId();
} }
@Override @Override
public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException { ResourceUnavailableException {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouter);
if (element == null) { if (element == null) {
return true; return true;
} }

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

@ -382,7 +382,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override @Override
public boolean configure(ConfigureVirtualRouterElementCmd cmd) { public boolean configure(ConfigureVirtualRouterElementCmd cmd) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.VirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.VirtualRouter);
if (element == null) { if (element == null) {
s_logger.trace("Can't find element with network service provider id " + cmd.getNspId()); s_logger.trace("Can't find element with network service provider id " + cmd.getNspId());
return false; return false;
@ -396,13 +396,12 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override @Override
public VirtualRouterProvider addElement(Long nspId) { public VirtualRouterProvider addElement(Long nspId) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouter);
if (element != null) { if (element != null) {
s_logger.trace("There is already a virtual router element with service provider id " + nspId); s_logger.trace("There is already a virtual router element with service provider id " + nspId);
return null; return null;
} }
element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.VirtualRouterElement); element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.VirtualRouter);
element.setEnabled(true);
_vrProviderDao.persist(element); _vrProviderDao.persist(element);
return element; return element;
} }
@ -428,7 +427,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override @Override
public boolean isReady(PhysicalNetworkServiceProvider provider) { public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
if (element == null) { if (element == null) {
return false; return false;
} }
@ -438,7 +437,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override @Override
public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException { ResourceUnavailableException {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouterElement); VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
if (element == null) { if (element == null) {
return true; return true;
} }
@ -459,7 +458,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
@Override @Override
public Long getIdByNspId(Long nspId) { public Long getIdByNspId(Long nspId) {
VirtualRouterProviderVO vr = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement); VirtualRouterProviderVO vr = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouter);
return vr.getId(); return vr.getId();
} }

12
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -1148,21 +1148,19 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
if (offering_id == null) { if (offering_id == null) {
offering_id = _offering.getId(); offering_id = _offering.getId();
} }
VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouterElement; VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouter;
String typeString = "VirtualRouter";
if (isRedundant) { if (isRedundant) {
type = VirtualRouterProviderType.RedundantVirtualRouterElement; type = VirtualRouterProviderType.RedundantVirtualRouter;
typeString = "RedundantVirtualRouter";
} }
Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network); Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, typeString); PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, type.toString());
if (provider == null) { if (provider == null) {
throw new CloudRuntimeException("Cannot find service provider " + typeString + " in physical network " + physicalNetworkId); throw new CloudRuntimeException("Cannot find service provider " + type.toString() + " in physical network " + physicalNetworkId);
} }
VirtualRouterProvider vrProvider = _vrProviderDao.findByNspIdAndType(provider.getId(), type); VirtualRouterProvider vrProvider = _vrProviderDao.findByNspIdAndType(provider.getId(), type);
if (vrProvider == null) { if (vrProvider == null) {
throw new CloudRuntimeException("Cannot find virtual router provider " + typeString + " as service provider " + provider.getId()); throw new CloudRuntimeException("Cannot find virtual router provider " + type.toString()+ " as service provider " + provider.getId());
} }
ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(offering_id); ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(offering_id);