Skip to content

Commit 3e4a3ea

Browse files
nvazqueznvazquez
committed
CLOUDSTACK-10102: New network type (L2)
1 parent 41fdb88 commit 3e4a3ea

31 files changed

Lines changed: 382 additions & 34 deletions

File tree

‎api/src/com/cloud/network/Network.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
public interface Network extends ControlledEntity, StateObject<Network.State>, InternalIdentity, Identity, Serializable, Displayable {
3939

4040
public enum GuestType {
41-
Shared, Isolated
41+
Shared, Isolated, L2
4242
}
4343

4444
public String updatingInSequence ="updatingInSequence";

‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,8 +2145,8 @@ public Network createGuestNetwork(final long networkOfferingId, final String nam
21452145
+ zone.getName());
21462146
}
21472147
if (! UuidUtils.validateUUID(vlanId)){
2148-
// For Isolated networks, don't allow to create network with vlan that already exists in the zone
2149-
if (ntwkOff.getGuestType() == GuestType.Isolated) {
2148+
// For Isolated and L2 networks, don't allow to create network with vlan that already exists in the zone
2149+
if (ntwkOff.getGuestType() == GuestType.Isolated || ntwkOff.getGuestType() == GuestType.L2) {
21502150
if (_networksDao.listByZoneAndUriAndGuestType(zoneId, uri.toString(), null).size() > 0) {
21512151
throw new InvalidParameterValueException("Network with vlan " + vlanId + " already exists or overlaps with other network vlans in zone " + zoneId);
21522152
} else {
@@ -2227,8 +2227,9 @@ public Network createGuestNetwork(final long networkOfferingId, final String nam
22272227
// with different Cidrs for the same Shared network
22282228
final boolean cidrRequired = zone.getNetworkType() == NetworkType.Advanced
22292229
&& ntwkOff.getTrafficType() == TrafficType.Guest
2230-
&& (ntwkOff.getGuestType() == GuestType.Shared || ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering(
2231-
ntwkOff.getId(), Service.SourceNat));
2230+
&& (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated
2231+
&& !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))
2232+
|| ntwkOff.getGuestType() == GuestType.L2 && !_networkModel.listNetworkOfferingServices(ntwkOff.getId()).isEmpty());
22322233
if (cidr == null && ip6Cidr == null && cidrRequired) {
22332234
throw new InvalidParameterValueException("StartIp/endIp/gateway/netmask are required when create network of" + " type " + Network.GuestType.Shared
22342235
+ " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled");
@@ -2498,7 +2499,6 @@ public boolean destroyNetwork(final long networkId, final ReservationContext con
24982499
s_logger.debug("Unable to find network with id: " + networkId);
24992500
return false;
25002501
}
2501-
25022502
// Make sure that there are no user vms in the network that are not Expunged/Error
25032503
final List<UserVmVO> userVms = _userVmDao.listByNetworkIdAndStates(networkId);
25042504

‎engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
import javax.annotation.PostConstruct;
3030
import javax.inject.Inject;
3131

32+
import com.cloud.network.Network;
33+
import com.cloud.network.dao.NetworkDao;
34+
import com.cloud.network.dao.NetworkVO;
3235
import org.apache.log4j.Logger;
3336

3437
import com.cloud.server.ResourceTag.ResourceObjectType;
@@ -77,6 +80,8 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
7780
// ResourceTagsDaoImpl _tagsDao = ComponentLocator.inject(ResourceTagsDaoImpl.class);
7881
@Inject
7982
ResourceTagDao _tagsDao;
83+
@Inject
84+
NetworkDao networkDao;
8085

8186
private static final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT =
8287
"SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 'Stopped') "
@@ -301,13 +306,16 @@ public List<UserVmVO> listVirtualNetworkInstancesByAcctAndNetwork(long accountId
301306

302307
@Override
303308
public List<UserVmVO> listByNetworkIdAndStates(long networkId, State... states) {
304-
if (UserVmSearch == null) {
309+
NetworkVO network = networkDao.findById(networkId);
310+
if (UserVmSearch == null && network != null) {
305311
SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
306312
nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
307313
nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
308-
nicSearch.and().op("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
309-
nicSearch.or("ip6Address", nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
310-
nicSearch.cp();
314+
if (!network.getGuestType().equals(Network.GuestType.L2)) {
315+
nicSearch.and().op("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
316+
nicSearch.or("ip6Address", nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
317+
nicSearch.cp();
318+
}
311319

312320
UserVmSearch = createSearchBuilder();
313321
UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN);

‎plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public void setUp() {
107107
guru._ntwkOfferingSrvcDao = nosd;
108108
guru._dcDao = dcdao;
109109
guru._agentMgr = agentmgr;
110+
((GuestNetworkGuru)guru)._networkModel = netmodel;
110111

111112
final DataCenterVO dc = mock(DataCenterVO.class);
112113
when(dc.getNetworkType()).thenReturn(NetworkType.Advanced);
@@ -163,6 +164,8 @@ public void testDesign() {
163164

164165
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
165166

167+
when(netmodel.listNetworkOfferingServices(NETWORK_ID)).thenReturn(Arrays.asList(Service.Connectivity));
168+
166169
final DeploymentPlan plan = mock(DeploymentPlan.class);
167170
final Network network = mock(Network.class);
168171
final Account account = mock(Account.class);

‎plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void setUp() {
9494
guru.niciraNvpDao = nvpdao;
9595
guru._dcDao = dcdao;
9696
guru.ntwkOfferingSrvcDao = nosd;
97-
guru.networkModel = netmodel;
97+
((GuestNetworkGuru)guru)._networkModel = netmodel;
9898
guru.hostDao = hostdao;
9999
guru.agentMgr = agentmgr;
100100
guru.networkDao = netdao;
@@ -162,6 +162,8 @@ public void testDesign() {
162162

163163
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
164164

165+
when(netmodel.listNetworkOfferingServices(NETWORK_ID)).thenReturn(Arrays.asList(Service.Connectivity));
166+
165167
final DeploymentPlan plan = mock(DeploymentPlan.class);
166168
final Network network = mock(Network.class);
167169
final Account account = mock(Account.class);

‎server/src/com/cloud/api/ApiResponseHelper.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,9 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
19951995

19961996
// FIXME - either set netmask or cidr
19971997
response.setCidr(network.getCidr());
1998-
response.setNetworkCidr((network.getNetworkCidr()));
1998+
if (network.getNetworkCidr() != null) {
1999+
response.setNetworkCidr((network.getNetworkCidr()));
2000+
}
19992001
// If network has reservation its entire network cidr is defined by
20002002
// getNetworkCidr()
20012003
// if no reservation is present then getCidr() will define the entire

‎server/src/com/cloud/network/IpAddressManagerImpl.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,6 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
797797
throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
798798
}
799799
}
800-
801800
IPAddressVO addr = addrs.get(0);
802801
addr.setSourceNat(sourceNat);
803802
addr.setAllocatedTime(new Date());
@@ -1314,12 +1313,20 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean
13141313
if (zone.getNetworkType() == NetworkType.Advanced) {
13151314
// In Advance zone allow to do IP assoc only for Isolated networks with source nat service enabled
13161315
if (network.getGuestType() == GuestType.Isolated && !(_networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat))) {
1316+
if (releaseOnFailure && ipToAssoc != null) {
1317+
s_logger.warn("Failed to associate ip address, so unassigning ip from the database " + ipToAssoc);
1318+
_ipAddressDao.unassignIpAddress(ipToAssoc.getId());
1319+
}
13171320
throw new InvalidParameterValueException("In zone of type " + NetworkType.Advanced + " ip address can be associated only to the network of guest type "
13181321
+ GuestType.Isolated + " with the " + Service.SourceNat.getName() + " enabled");
13191322
}
13201323

13211324
// In Advance zone allow to do IP assoc only for shared networks with source nat/static nat/lb/pf services enabled
13221325
if (network.getGuestType() == GuestType.Shared && !isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) {
1326+
if (releaseOnFailure && ipToAssoc != null) {
1327+
s_logger.warn("Failed to associate ip address, so unassigning ip from the database " + ipToAssoc);
1328+
_ipAddressDao.unassignIpAddress(ipToAssoc.getId());
1329+
}
13231330
throw new InvalidParameterValueException("In zone of type " + NetworkType.Advanced + " ip address can be associated with network of guest type " + GuestType.Shared
13241331
+ "only if at " + "least one of the services " + Service.SourceNat.getName() + "/" + Service.StaticNat.getName() + "/" + Service.Lb.getName() + "/"
13251332
+ Service.PortForwarding.getName() + " is enabled");
@@ -1763,6 +1770,10 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {
17631770
return null;
17641771
}
17651772

1773+
if (_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty() && network.getCidr() == null) {
1774+
return null;
1775+
}
1776+
17661777
Set<Long> availableIps = _networkModel.getAvailableIps(network, requestedIp);
17671778

17681779
if (availableIps == null || availableIps.isEmpty()) {

‎server/src/com/cloud/network/NetworkModelImpl.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,9 @@ public boolean canUseForDeploy(Network network) {
583583
if (network.getTrafficType() != TrafficType.Guest) {
584584
return false;
585585
}
586+
if (listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty()) {
587+
return true; // do not check free IPs if there is no service in the network
588+
}
586589
boolean hasFreeIps = true;
587590
if (network.getGuestType() == GuestType.Shared) {
588591
if (network.getGateway() != null) {
@@ -1823,6 +1826,9 @@ public boolean isNetworkAvailableInDomain(long networkId, long domainId) {
18231826

18241827
@Override
18251828
public Set<Long> getAvailableIps(Network network, String requestedIp) {
1829+
if (network.getCidr() == null) {
1830+
return null;
1831+
}
18261832
String[] cidr = network.getCidr().split("/");
18271833
List<String> ips = getUsedIpsInNetwork(network);
18281834
Set<Long> usedIps = new TreeSet<Long>();

‎server/src/com/cloud/network/NetworkServiceImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
11241124
}
11251125
}
11261126
} else {
1127-
if (ntwkOff.getGuestType() == GuestType.Isolated) {
1127+
if (ntwkOff.getGuestType() == GuestType.Isolated || ntwkOff.getGuestType() == GuestType.L2) {
11281128
aclType = ACLType.Account;
11291129
} else if (ntwkOff.getGuestType() == GuestType.Shared) {
11301130
aclType = ACLType.Domain;
@@ -1861,9 +1861,9 @@ public boolean deleteNetwork(long networkId, boolean forced) {
18611861

18621862
Account owner = _accountMgr.getAccount(network.getAccountId());
18631863

1864-
// Only Admin can delete Shared networks
1865-
if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getId())) {
1866-
throw new InvalidParameterValueException("Only Admins can delete network with guest type " + GuestType.Shared);
1864+
// Only Admin can delete Shared and L2 networks
1865+
if ((network.getGuestType() == GuestType.Shared || network.getGuestType() == GuestType.L2) && !_accountMgr.isAdmin(caller.getId())) {
1866+
throw new InvalidParameterValueException("Only Admins can delete network with guest type " + network.getGuestType());
18671867
}
18681868

18691869
// Perform permission check
@@ -2174,7 +2174,7 @@ public Network updateGuestNetwork(final long networkId, String name, String disp
21742174
if (networkOfferingChanged == true) {
21752175
throw new InvalidParameterValueException("Cannot specify this nework offering change and guestVmCidr at same time. Specify only one.");
21762176
}
2177-
if (!(network.getState() == Network.State.Implemented)) {
2177+
if (!(network.getState() == Network.State.Implemented) && !(network.getState() == Network.State.Allocated)) {
21782178
throw new InvalidParameterValueException("The network must be in " + Network.State.Implemented + " state. IP Reservation cannot be applied in "
21792179
+ network.getState() + " state");
21802180
}

‎server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ public ExternalGuestNetworkGuru() {
9191
protected boolean canHandle(NetworkOffering offering, final NetworkType networkType, final PhysicalNetwork physicalNetwork) {
9292
// This guru handles only Guest Isolated network that supports Source
9393
// nat service
94-
if (networkType == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType()) && offering.getGuestType() == Network.GuestType.Isolated &&
95-
isMyIsolationMethod(physicalNetwork) && !offering.isSystemOnly()) {
94+
if (networkType == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType())
95+
&& (offering.getGuestType() == Network.GuestType.Isolated || offering.getGuestType() == GuestType.L2)
96+
&& isMyIsolationMethod(physicalNetwork) && !offering.isSystemOnly()) {
9697
return true;
9798
} else {
9899
s_logger.trace("We only take care of Guest networks of type " + GuestType.Isolated + " in zone of type " + NetworkType.Advanced);
@@ -295,12 +296,14 @@ public void reserve(NicProfile nic, Network config, VirtualMachineProfile vm, De
295296
nic.setIPv4Gateway(config.getGateway());
296297

297298
if (nic.getIPv4Address() == null) {
298-
String guestIp = _ipAddrMgr.acquireGuestIpAddress(config, null);
299-
if (guestIp == null) {
300-
throw new InsufficientVirtualNetworkCapacityException("Unable to acquire guest IP address for network " + config, DataCenter.class, dc.getId());
301-
}
299+
if (!_networkModel.listNetworkOfferingServices(config.getNetworkOfferingId()).isEmpty()) {
300+
String guestIp = _ipAddrMgr.acquireGuestIpAddress(config, null);
301+
if (guestIp == null) {
302+
throw new InsufficientVirtualNetworkCapacityException("Unable to acquire guest IP address for network " + config, DataCenter.class, dc.getId());
303+
}
302304

303-
nic.setIPv4Address(guestIp);
305+
nic.setIPv4Address(guestIp);
306+
}
304307
} else {
305308
long ipMask = NetUtils.ip2Long(nic.getIPv4Address()) & ~(0xffffffffffffffffl << (32 - cidrSize));
306309
nic.setIPv4Address(NetUtils.long2Ip(cidrAddress | ipMask));

0 commit comments

Comments
 (0)