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

Add L3VPN isolation method for contrail plugin 

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
This commit is contained in:
Sachchidanand Vaidya 2014-01-13 17:27:16 -08:00 committed by Sheng Yang
parent 3ed605dc90
commit 0bff705621
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/PhysicalNetwork.java
View File

@ -33,7 +33,7 @@ public interface PhysicalNetwork extends Identity, InternalIdentity {
}
public enum IsolationMethod {
VLAN, L3, GRE, STT, VNS, MIDO, SSP, VXLAN, ODL;
VLAN, L3, GRE, STT, VNS, MIDO, SSP, VXLAN, ODL, L3VPN;
}
public enum BroadcastDomainRange {

26
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java
View File

@ -37,6 +37,9 @@ import com.cloud.deploy.DeploymentPlan;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.network.Network;
import com.cloud.network.Network.State;
import com.cloud.network.NetworkProfile;
@ -47,6 +50,9 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.guru.NetworkGuru;
import com.cloud.network.PhysicalNetwork;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
import com.cloud.utils.component.AdapterBase;
@ -68,12 +74,22 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru {
ContrailManager _manager;
@Inject
NicDao _nicDao;
@Inject
PhysicalNetworkDao _physicalNetworkDao;
@Inject
DataCenterDao _dcDao;
private static final Logger s_logger = Logger.getLogger(ContrailGuru.class);
private static final TrafficType[] TrafficTypes = {TrafficType.Guest};
private boolean canHandle(NetworkOffering offering) {
return (offering.getName().equals(ContrailManager.offeringName));
private boolean canHandle(NetworkOffering offering, NetworkType networkType, PhysicalNetwork physicalNetwork) {
if (networkType == NetworkType.Advanced
&& isMyTrafficType(offering.getTrafficType())
&& offering.getGuestType() == Network.GuestType.Isolated
&& physicalNetwork.getIsolationMethods().contains("L3VPN"))
return true;
return false;
}
@Override
@ -83,7 +99,11 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru {
@Override
public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) {
if (!canHandle(offering)) {
// Check of the isolation type of the related physical network is L3VPN
PhysicalNetworkVO physnet = _physicalNetworkDao.findById(plan.getPhysicalNetworkId());
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
if (!canHandle(offering, dc.getNetworkType(),physnet)) {
s_logger.debug("Refusing to design this network");
return null;
}
NetworkVO network =

2
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
View File

@ -331,7 +331,7 @@ public class ManagementServerMock {
}
} catch (InvalidParameterValueException e) {
List<String> isolationMethods = new ArrayList<String>();
isolationMethods.add("GRE");
isolationMethods.add("L3VPN");
_znet =
_networkService.createPhysicalNetwork(_zone.getId(), null, null, isolationMethods, BroadcastDomainRange.ZONE.toString(), _zone.getDomainId(), null,
"znet");

5
ui/scripts/ui-custom/zoneWizard.js
View File

@ -723,7 +723,10 @@
}).html('VXLAN'),
$('<option>').attr({
value: 'ODL'
}).html('ODL')
}).html('ODL'),
$('<option>').attr({
value: 'L3VPN'
}).html('L3VPN')
)
)
);