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

PublicIpAddress response - search for default Public system network offering instead of hardcoding the id to 1.

This commit is contained in:
alena 2010-12-23 12:40:44 -08:00
parent 0d612c4d85
commit dfb736273c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/offering/NetworkOffering.java
View File

@ -26,8 +26,6 @@ import com.cloud.network.Networks.TrafficType;
*/
public interface NetworkOffering {
public static final long PUBLIC_NETWORK_OFFERING_ID = 1;
public enum GuestIpType {
Virtual,
Direct,

17
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -32,6 +32,7 @@ import com.cloud.network.LoadBalancerVO;
import com.cloud.network.Network;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.Service;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkRuleConfigVO;
import com.cloud.network.NetworkVO;
@ -517,7 +518,21 @@ public class ApiDBUtils {
}
public static long getPublicNetworkIdByZone(long zoneId) {
List<NetworkVO> networks = _networkDao.listBy(Account.ACCOUNT_ID_SYSTEM, NetworkOffering.PUBLIC_NETWORK_OFFERING_ID, zoneId);
//find system public network offering
Long networkOfferingId = null;
List<NetworkOfferingVO> offerings = _networkOfferingDao.listSystemNetworkOfferings();
for (NetworkOfferingVO offering: offerings) {
if (offering.getGuestIpType() == null && offering.getTrafficType() == TrafficType.Public) {
networkOfferingId = offering.getId();
break;
}
}
if (networkOfferingId == null) {
throw new InvalidParameterValueException("Unable to find system Public network offering");
}
List<NetworkVO> networks = _networkDao.listBy(Account.ACCOUNT_ID_SYSTEM, networkOfferingId, zoneId);
if (networks == null) {
throw new InvalidParameterValueException("Unable to find public network in zone " + zoneId);
}