apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

NaaS: Rename virtual_router_elements to virtual_router_provider

Browse Source
This commit is contained in:
Sheng Yang 2011-10-31 11:06:57 -07:00
parent cd3fbf0548
commit a43364f0a4
15 changed files with 83 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/api/commands/CreateDhcpElementCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.PlugService;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.element.DhcpElementService;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
@ -79,7 +79,7 @@ public class CreateDhcpElementCmd extends BaseAsyncCreateCmd {
@Override
public void execute(){
UserContext.current().setEventDetails("DHCP element Id: "+getEntityId());
VirtualRouterElements result = _service.getCreatedElement(getEntityId());
VirtualRouterProvider result = _service.getCreatedElement(getEntityId());
if (result != null) {
SuccessResponse response = new SuccessResponse();
response.setResponseName(getCommandName());
@ -92,7 +92,7 @@ public class CreateDhcpElementCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
VirtualRouterElements result = _service.addElement(getNspId());
VirtualRouterProvider result = _service.addElement(getNspId());
if (result != null) {
setEntityId(result.getId());
} else {

6
api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.PlugService;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.element.RedundantVirtualRouterElementService;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
@ -79,7 +79,7 @@ public class CreateRedundantVirtualRouterElementCmd extends BaseAsyncCreateCmd {
@Override
public void execute(){
UserContext.current().setEventDetails("Redundant Virtual Router Element Id: "+getEntityId());
VirtualRouterElements result = _service.getCreatedElement(getEntityId());
VirtualRouterProvider result = _service.getCreatedElement(getEntityId());
if (result != null) {
SuccessResponse response = new SuccessResponse();
response.setResponseName(getCommandName());
@ -92,7 +92,7 @@ public class CreateRedundantVirtualRouterElementCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
VirtualRouterElements result = _service.addElement(getNspId());
VirtualRouterProvider result = _service.addElement(getNspId());
if (result != null) {
setEntityId(result.getId());
} else {

6
api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.PlugService;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.element.VirtualRouterElementService;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
@ -79,7 +79,7 @@ public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd {
@Override
public void execute(){
UserContext.current().setEventDetails("Virtual router element Id: "+getEntityId());
VirtualRouterElements result = _service.getCreatedElement(getEntityId());
VirtualRouterProvider result = _service.getCreatedElement(getEntityId());
if (result != null) {
SuccessResponse response = new SuccessResponse();
response.setResponseName(getCommandName());
@ -92,7 +92,7 @@ public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
VirtualRouterElements result = _service.addElement(getNspId());
VirtualRouterProvider result = _service.addElement(getNspId());
if (result != null) {
setEntityId(result.getId());
} else {

6
api/src/com/cloud/network/VirtualRouterElements.java → api/src/com/cloud/network/VirtualRouterProvider.java
View File

@ -18,13 +18,13 @@
package com.cloud.network;
public interface VirtualRouterElements {
public enum VirtualRouterElementsType {
public interface VirtualRouterProvider {
public enum VirtualRouterProviderType {
DhcpElement,
VirtualRouterElement,
RedundantVirtualRouterElement,
}
public VirtualRouterElementsType getType();
public VirtualRouterProviderType getType();
public long getId();
public boolean isEnabled();
public long getNspId();

7
api/src/com/cloud/network/element/DhcpElementService.java
View File

@ -1,13 +1,12 @@
package com.cloud.network.element;
import com.cloud.api.commands.ConfigureDhcpElementCmd;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.utils.component.PluggableService;
public interface DhcpElementService extends PluggableService{
boolean configure(ConfigureDhcpElementCmd cmd);
VirtualRouterElements addElement(Long nspId);
VirtualRouterProvider addElement(Long nspId);
Long getIdByNspId(Long nspId);
boolean isReady(long nspId);
VirtualRouterElements getCreatedElement(long id);
VirtualRouterProvider getCreatedElement(long id);
}

2
client/tomcatconf/components.xml.in
View File

@ -131,6 +131,6 @@
<dao name="AccountDao" class="com.cloud.user.dao.AccountDaoImpl" singleton="false"/>
<dao name="UserDao" class="com.cloud.user.dao.UserDaoImpl" singleton="false"/>
<dao name="NetworkOfferingServiceDao" class="com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl" singleton="false"/>
<dao name="VirtualRouterElementsDao" class="com.cloud.network.dao.VirtualRouterElementsDaoImpl" singleton="false"/>
<dao name="VirtualRouterProviderDao" class="com.cloud.network.dao.VirtualRouterProviderDaoImpl" singleton="false"/>
</configuration-server>
</components.xml>

4
server/src/com/cloud/configuration/DefaultComponentLibrary.java
View File

@ -84,7 +84,7 @@ import com.cloud.network.dao.PhysicalNetworkExternalDeviceDaoImpl;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDaoImpl;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDaoImpl;
import com.cloud.network.dao.RemoteAccessVpnDaoImpl;
import com.cloud.network.dao.VirtualRouterElementsDaoImpl;
import com.cloud.network.dao.VirtualRouterProviderDaoImpl;
import com.cloud.network.dao.VpnUserDaoImpl;
import com.cloud.network.element.DhcpElement;
import com.cloud.network.element.DhcpElementService;
@ -297,7 +297,7 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
info.addParameter("cache.time.to.live", "600");
addDao("PhysicalNetworkDao", PhysicalNetworkDaoImpl.class);
addDao("PhysicalNetworkServiceProviderDao", PhysicalNetworkServiceProviderDaoImpl.class);
addDao("VirtualRouterElementsDao", VirtualRouterElementsDaoImpl.class);
addDao("VirtualRouterProviderDao", VirtualRouterProviderDaoImpl.class);
addDao("PhysicalNetworkExternalDeviceDao", PhysicalNetworkExternalDeviceDaoImpl.class);
addDao("PhysicalNetworkTrafficTypeDao", PhysicalNetworkTrafficTypeDaoImpl.class);
}

8
server/src/com/cloud/network/dao/VirtualRouterElementsDao.java → server/src/com/cloud/network/dao/VirtualRouterProviderDao.java
View File

@ -17,10 +17,10 @@
*/
package com.cloud.network.dao;
import com.cloud.network.element.VirtualRouterElementsVO;
import com.cloud.network.VirtualRouterElements.VirtualRouterElementsType;
import com.cloud.network.element.VirtualRouterProviderVO;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.utils.db.GenericDao;
public interface VirtualRouterElementsDao extends GenericDao<VirtualRouterElementsVO, Long> {
public VirtualRouterElementsVO findByNspIdAndType(long nspId, VirtualRouterElementsType type);
public interface VirtualRouterProviderDao extends GenericDao<VirtualRouterProviderVO, Long> {
public VirtualRouterProviderVO findByNspIdAndType(long nspId, VirtualRouterProviderType type);
}

16
server/src/com/cloud/network/dao/VirtualRouterElementsDaoImpl.java → server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
View File

@ -19,18 +19,18 @@ package com.cloud.network.dao;
import javax.ejb.Local;
import com.cloud.network.element.VirtualRouterElementsVO;
import com.cloud.network.VirtualRouterElements.VirtualRouterElementsType;
import com.cloud.network.element.VirtualRouterProviderVO;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Local(value=VirtualRouterElementsDao.class) @DB(txn=false)
public class VirtualRouterElementsDaoImpl extends GenericDaoBase<VirtualRouterElementsVO, Long> implements VirtualRouterElementsDao {
final SearchBuilder<VirtualRouterElementsVO> AllFieldsSearch;
@Local(value=VirtualRouterProviderDao.class) @DB(txn=false)
public class VirtualRouterProviderDaoImpl extends GenericDaoBase<VirtualRouterProviderVO, Long> implements VirtualRouterProviderDao {
final SearchBuilder<VirtualRouterProviderVO> AllFieldsSearch;
public VirtualRouterElementsDaoImpl() {
public VirtualRouterProviderDaoImpl() {
super();
AllFieldsSearch = createSearchBuilder();
AllFieldsSearch.and("nsp_id", AllFieldsSearch.entity().getNspId(), SearchCriteria.Op.EQ);
@ -40,8 +40,8 @@ public class VirtualRouterElementsDaoImpl extends GenericDaoBase<VirtualRouterEl
}
@Override
public VirtualRouterElementsVO findByNspIdAndType(long nspId, VirtualRouterElementsType type) {
SearchCriteria<VirtualRouterElementsVO> sc = AllFieldsSearch.create();
public VirtualRouterProviderVO findByNspIdAndType(long nspId, VirtualRouterProviderType type) {
SearchCriteria<VirtualRouterProviderVO> sc = AllFieldsSearch.create();
sc.setParameters("nsp_id", nspId);
sc.setParameters("type", type);
return findOneBy(sc);

36
server/src/com/cloud/network/element/DhcpElement.java
View File

@ -36,7 +36,7 @@ import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.dao.HostDao;
import com.cloud.network.Network;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Provider;
@ -45,8 +45,8 @@ import com.cloud.network.NetworkManager;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.VirtualRouterElementsDao;
import com.cloud.network.VirtualRouterElements.VirtualRouterElementsType;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.network.router.VirtualNetworkApplianceManager;
import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
@ -82,7 +82,7 @@ public class DhcpElement extends AdapterBase implements DhcpElementService, User
@Inject HostPodDao _podDao;
@Inject AccountManager _accountMgr;
@Inject HostDao _hostDao;
@Inject VirtualRouterElementsDao _vrElementsDao;
@Inject VirtualRouterProviderDao _vrProviderDao;
private boolean canHandle(DeployDestination dest, TrafficType trafficType, GuestType networkType, long offeringId) {
if (_networkMgr.isProviderSupported(offeringId, Service.Gateway, Provider.JuniperSRX) && networkType == Network.GuestType.Isolated) {
@ -214,43 +214,43 @@ public class DhcpElement extends AdapterBase implements DhcpElementService, User
@Override
public boolean configure(ConfigureDhcpElementCmd cmd) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterElementsType.DhcpElement);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.DhcpElement);
if (element == null) {
s_logger.trace("Can't find element with network service provider ID " + cmd.getNspId());
return false;
}
element.setEnabled(cmd.getEnabled());
_vrElementsDao.persist(element);
_vrProviderDao.persist(element);
return true;
}
@Override
public VirtualRouterElements addElement(Long nspId) {
public VirtualRouterProvider addElement(Long nspId) {
long serviceOfferingId = _routerMgr.getDefaultVirtualRouterServiceOfferingId();
if (serviceOfferingId == 0) {
return null;
}
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.DhcpElement);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.DhcpElement);
if (element != null) {
s_logger.trace("There is already a dhcp element with service provider id " + nspId);
return null;
}
element = new VirtualRouterElementsVO(nspId, null, VirtualRouterElementsType.DhcpElement);
_vrElementsDao.persist(element);
element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.DhcpElement);
_vrProviderDao.persist(element);
return element;
}
@Override
public Long getIdByNspId(Long nspId) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.DhcpElement);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.DhcpElement);
return element.getId();
}
@Override
public boolean isReady(long nspId) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.DhcpElement);
public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.DhcpElement);
if (element == null) {
return false;
}
@ -258,14 +258,8 @@ public class DhcpElement extends AdapterBase implements DhcpElementService, User
}
@Override
public VirtualRouterElements getCreatedElement(long id) {
return _vrElementsDao.findById(id);
}
@Override
public boolean isReady(PhysicalNetworkServiceProvider provider) {
// TODO Auto-generated method stub
return true;
public VirtualRouterProvider getCreatedElement(long id) {
return _vrProviderDao.findById(id);
}
@Override

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

@ -14,12 +14,13 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.NetworkManager;
import com.cloud.network.dao.VirtualRouterElementsDao;
import com.cloud.network.VirtualRouterElements.VirtualRouterElementsType;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.network.router.VirtualRouter;
import com.cloud.offering.NetworkOffering;
import com.cloud.uservm.UserVm;
@ -35,7 +36,7 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
private static final Logger s_logger = Logger.getLogger(RedundantVirtualRouterElement.class);
@Inject NetworkManager _networkMgr;
@Inject VirtualRouterElementsDao _vrElementsDao;
@Inject VirtualRouterProviderDao _vrElementsDao;
@Override
public Provider getProvider() {
@ -83,7 +84,7 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
@Override
public boolean configure(ConfigureRedundantVirtualRouterElementCmd cmd) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterElementsType.RedundantVirtualRouterElement);
VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.RedundantVirtualRouterElement);
if (element == null) {
s_logger.trace("Can't find element with UUID " + cmd.getNspId());
return false;
@ -95,29 +96,29 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
}
@Override
public VirtualRouterElements addElement(Long nspId) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.RedundantVirtualRouterElement);
public VirtualRouterProvider addElement(Long nspId) {
VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement);
if (element != null) {
s_logger.trace("There is already a redundant virtual router element with service provider id " + nspId);
return null;
}
element = new VirtualRouterElementsVO(nspId, null, VirtualRouterElementsType.RedundantVirtualRouterElement);
element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.RedundantVirtualRouterElement);
_vrElementsDao.persist(element);
return element;
}
@Override
public boolean isReady(long nspId) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.RedundantVirtualRouterElement);
public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouterElement);
if (element == null) {
return false;
}
return element.isEnabled();
}
@Override
public Long getIdByNspId(Long nspId) {
VirtualRouterElementsVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.RedundantVirtualRouterElement);
VirtualRouterProviderVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement);
return vr.getId();
}

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

@ -43,12 +43,12 @@ import com.cloud.network.NetworkManager;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.VpnUser;
import com.cloud.network.dao.LoadBalancerDao;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.VirtualRouterElementsDao;
import com.cloud.network.VirtualRouterElements.VirtualRouterElementsType;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.network.lb.LoadBalancingRulesManager;
import com.cloud.network.router.VirtualNetworkApplianceManager;
@ -92,7 +92,7 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl
@Inject LoadBalancerDao _lbDao;
@Inject HostDao _hostDao;
@Inject ConfigurationDao _configDao;
@Inject VirtualRouterElementsDao _vrElementsDao;
@Inject VirtualRouterProviderDao _vrProviderDao;
protected boolean canHandle(GuestType networkType, long offeringId, Service service) {
boolean result = (networkType == Network.GuestType.Isolated && _networkMgr.isProviderSupported(offeringId, service, getProvider()));
@ -403,27 +403,27 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl
@Override
public boolean configure(ConfigureVirtualRouterElementCmd cmd) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterElementsType.VirtualRouterElement);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.VirtualRouterElement);
if (element == null) {
s_logger.trace("Can't find element with network service provider id " + cmd.getNspId());
return false;
}
element.setEnabled(cmd.getEnabled());
_vrElementsDao.persist(element);
_vrProviderDao.persist(element);
return true;
}
@Override
public VirtualRouterElements addElement(Long nspId) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.VirtualRouterElement);
public VirtualRouterProvider addElement(Long nspId) {
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement);
if (element != null) {
s_logger.trace("There is already a virtual router element with service provider id " + nspId);
return null;
}
element = new VirtualRouterElementsVO(nspId, null, VirtualRouterElementsType.VirtualRouterElement);
_vrElementsDao.persist(element);
element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.VirtualRouterElement);
_vrProviderDao.persist(element);
return element;
}
@ -448,7 +448,7 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl
@Override
public boolean isReady(PhysicalNetworkServiceProvider provider) {
VirtualRouterElementsVO element = _vrElementsDao.findByNspIdAndType(provider.getId(), VirtualRouterElementsType.VirtualRouterElement);
VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouterElement);
if (element == null) {
return false;
}
@ -464,7 +464,7 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl
@Override
public Long getIdByNspId(Long nspId) {
VirtualRouterElementsVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterElementsType.VirtualRouterElement);
VirtualRouterProviderVO vr = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement);
return vr.getId();
}
}

16
server/src/com/cloud/network/element/VirtualRouterElementsVO.java → server/src/com/cloud/network/element/VirtualRouterProviderVO.java
View File

@ -28,12 +28,12 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.network.VirtualRouterElements;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.utils.db.GenericDao;
@Entity
@Table(name=("virtual_router_elements"))
public class VirtualRouterElementsVO implements VirtualRouterElements {
@Table(name=("virtual_router_providers"))
public class VirtualRouterProviderVO implements VirtualRouterProvider {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
@ -41,7 +41,7 @@ public class VirtualRouterElementsVO implements VirtualRouterElements {
@Column(name="type")
@Enumerated(EnumType.STRING)
private VirtualRouterElementsType type;
private VirtualRouterProviderType type;
@Column(name="enabled")
private boolean enabled;
@ -55,10 +55,10 @@ public class VirtualRouterElementsVO implements VirtualRouterElements {
@Column(name=GenericDao.REMOVED_COLUMN)
Date removed;
public VirtualRouterElementsVO() {
public VirtualRouterProviderVO() {
}
public VirtualRouterElementsVO(long nspId, String uuid, VirtualRouterElementsType type) {
public VirtualRouterProviderVO(long nspId, String uuid, VirtualRouterProviderType type) {
this.nspId = nspId;
this.uuid = uuid;
this.type = type;
@ -79,7 +79,7 @@ public class VirtualRouterElementsVO implements VirtualRouterElements {
}
@Override
public VirtualRouterElementsType getType() {
public VirtualRouterProviderType getType() {
return this.type;
}
@ -104,7 +104,7 @@ public class VirtualRouterElementsVO implements VirtualRouterElements {
this.id = id;
}
public void setType(VirtualRouterElementsType type) {
public void setType(VirtualRouterProviderType type) {
this.type = type;
}

6
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -75,7 +75,7 @@ import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.VirtualRouterElementsDao;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.guru.ControlNetworkGuru;
import com.cloud.network.guru.DirectPodBasedNetworkGuru;
import com.cloud.network.guru.PodBasedNetworkGuru;
@ -121,7 +121,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
private final AccountDao _accountDao;
private final ResourceCountDao _resourceCountDao;
private final NetworkOfferingServiceMapDao _offeringServiceMapDao;
private final VirtualRouterElementsDao _virtualRouterElementsDao;
private final VirtualRouterProviderDao _virtualRouterProviderDao;
public ConfigurationServerImpl() {
@ -139,7 +139,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
_accountDao = locator.getDao(AccountDao.class);
_resourceCountDao = locator.getDao(ResourceCountDao.class);
_offeringServiceMapDao = locator.getDao(NetworkOfferingServiceMapDao.class);
_virtualRouterElementsDao = locator.getDao(VirtualRouterElementsDao.class);
_virtualRouterProviderDao = locator.getDao(VirtualRouterProviderDao.class);
}
@Override @DB

4
setup/db/create-schema.sql
View File

@ -1804,7 +1804,7 @@ CREATE TABLE `cloud`.`physical_network_external_devices` (
CONSTRAINT `fk_physical_network_external_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`virtual_router_elements` (
CREATE TABLE `cloud`.`virtual_router_providers` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`nsp_id` bigint unsigned NOT NULL COMMENT 'Network Service Provider ID',
`uuid` varchar(255) UNIQUE,
@ -1812,7 +1812,7 @@ CREATE TABLE `cloud`.`virtual_router_elements` (
`enabled` int(1) NOT NULL COMMENT 'Enabled or disabled',
`removed` datetime COMMENT 'date removed if not null',
PRIMARY KEY (`id`),
CONSTRAINT `fk_virtual_router_elements__nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE
CONSTRAINT `fk_virtual_router_providers__nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
SET foreign_key_checks = 1;