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

- Fixed missing UUId in listNetworkServiceProviders API

Browse Source 
- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone.
This commit is contained in:
prachi 2011-11-14 17:39:09 -08:00
parent cead826519
commit d7ae15beea
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/api/response/ProviderResponse.java
View File

@ -81,7 +81,7 @@ public class ProviderResponse extends BaseResponse {
} }
public void setId(String uuid) { public void setId(String uuid) {
this.id = id; this.id = uuid;
} }
public String getId() { public String getId() {

12
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -1388,7 +1388,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
zone = _zoneDao.persist(zone); zone = _zoneDao.persist(zone);
// Create default Physical Network // Create default Physical Network
long physicalNetworkId = createDefaultPhysicalNetwork(zone.getId(), domainId); long physicalNetworkId = createDefaultPhysicalNetwork(zone, domainId);
//add VirtualRouter as the defualt network service provider //add VirtualRouter as the defualt network service provider
PhysicalNetworkServiceProvider nsp = _networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId); PhysicalNetworkServiceProvider nsp = _networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId);
@ -1406,9 +1406,15 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
} }
} }
private long createDefaultPhysicalNetwork(long zoneId, Long domainId){ private long createDefaultPhysicalNetwork(DataCenter zone, Long domainId){
//create entry //create entry
PhysicalNetwork defaultNetwork = _networkMgr.createPhysicalNetwork(zoneId, null, null, null, PhysicalNetwork.BroadcastDomainRange.ZONE.toString(), domainId, null); String broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD.toString();
if(zone.getNetworkType() == NetworkType.Basic){
broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD.toString();
}else{
broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.ZONE.toString();
}
PhysicalNetwork defaultNetwork = _networkMgr.createPhysicalNetwork(zone.getId(), null, null, null, broadcastDomainRange, domainId, null);
String defaultXenLabel = "cloud-private"; String defaultXenLabel = "cloud-private";

8
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -3759,6 +3759,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} }
} }
if(broadcastDomainRange == null){
if(zone.getNetworkType() == NetworkType.Basic){
broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD;
}else{
broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.ZONE;
}
}
Transaction txn = Transaction.currentTxn(); Transaction txn = Transaction.currentTxn();
try { try {
txn.start(); txn.start();

2
server/src/com/cloud/network/PhysicalNetworkVO.java
View File

@ -100,7 +100,7 @@ public class PhysicalNetworkVO implements PhysicalNetwork {
if(broadcastDomainRange != null){ if(broadcastDomainRange != null){
this.broadcastDomainRange = broadcastDomainRange; this.broadcastDomainRange = broadcastDomainRange;
}else{ }else{
this.broadcastDomainRange = BroadcastDomainRange.ZONE; this.broadcastDomainRange = BroadcastDomainRange.POD;
} }
this.state = State.Disabled; this.state = State.Disabled;
this.uuid = UUID.randomUUID().toString(); this.uuid = UUID.randomUUID().toString();

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

@ -1859,7 +1859,7 @@ CREATE TABLE `cloud`.`physical_network` (
`vnet` varchar(255), `vnet` varchar(255),
`speed` varchar(32), `speed` varchar(32),
`domain_id` bigint unsigned COMMENT 'foreign key to domain id', `domain_id` bigint unsigned COMMENT 'foreign key to domain id',
`broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'ZONE' COMMENT 'range of broadcast domain : POD/ZONE', `broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range of broadcast domain : POD/ZONE',
`state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'what state is this configuration in', `state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'what state is this configuration in',
`created` datetime COMMENT 'date created', `created` datetime COMMENT 'date created',
`removed` datetime COMMENT 'date removed if not null', `removed` datetime COMMENT 'date removed if not null',