mirror of https://github.com/apache/cloudstack.git
Code clean up in cloud-plugin-network-nvp project
- Code formatting - Declare final where possible - Remove unused methods - Remove throws declarations where not needed - Remove generated comments (e.g. "TODO Auto-generated method stub")
This commit is contained in:
Miguel Ferreira
parent
5fc953eda2
commit
6e74ef8e40
|
|
@ -18,7 +18,8 @@
|
|||
under the License.
|
||||
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>cloud-plugin-network-nvp</artifactId>
|
||||
<name>Apache CloudStack Plugin - Network Nicira NVP</name>
|
||||
|
|
|
|||
|
|
@ -98,14 +98,14 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
|
||||
public NiciraNvpGuestNetworkGuru() {
|
||||
super();
|
||||
_isolationMethods = new IsolationMethod[] {IsolationMethod.STT, IsolationMethod.VXLAN};
|
||||
_isolationMethods = new IsolationMethod[] { IsolationMethod.STT, IsolationMethod.VXLAN };
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean canHandle(final NetworkOffering offering, final NetworkType networkType, final PhysicalNetwork physicalNetwork) {
|
||||
// This guru handles only Guest Isolated network that supports Source nat service
|
||||
if (networkType == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType()) && offering.getGuestType() == Network.GuestType.Isolated &&
|
||||
isMyIsolationMethod(physicalNetwork) && ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(), Service.Connectivity)) {
|
||||
if (networkType == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType()) && offering.getGuestType() == Network.GuestType.Isolated
|
||||
&& isMyIsolationMethod(physicalNetwork) && ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(), Service.Connectivity)) {
|
||||
return true;
|
||||
} else {
|
||||
s_logger.trace("We only take care of Guest networks of type " + GuestType.Isolated + " in zone of type " + NetworkType.Advanced);
|
||||
|
|
@ -116,14 +116,14 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
@Override
|
||||
public Network design(final NetworkOffering offering, final DeploymentPlan plan, final Network userSpecified, final Account owner) {
|
||||
// Check of the isolation type of the related physical network is supported
|
||||
PhysicalNetworkVO physnet = physicalNetworkDao.findById(plan.getPhysicalNetworkId());
|
||||
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
|
||||
final PhysicalNetworkVO physnet = physicalNetworkDao.findById(plan.getPhysicalNetworkId());
|
||||
final DataCenter dc = _dcDao.findById(plan.getDataCenterId());
|
||||
if (!canHandle(offering, dc.getNetworkType(), physnet)) {
|
||||
s_logger.debug("Refusing to design this network");
|
||||
return null;
|
||||
}
|
||||
|
||||
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physnet.getId());
|
||||
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physnet.getId());
|
||||
if (devices.isEmpty()) {
|
||||
s_logger.error("No NiciraNvp Controller on physical network " + physnet.getName());
|
||||
return null;
|
||||
|
|
@ -131,11 +131,10 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
s_logger.debug("Nicira Nvp " + devices.get(0).getUuid() + " found on physical network " + physnet.getId());
|
||||
|
||||
s_logger.debug("Physical isolation type is supported, asking GuestNetworkGuru to design this network");
|
||||
NetworkVO networkObject = (NetworkVO)super.design(offering, plan, userSpecified, owner);
|
||||
final NetworkVO networkObject = (NetworkVO) super.design(offering, plan, userSpecified, owner);
|
||||
if (networkObject == null) {
|
||||
return null;
|
||||
}
|
||||
// Override the broadcast domain type
|
||||
networkObject.setBroadcastDomainType(BroadcastDomainType.Lswitch);
|
||||
|
||||
return networkObject;
|
||||
|
|
@ -143,12 +142,11 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
|
||||
@Override
|
||||
public Network implement(final Network network, final NetworkOffering offering, final DeployDestination dest, final ReservationContext context)
|
||||
throws InsufficientVirtualNetworkCapacityException {
|
||||
assert (network.getState() == State.Implementing) : "Why are we implementing " + network;
|
||||
throws InsufficientVirtualNetworkCapacityException {
|
||||
assert network.getState() == State.Implementing : "Why are we implementing " + network;
|
||||
|
||||
long dcId = dest.getDataCenter().getId();
|
||||
final long dcId = dest.getDataCenter().getId();
|
||||
|
||||
//get physical network id
|
||||
Long physicalNetworkId = network.getPhysicalNetworkId();
|
||||
|
||||
// physical network id can be null in Guest Network in Basic zone, so locate the physical network
|
||||
|
|
@ -156,9 +154,8 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
physicalNetworkId = networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType());
|
||||
}
|
||||
|
||||
NetworkVO implemented =
|
||||
new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated,
|
||||
network.getDataCenterId(), physicalNetworkId, offering.getRedundantRouter());
|
||||
final NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(),
|
||||
State.Allocated, network.getDataCenterId(), physicalNetworkId, offering.getRedundantRouter());
|
||||
|
||||
if (network.getGateway() != null) {
|
||||
implemented.setGateway(network.getGateway());
|
||||
|
|
@ -171,26 +168,26 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
// Name is either the given name or the uuid
|
||||
String name = network.getName();
|
||||
if (name == null || name.isEmpty()) {
|
||||
name = ((NetworkVO)network).getUuid();
|
||||
name = ((NetworkVO) network).getUuid();
|
||||
}
|
||||
if (name.length() > MAX_NAME_LENGTH) {
|
||||
name = name.substring(0, MAX_NAME_LENGTH - 1); // max length 40
|
||||
name = name.substring(0, MAX_NAME_LENGTH - 1);
|
||||
}
|
||||
|
||||
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physicalNetworkId);
|
||||
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physicalNetworkId);
|
||||
if (devices.isEmpty()) {
|
||||
s_logger.error("No NiciraNvp Controller on physical network " + physicalNetworkId);
|
||||
return null;
|
||||
}
|
||||
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
|
||||
HostVO niciraNvpHost = hostDao.findById(niciraNvpDevice.getHostId());
|
||||
final NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
|
||||
final HostVO niciraNvpHost = hostDao.findById(niciraNvpDevice.getHostId());
|
||||
hostDao.loadDetails(niciraNvpHost);
|
||||
String transportzoneuuid = niciraNvpHost.getDetail("transportzoneuuid");
|
||||
String transportzoneisotype = niciraNvpHost.getDetail("transportzoneisotype");
|
||||
final String transportzoneuuid = niciraNvpHost.getDetail("transportzoneuuid");
|
||||
final String transportzoneisotype = niciraNvpHost.getDetail("transportzoneisotype");
|
||||
|
||||
CreateLogicalSwitchCommand cmd =
|
||||
new CreateLogicalSwitchCommand(transportzoneuuid, transportzoneisotype, name, context.getDomain().getName() + "-" + context.getAccount().getAccountName());
|
||||
CreateLogicalSwitchAnswer answer = (CreateLogicalSwitchAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
|
||||
final CreateLogicalSwitchCommand cmd = new CreateLogicalSwitchCommand(transportzoneuuid, transportzoneisotype, name, context.getDomain().getName() + "-"
|
||||
+ context.getAccount().getAccountName());
|
||||
final CreateLogicalSwitchAnswer answer = (CreateLogicalSwitchAnswer) agentMgr.easySend(niciraNvpHost.getId(), cmd);
|
||||
|
||||
if (answer == null || !answer.getResult()) {
|
||||
s_logger.error("CreateLogicalSwitchCommand failed");
|
||||
|
|
@ -201,7 +198,7 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
implemented.setBroadcastUri(new URI("lswitch", answer.getLogicalSwitchUuid(), null));
|
||||
implemented.setBroadcastDomainType(BroadcastDomainType.Lswitch);
|
||||
s_logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
|
||||
} catch (URISyntaxException e) {
|
||||
} catch (final URISyntaxException e) {
|
||||
s_logger.error("Unable to store logical switch id in broadcast uri, uuid = " + implemented.getUuid(), e);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -211,35 +208,33 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
|
|||
|
||||
@Override
|
||||
public void reserve(final NicProfile nic, final Network network, final VirtualMachineProfile vm, final DeployDestination dest, final ReservationContext context)
|
||||
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
|
||||
// TODO Auto-generated method stub
|
||||
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
|
||||
super.reserve(nic, network, vm, dest, context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean release(final NicProfile nic, final VirtualMachineProfile vm, final String reservationId) {
|
||||
// TODO Auto-generated method stub
|
||||
return super.release(nic, vm, reservationId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown(final NetworkProfile profile, final NetworkOffering offering) {
|
||||
NetworkVO networkObject = networkDao.findById(profile.getId());
|
||||
final NetworkVO networkObject = networkDao.findById(profile.getId());
|
||||
if (networkObject.getBroadcastDomainType() != BroadcastDomainType.Lswitch || networkObject.getBroadcastUri() == null) {
|
||||
s_logger.warn("BroadcastUri is empty or incorrect for guestnetwork " + networkObject.getDisplayText());
|
||||
return;
|
||||
}
|
||||
|
||||
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(networkObject.getPhysicalNetworkId());
|
||||
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(networkObject.getPhysicalNetworkId());
|
||||
if (devices.isEmpty()) {
|
||||
s_logger.error("No NiciraNvp Controller on physical network " + networkObject.getPhysicalNetworkId());
|
||||
return;
|
||||
}
|
||||
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
|
||||
HostVO niciraNvpHost = hostDao.findById(niciraNvpDevice.getHostId());
|
||||
final NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
|
||||
final HostVO niciraNvpHost = hostDao.findById(niciraNvpDevice.getHostId());
|
||||
|
||||
DeleteLogicalSwitchCommand cmd = new DeleteLogicalSwitchCommand(BroadcastDomainType.getValue(networkObject.getBroadcastUri()));
|
||||
DeleteLogicalSwitchAnswer answer = (DeleteLogicalSwitchAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
|
||||
final DeleteLogicalSwitchCommand cmd = new DeleteLogicalSwitchCommand(BroadcastDomainType.getValue(networkObject.getBroadcastUri()));
|
||||
final DeleteLogicalSwitchAnswer answer = (DeleteLogicalSwitchAnswer) agentMgr.easySend(niciraNvpHost.getId(), cmd);
|
||||
|
||||
if (answer == null || !answer.getResult()) {
|
||||
s_logger.error("DeleteLogicalSwitchCommand failed");
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
//
|
||||
|
||||
package com.cloud.network.nicira;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
|
@ -26,6 +27,9 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.cloud.utils.rest.CloudstackRESTException;
|
||||
import com.cloud.utils.rest.RESTServiceConnector;
|
||||
import com.cloud.utils.rest.RESTValidationStrategy;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
|
|
@ -33,10 +37,6 @@ import com.google.gson.JsonObject;
|
|||
import com.google.gson.JsonParseException;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
import com.cloud.utils.rest.CloudstackRESTException;
|
||||
import com.cloud.utils.rest.RESTServiceConnector;
|
||||
import com.cloud.utils.rest.RESTValidationStrategy;
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public class NiciraNvpApi {
|
||||
protected static final String GET_METHOD_TYPE = "get";
|
||||
|
|
@ -175,29 +175,25 @@ public class NiciraNvpApi {
|
|||
}
|
||||
|
||||
/**
|
||||
* PUT item given a UUID as key and an item object
|
||||
* with the new data
|
||||
* PUT item given a UUID as key and an item object with the new data
|
||||
*
|
||||
* @param item
|
||||
* @param uuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public <T> void update(final T item, final String uuid)
|
||||
throws NiciraNvpApiException {
|
||||
public <T> void update(final T item, final String uuid) throws NiciraNvpApiException {
|
||||
final String uri = prefixMap.get(item.getClass()) + "/" + uuid;
|
||||
updateWithUri(item, uri);
|
||||
}
|
||||
|
||||
/**
|
||||
* PUT item given a UUID as key and an item object
|
||||
* with the new data
|
||||
* PUT item given a UUID as key and an item object with the new data
|
||||
*
|
||||
* @param item
|
||||
* @param uuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public <T> void updateWithUri(final T item, final String uri)
|
||||
throws NiciraNvpApiException {
|
||||
public <T> void updateWithUri(final T item, final String uri) throws NiciraNvpApiException {
|
||||
try {
|
||||
restConnector.executeUpdateObject(item, uri, Collections.<String, String> emptyMap());
|
||||
} catch (final CloudstackRESTException e) {
|
||||
|
|
@ -211,8 +207,7 @@ public class NiciraNvpApi {
|
|||
* @param securityProfileUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public <T> void delete(final String uuid, final Class<T> clazz)
|
||||
throws NiciraNvpApiException {
|
||||
public <T> void delete(final String uuid, final Class<T> clazz) throws NiciraNvpApiException {
|
||||
final String uri = prefixMap.get(clazz) + "/" + uuid;
|
||||
deleteWithUri(uri);
|
||||
}
|
||||
|
|
@ -223,8 +218,7 @@ public class NiciraNvpApi {
|
|||
* @param securityProfileUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public <T> void deleteWithUri(final String uri)
|
||||
throws NiciraNvpApiException {
|
||||
public void deleteWithUri(final String uri) throws NiciraNvpApiException {
|
||||
try {
|
||||
restConnector.executeDeleteObject(uri);
|
||||
} catch (final CloudstackRESTException e) {
|
||||
|
|
@ -256,9 +250,7 @@ public class NiciraNvpApi {
|
|||
/**
|
||||
* GET list of {@link SecurityProfile} filtered by UUID
|
||||
*
|
||||
* We could have invoked the service:
|
||||
* SEC_PROFILE_URI_PREFIX + "/" + securityProfileUuid
|
||||
* but it is not working currently
|
||||
* We could have invoked the service: SEC_PROFILE_URI_PREFIX + "/" + securityProfileUuid but it is not working currently
|
||||
*
|
||||
* @param uuid
|
||||
* @return
|
||||
|
|
@ -269,16 +261,13 @@ public class NiciraNvpApi {
|
|||
}
|
||||
|
||||
/**
|
||||
* PUT {@link SecurityProfile} given a UUID as key and a {@link SecurityProfile}
|
||||
* with the new data
|
||||
* PUT {@link SecurityProfile} given a UUID as key and a {@link SecurityProfile} with the new data
|
||||
*
|
||||
* @param securityProfile
|
||||
* @param securityProfileUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public void updateSecurityProfile(final SecurityProfile securityProfile,
|
||||
final String securityProfileUuid)
|
||||
throws NiciraNvpApiException {
|
||||
public void updateSecurityProfile(final SecurityProfile securityProfile, final String securityProfileUuid) throws NiciraNvpApiException {
|
||||
update(securityProfile, securityProfileUuid);
|
||||
}
|
||||
|
||||
|
|
@ -288,12 +277,10 @@ public class NiciraNvpApi {
|
|||
* @param securityProfileUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public void deleteSecurityProfile(final String securityProfileUuid)
|
||||
throws NiciraNvpApiException {
|
||||
public void deleteSecurityProfile(final String securityProfileUuid) throws NiciraNvpApiException {
|
||||
delete(securityProfileUuid, SecurityProfile.class);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* POST {@link Acl}
|
||||
*
|
||||
|
|
@ -327,16 +314,13 @@ public class NiciraNvpApi {
|
|||
}
|
||||
|
||||
/**
|
||||
* PUT {@link Acl} given a UUID as key and a {@link Acl}
|
||||
* with the new data
|
||||
* PUT {@link Acl} given a UUID as key and a {@link Acl} with the new data
|
||||
*
|
||||
* @param acl
|
||||
* @param aclUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public void updateAcl(final Acl acl,
|
||||
final String aclUuid)
|
||||
throws NiciraNvpApiException {
|
||||
public void updateAcl(final Acl acl, final String aclUuid) throws NiciraNvpApiException {
|
||||
update(acl, aclUuid);
|
||||
}
|
||||
|
||||
|
|
@ -376,16 +360,13 @@ public class NiciraNvpApi {
|
|||
}
|
||||
|
||||
/**
|
||||
* PUT {@link LogicalSwitch} given a UUID as key and a {@link LogicalSwitch}
|
||||
* with the new data
|
||||
* PUT {@link LogicalSwitch} given a UUID as key and a {@link LogicalSwitch} with the new data
|
||||
*
|
||||
* @param logicalSwitch
|
||||
* @param logicalSwitchUuid
|
||||
* @throws NiciraNvpApiException
|
||||
*/
|
||||
public void updateLogicalSwitch(final LogicalSwitch logicalSwitch,
|
||||
final String logicalSwitchUuid)
|
||||
throws NiciraNvpApiException {
|
||||
public void updateLogicalSwitch(final LogicalSwitch logicalSwitch, final String logicalSwitchUuid) throws NiciraNvpApiException {
|
||||
update(logicalSwitch, logicalSwitchUuid);
|
||||
}
|
||||
|
||||
|
|
@ -403,8 +384,7 @@ public class NiciraNvpApi {
|
|||
updateWithUri(logicalSwitchPort, uri);
|
||||
}
|
||||
|
||||
public void updateLogicalSwitchPortAttachment(final String logicalSwitchUuid, final String logicalSwitchPortUuid,
|
||||
final Attachment attachment) throws NiciraNvpApiException {
|
||||
public void updateLogicalSwitchPortAttachment(final String logicalSwitchUuid, final String logicalSwitchPortUuid, final Attachment attachment) throws NiciraNvpApiException {
|
||||
final String uri = SWITCH_URI_PREFIX + "/" + logicalSwitchUuid + "/lport/" + logicalSwitchPortUuid + "/attachment";
|
||||
updateWithUri(attachment, uri);
|
||||
}
|
||||
|
|
@ -520,9 +500,7 @@ public class NiciraNvpApi {
|
|||
return findLogicalRouter(logicalRouterUuid).getResults().get(0);
|
||||
}
|
||||
|
||||
public void updateLogicalRouter(final LogicalRouter logicalRouter,
|
||||
final String logicalRouterUuid)
|
||||
throws NiciraNvpApiException {
|
||||
public void updateLogicalRouter(final LogicalRouter logicalRouter, final String logicalRouterUuid) throws NiciraNvpApiException {
|
||||
update(logicalRouter, logicalRouterUuid);
|
||||
}
|
||||
|
||||
|
|
@ -546,8 +524,7 @@ public class NiciraNvpApi {
|
|||
updateWithUri(logicalRouterPort, uri);
|
||||
}
|
||||
|
||||
public void updateLogicalRouterPortAttachment(final String logicalRouterUuid, final String logicalRouterPortUuid, final Attachment attachment)
|
||||
throws NiciraNvpApiException {
|
||||
public void updateLogicalRouterPortAttachment(final String logicalRouterUuid, final String logicalRouterPortUuid, final Attachment attachment) throws NiciraNvpApiException {
|
||||
final String uri = ROUTER_URI_PREFIX + "/" + logicalRouterUuid + "/lport/" + logicalRouterPortUuid + "/attachment";
|
||||
updateWithUri(attachment, uri);
|
||||
}
|
||||
|
|
@ -567,12 +544,12 @@ public class NiciraNvpApi {
|
|||
deleteWithUri(uri);
|
||||
}
|
||||
|
||||
public NiciraNvpList<LogicalRouterPort> findLogicalRouterPortByGatewayServiceAndVlanId(final String logicalRouterUuid, final String gatewayServiceUuid,
|
||||
final long vlanId) throws NiciraNvpApiException {
|
||||
public NiciraNvpList<LogicalRouterPort> findLogicalRouterPortByGatewayServiceAndVlanId(final String logicalRouterUuid, final String gatewayServiceUuid, final long vlanId)
|
||||
throws NiciraNvpApiException {
|
||||
final String uri = ROUTER_URI_PREFIX + "/" + logicalRouterUuid + "/lport";
|
||||
final Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("attachment_gwsvc_uuid", gatewayServiceUuid);
|
||||
params.put("attachment_vlan", "0");
|
||||
params.put("attachment_vlan", Long.toString(vlanId));
|
||||
params.put("fields", "*");
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -65,32 +65,32 @@ public class NiciraNvpResource implements ServerResource {
|
|||
@Override
|
||||
public boolean configure(final String ignoredName, final Map<String, Object> params) throws ConfigurationException {
|
||||
|
||||
name = (String)params.get("name");
|
||||
name = (String) params.get("name");
|
||||
if (name == null) {
|
||||
throw new ConfigurationException("Unable to find name");
|
||||
}
|
||||
|
||||
guid = (String)params.get("guid");
|
||||
guid = (String) params.get("guid");
|
||||
if (guid == null) {
|
||||
throw new ConfigurationException("Unable to find the guid");
|
||||
}
|
||||
|
||||
zoneId = (String)params.get("zoneId");
|
||||
zoneId = (String) params.get("zoneId");
|
||||
if (zoneId == null) {
|
||||
throw new ConfigurationException("Unable to find zone");
|
||||
}
|
||||
|
||||
final String ip = (String)params.get("ip");
|
||||
final String ip = (String) params.get("ip");
|
||||
if (ip == null) {
|
||||
throw new ConfigurationException("Unable to find IP");
|
||||
}
|
||||
|
||||
final String adminuser = (String)params.get("adminuser");
|
||||
final String adminuser = (String) params.get("adminuser");
|
||||
if (adminuser == null) {
|
||||
throw new ConfigurationException("Unable to find admin username");
|
||||
}
|
||||
|
||||
final String adminpass = (String)params.get("adminpass");
|
||||
final String adminpass = (String) params.get("adminpass");
|
||||
if (adminpass == null) {
|
||||
throw new ConfigurationException("Unable to find admin password");
|
||||
}
|
||||
|
|
@ -149,7 +149,7 @@ public class NiciraNvpResource implements ServerResource {
|
|||
sc.setPrivateIpAddress("");
|
||||
sc.setStorageIpAddress("");
|
||||
sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion());
|
||||
return new StartupCommand[] {sc};
|
||||
return new StartupCommand[] { sc };
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -212,16 +212,16 @@ public class NiciraNvpResource implements ServerResource {
|
|||
natRuleStr.append(m.getDestinationPort());
|
||||
natRuleStr.append(" ]) -->");
|
||||
if ("SourceNatRule".equals(rule.getType())) {
|
||||
natRuleStr.append(((SourceNatRule)rule).getToSourceIpAddressMin());
|
||||
natRuleStr.append(((SourceNatRule) rule).getToSourceIpAddressMin());
|
||||
natRuleStr.append("-");
|
||||
natRuleStr.append(((SourceNatRule)rule).getToSourceIpAddressMax());
|
||||
natRuleStr.append(((SourceNatRule) rule).getToSourceIpAddressMax());
|
||||
natRuleStr.append(" [");
|
||||
natRuleStr.append(((SourceNatRule)rule).getToSourcePort());
|
||||
natRuleStr.append(((SourceNatRule) rule).getToSourcePort());
|
||||
natRuleStr.append(" ])");
|
||||
} else {
|
||||
natRuleStr.append(((DestinationNatRule)rule).getToDestinationIpAddress());
|
||||
natRuleStr.append(((DestinationNatRule) rule).getToDestinationIpAddress());
|
||||
natRuleStr.append(" [");
|
||||
natRuleStr.append(((DestinationNatRule)rule).getToDestinationPort());
|
||||
natRuleStr.append(((DestinationNatRule) rule).getToDestinationPort());
|
||||
natRuleStr.append(" ])");
|
||||
}
|
||||
return natRuleStr.toString();
|
||||
|
|
@ -247,25 +247,25 @@ public class NiciraNvpResource implements ServerResource {
|
|||
Match m = new Match();
|
||||
m.setDestinationIpAddresses(outsideIp);
|
||||
rulepair[0].setMatch(m);
|
||||
((DestinationNatRule)rulepair[0]).setToDestinationIpAddress(insideIp);
|
||||
((DestinationNatRule) rulepair[0]).setToDestinationIpAddress(insideIp);
|
||||
|
||||
// create matching snat rule
|
||||
m = new Match();
|
||||
m.setSourceIpAddresses(insideIp);
|
||||
rulepair[1].setMatch(m);
|
||||
((SourceNatRule)rulepair[1]).setToSourceIpAddressMin(outsideIp);
|
||||
((SourceNatRule)rulepair[1]).setToSourceIpAddressMax(outsideIp);
|
||||
((SourceNatRule) rulepair[1]).setToSourceIpAddressMin(outsideIp);
|
||||
((SourceNatRule) rulepair[1]).setToSourceIpAddressMax(outsideIp);
|
||||
|
||||
return rulepair;
|
||||
|
||||
}
|
||||
|
||||
public NatRule[] generatePortForwardingRulePair(final String insideIp, final int[] insidePorts, final String outsideIp, final int[] outsidePorts,
|
||||
final String protocol) {
|
||||
final String protocol) {
|
||||
// Start with a basic static nat rule, then add port and protocol details
|
||||
final NatRule[] rulepair = generateStaticNatRulePair(insideIp, outsideIp);
|
||||
|
||||
((DestinationNatRule)rulepair[0]).setToDestinationPort(insidePorts[0]);
|
||||
((DestinationNatRule) rulepair[0]).setToDestinationPort(insidePorts[0]);
|
||||
rulepair[0].getMatch().setDestinationPort(outsidePorts[0]);
|
||||
rulepair[0].setOrder(50);
|
||||
rulepair[0].getMatch().setEthertype("IPv4");
|
||||
|
|
@ -275,7 +275,7 @@ public class NiciraNvpResource implements ServerResource {
|
|||
rulepair[0].getMatch().setProtocol(17);
|
||||
}
|
||||
|
||||
((SourceNatRule)rulepair[1]).setToSourcePort(outsidePorts[0]);
|
||||
((SourceNatRule) rulepair[1]).setToSourcePort(outsidePorts[0]);
|
||||
rulepair[1].getMatch().setSourcePort(insidePorts[0]);
|
||||
rulepair[1].setOrder(50);
|
||||
rulepair[1].getMatch().setEthertype("IPv4");
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import com.cloud.network.utils.CommandRetryUtility;
|
|||
import com.cloud.resource.CommandWrapper;
|
||||
import com.cloud.resource.ResourceWrapper;
|
||||
|
||||
@ResourceWrapper(handles = ConfigurePortForwardingRulesOnLogicalRouterCommand.class)
|
||||
@ResourceWrapper(handles = ConfigurePortForwardingRulesOnLogicalRouterCommand.class)
|
||||
public final class NiciraNvpConfigurePortForwardingRulesCommandWrapper extends CommandWrapper<ConfigurePortForwardingRulesOnLogicalRouterCommand, Answer, NiciraNvpResource> {
|
||||
|
||||
private static final Logger s_logger = Logger.getLogger(NiciraNvpConfigurePortForwardingRulesCommandWrapper.class);
|
||||
|
|
@ -60,7 +60,8 @@ public final class NiciraNvpConfigurePortForwardingRulesCommandWrapper extends C
|
|||
return new ConfigurePortForwardingRulesOnLogicalRouterAnswer(command, false, "Nicira NVP doesn't support port ranges for port forwarding");
|
||||
}
|
||||
|
||||
final NatRule[] rulepair = niciraNvpResource.generatePortForwardingRulePair(rule.getDstIp(), rule.getDstPortRange(), rule.getSrcIp(), rule.getSrcPortRange(), rule.getProtocol());
|
||||
final NatRule[] rulepair = niciraNvpResource.generatePortForwardingRulePair(rule.getDstIp(), rule.getDstPortRange(), rule.getSrcIp(), rule.getSrcPortRange(),
|
||||
rule.getProtocol());
|
||||
|
||||
NatRule incoming = null;
|
||||
NatRule outgoing = null;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import com.cloud.network.utils.CommandRetryUtility;
|
|||
import com.cloud.resource.CommandWrapper;
|
||||
import com.cloud.resource.ResourceWrapper;
|
||||
|
||||
@ResourceWrapper(handles = ConfigurePublicIpsOnLogicalRouterCommand.class)
|
||||
@ResourceWrapper(handles = ConfigurePublicIpsOnLogicalRouterCommand.class)
|
||||
public final class NiciraNvpConfigurePublicIpsCommandWrapper extends CommandWrapper<ConfigurePublicIpsOnLogicalRouterCommand, Answer, NiciraNvpResource> {
|
||||
|
||||
@Override
|
||||
|
|
@ -50,7 +50,7 @@ public final class NiciraNvpConfigurePublicIpsCommandWrapper extends CommandWrap
|
|||
niciraNvpApi.updateLogicalRouterPort(command.getLogicalRouterUuid(), lrp);
|
||||
|
||||
return new ConfigurePublicIpsOnLogicalRouterAnswer(command, true, "Configured " + command.getPublicCidrs().size() + " ip addresses on logical router uuid " +
|
||||
command.getLogicalRouterUuid());
|
||||
command.getLogicalRouterUuid());
|
||||
} catch (final NiciraNvpApiException e) {
|
||||
final CommandRetryUtility retryUtility = niciraNvpResource.getRetryUtility();
|
||||
retryUtility.addRetry(command, NUM_RETRIES);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import com.cloud.network.utils.CommandRetryUtility;
|
|||
import com.cloud.resource.CommandWrapper;
|
||||
import com.cloud.resource.ResourceWrapper;
|
||||
|
||||
@ResourceWrapper(handles = ConfigureStaticNatRulesOnLogicalRouterCommand.class)
|
||||
@ResourceWrapper(handles = ConfigureStaticNatRulesOnLogicalRouterCommand.class)
|
||||
public final class NiciraNvpConfigureStaticNatRulesCommandWrapper extends CommandWrapper<ConfigureStaticNatRulesOnLogicalRouterCommand, Answer, NiciraNvpResource> {
|
||||
|
||||
private static final Logger s_logger = Logger.getLogger(NiciraNvpConfigureStaticNatRulesCommandWrapper.class);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import com.cloud.network.utils.CommandRetryUtility;
|
|||
import com.cloud.resource.CommandWrapper;
|
||||
import com.cloud.resource.ResourceWrapper;
|
||||
|
||||
@ResourceWrapper(handles = FindLogicalSwitchPortCommand.class)
|
||||
@ResourceWrapper(handles = FindLogicalSwitchPortCommand.class)
|
||||
public final class NiciraNvpFindLogicalSwitchPortCommandWrapper extends CommandWrapper<FindLogicalSwitchPortCommand, Answer, NiciraNvpResource> {
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ public class NiciraNvpRequestWrapperTest {
|
|||
ports.setResultCount(1);
|
||||
|
||||
final String logicalRouterUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
final String l3GatewayServiceUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
final String l3GatewayServiceUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
final List<String> publicCidrs = new ArrayList<String>();
|
||||
publicCidrs.add("10.1.1.0/24");
|
||||
|
||||
|
|
@ -177,7 +177,7 @@ public class NiciraNvpRequestWrapperTest {
|
|||
final NiciraNvpApi niciraNvpApi = Mockito.mock(NiciraNvpApi.class);
|
||||
|
||||
final String logicalSwitchUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
final String logicalSwitchPortUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
final String logicalSwitchPortUuid = "d2e05a9e-7120-4487-a5fc-414ab36d9345";
|
||||
|
||||
final DeleteLogicalSwitchPortCommand command = new DeleteLogicalSwitchPortCommand(logicalSwitchUuid, logicalSwitchPortUuid);
|
||||
|
||||
|
|
|
|||
|
|
@ -189,10 +189,10 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitch ls = mock(LogicalSwitch.class);
|
||||
when(ls.getUuid()).thenReturn("cccc").thenReturn("cccc");
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch)any())).thenThrow(new NiciraNvpApiException()).thenThrow(new NiciraNvpApiException()).thenReturn(ls);
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch) any())).thenThrow(new NiciraNvpApiException()).thenThrow(new NiciraNvpApiException()).thenReturn(ls);
|
||||
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String)parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer)resource.executeRequest(clsc);
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String) parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer) resource.executeRequest(clsc);
|
||||
assertTrue(clsa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -202,10 +202,10 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitch ls = mock(LogicalSwitch.class);
|
||||
when(ls.getUuid()).thenReturn("cccc").thenReturn("cccc");
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch)any())).thenReturn(ls);
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch) any())).thenReturn(ls);
|
||||
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String)parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer)resource.executeRequest(clsc);
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String) parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer) resource.executeRequest(clsc);
|
||||
assertTrue(clsa.getResult());
|
||||
assertTrue("cccc".equals(clsa.getLogicalSwitchUuid()));
|
||||
}
|
||||
|
|
@ -216,19 +216,19 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitch ls = mock(LogicalSwitch.class);
|
||||
when(ls.getUuid()).thenReturn("cccc").thenReturn("cccc");
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch)any())).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalSwitch((LogicalSwitch) any())).thenThrow(new NiciraNvpApiException());
|
||||
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String)parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer)resource.executeRequest(clsc);
|
||||
final CreateLogicalSwitchCommand clsc = new CreateLogicalSwitchCommand((String) parameters.get("guid"), "stt", "loigicalswitch", "owner");
|
||||
final CreateLogicalSwitchAnswer clsa = (CreateLogicalSwitchAnswer) resource.executeRequest(clsc);
|
||||
assertFalse(clsa.getResult());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteLogicalSwitch() throws ConfigurationException, NiciraNvpApiException {
|
||||
public void testDeleteLogicalSwitch() throws ConfigurationException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
final DeleteLogicalSwitchCommand dlsc = new DeleteLogicalSwitchCommand("cccc");
|
||||
final DeleteLogicalSwitchAnswer dlsa = (DeleteLogicalSwitchAnswer)resource.executeRequest(dlsc);
|
||||
final DeleteLogicalSwitchAnswer dlsa = (DeleteLogicalSwitchAnswer) resource.executeRequest(dlsc);
|
||||
assertTrue(dlsa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -236,10 +236,10 @@ public class NiciraNvpResourceTest {
|
|||
public void testDeleteLogicalSwitchApiException() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).deleteLogicalSwitch((String)any());
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).deleteLogicalSwitch((String) any());
|
||||
|
||||
final DeleteLogicalSwitchCommand dlsc = new DeleteLogicalSwitchCommand("cccc");
|
||||
final DeleteLogicalSwitchAnswer dlsa = (DeleteLogicalSwitchAnswer)resource.executeRequest(dlsc);
|
||||
final DeleteLogicalSwitchAnswer dlsa = (DeleteLogicalSwitchAnswer) resource.executeRequest(dlsc);
|
||||
assertFalse(dlsa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -249,10 +249,10 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitchPort lsp = mock(LogicalSwitchPort.class);
|
||||
when(lsp.getUuid()).thenReturn("eeee");
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort)any())).thenReturn(lsp);
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort) any())).thenReturn(lsp);
|
||||
|
||||
final CreateLogicalSwitchPortCommand clspc = new CreateLogicalSwitchPortCommand("cccc", "dddd", "owner", "nicname");
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer)resource.executeRequest(clspc);
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer) resource.executeRequest(clspc);
|
||||
assertTrue(clspa.getResult());
|
||||
assertTrue("eeee".equals(clspa.getLogicalSwitchPortUuid()));
|
||||
|
||||
|
|
@ -264,10 +264,10 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitchPort lsp = mock(LogicalSwitchPort.class);
|
||||
when(lsp.getUuid()).thenReturn("eeee");
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort)any())).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort) any())).thenThrow(new NiciraNvpApiException());
|
||||
|
||||
final CreateLogicalSwitchPortCommand clspc = new CreateLogicalSwitchPortCommand("cccc", "dddd", "owner", "nicname");
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer)resource.executeRequest(clspc);
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer) resource.executeRequest(clspc);
|
||||
assertFalse(clspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -277,21 +277,21 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalSwitchPort lsp = mock(LogicalSwitchPort.class);
|
||||
when(lsp.getUuid()).thenReturn("eeee");
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort)any())).thenReturn(lsp);
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalSwitchPortAttachment((String)any(), (String)any(), (Attachment)any());
|
||||
when(nvpApi.createLogicalSwitchPort(eq("cccc"), (LogicalSwitchPort) any())).thenReturn(lsp);
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalSwitchPortAttachment((String) any(), (String) any(), (Attachment) any());
|
||||
|
||||
final CreateLogicalSwitchPortCommand clspc = new CreateLogicalSwitchPortCommand("cccc", "dddd", "owner", "nicname");
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer)resource.executeRequest(clspc);
|
||||
final CreateLogicalSwitchPortAnswer clspa = (CreateLogicalSwitchPortAnswer) resource.executeRequest(clspc);
|
||||
assertFalse(clspa.getResult());
|
||||
verify(nvpApi, atLeastOnce()).deleteLogicalSwitchPort((String)any(), (String)any());
|
||||
verify(nvpApi, atLeastOnce()).deleteLogicalSwitchPort((String) any(), (String) any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteLogicalSwitchPortException() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).deleteLogicalSwitchPort((String)any(), (String)any());
|
||||
final DeleteLogicalSwitchPortAnswer dlspa = (DeleteLogicalSwitchPortAnswer)resource.executeRequest(new DeleteLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).deleteLogicalSwitchPort((String) any(), (String) any());
|
||||
final DeleteLogicalSwitchPortAnswer dlspa = (DeleteLogicalSwitchPortAnswer) resource.executeRequest(new DeleteLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
assertFalse(dlspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -299,9 +299,9 @@ public class NiciraNvpResourceTest {
|
|||
public void testUpdateLogicalSwitchPortException() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalSwitchPortAttachment((String)any(), (String)any(), (Attachment)any());
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalSwitchPortAttachment((String) any(), (String) any(), (Attachment) any());
|
||||
final UpdateLogicalSwitchPortAnswer dlspa =
|
||||
(UpdateLogicalSwitchPortAnswer)resource.executeRequest(new UpdateLogicalSwitchPortCommand("aaaa", "bbbb", "cccc", "owner", "nicname"));
|
||||
(UpdateLogicalSwitchPortAnswer) resource.executeRequest(new UpdateLogicalSwitchPortCommand("aaaa", "bbbb", "cccc", "owner", "nicname"));
|
||||
assertFalse(dlspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -315,7 +315,7 @@ public class NiciraNvpResourceTest {
|
|||
when(lspl.getResultCount()).thenReturn(1);
|
||||
when(nvpApi.findLogicalSwitchPortsByUuid("aaaa", "bbbb")).thenReturn(lspl);
|
||||
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer)resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer) resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
assertTrue(flspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -329,7 +329,7 @@ public class NiciraNvpResourceTest {
|
|||
when(lspl.getResultCount()).thenReturn(0);
|
||||
when(nvpApi.findLogicalSwitchPortsByUuid("aaaa", "bbbb")).thenReturn(lspl);
|
||||
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer)resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer) resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
assertFalse(flspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -339,7 +339,7 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
when(nvpApi.findLogicalSwitchPortsByUuid("aaaa", "bbbb")).thenThrow(new NiciraNvpApiException());
|
||||
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer)resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
final FindLogicalSwitchPortAnswer flspa = (FindLogicalSwitchPortAnswer) resource.executeRequest(new FindLogicalSwitchPortCommand("aaaa", "bbbb"));
|
||||
assertFalse(flspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -353,24 +353,24 @@ public class NiciraNvpResourceTest {
|
|||
when(lrc.getUuid()).thenReturn("ccccc");
|
||||
when(lrp.getUuid()).thenReturn("ddddd").thenReturn("eeeee");
|
||||
when(lsp.getUuid()).thenReturn("fffff");
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter)any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort)any())).thenReturn(lrp);
|
||||
when(nvpApi.createLogicalSwitchPort(eq("bbbbb"), (LogicalSwitchPort)any())).thenReturn(lsp);
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter) any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort) any())).thenReturn(lrp);
|
||||
when(nvpApi.createLogicalSwitchPort(eq("bbbbb"), (LogicalSwitchPort) any())).thenReturn(lsp);
|
||||
final CreateLogicalRouterCommand clrc = new CreateLogicalRouterCommand("aaaaa", 50, "bbbbb", "lrouter", "publiccidr", "nexthop", "internalcidr", "owner");
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer)resource.executeRequest(clrc);
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer) resource.executeRequest(clrc);
|
||||
|
||||
assertTrue(clra.getResult());
|
||||
assertTrue("ccccc".equals(clra.getLogicalRouterUuid()));
|
||||
verify(nvpApi, atLeast(1)).createLogicalRouterNatRule((String)any(), (NatRule)any());
|
||||
verify(nvpApi, atLeast(1)).createLogicalRouterNatRule((String) any(), (NatRule) any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateLogicalRouterApiException() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter)any())).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter) any())).thenThrow(new NiciraNvpApiException());
|
||||
final CreateLogicalRouterCommand clrc = new CreateLogicalRouterCommand("aaaaa", 50, "bbbbb", "lrouter", "publiccidr", "nexthop", "internalcidr", "owner");
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer)resource.executeRequest(clrc);
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer) resource.executeRequest(clrc);
|
||||
|
||||
assertFalse(clra.getResult());
|
||||
}
|
||||
|
|
@ -381,10 +381,10 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
final LogicalRouter lrc = mock(LogicalRouter.class);
|
||||
when(lrc.getUuid()).thenReturn("ccccc");
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter)any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort)any())).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter) any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort) any())).thenThrow(new NiciraNvpApiException());
|
||||
final CreateLogicalRouterCommand clrc = new CreateLogicalRouterCommand("aaaaa", 50, "bbbbb", "lrouter", "publiccidr", "nexthop", "internalcidr", "owner");
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer)resource.executeRequest(clrc);
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer) resource.executeRequest(clrc);
|
||||
|
||||
assertFalse(clra.getResult());
|
||||
verify(nvpApi, atLeast(1)).deleteLogicalRouter(eq("ccccc"));
|
||||
|
|
@ -400,12 +400,12 @@ public class NiciraNvpResourceTest {
|
|||
when(lrc.getUuid()).thenReturn("ccccc");
|
||||
when(lrp.getUuid()).thenReturn("ddddd").thenReturn("eeeee");
|
||||
when(lsp.getUuid()).thenReturn("fffff");
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter)any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort)any())).thenReturn(lrp);
|
||||
when(nvpApi.createLogicalSwitchPort(eq("bbbbb"), (LogicalSwitchPort)any())).thenReturn(lsp);
|
||||
when(nvpApi.createLogicalRouterNatRule((String)any(), (NatRule)any())).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalRouter((LogicalRouter) any())).thenReturn(lrc);
|
||||
when(nvpApi.createLogicalRouterPort(eq("ccccc"), (LogicalRouterPort) any())).thenReturn(lrp);
|
||||
when(nvpApi.createLogicalSwitchPort(eq("bbbbb"), (LogicalSwitchPort) any())).thenReturn(lsp);
|
||||
when(nvpApi.createLogicalRouterNatRule((String) any(), (NatRule) any())).thenThrow(new NiciraNvpApiException());
|
||||
final CreateLogicalRouterCommand clrc = new CreateLogicalRouterCommand("aaaaa", 50, "bbbbb", "lrouter", "publiccidr", "nexthop", "internalcidr", "owner");
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer)resource.executeRequest(clrc);
|
||||
final CreateLogicalRouterAnswer clra = (CreateLogicalRouterAnswer) resource.executeRequest(clrc);
|
||||
|
||||
assertFalse(clra.getResult());
|
||||
verify(nvpApi, atLeast(1)).deleteLogicalRouter(eq("ccccc"));
|
||||
|
|
@ -417,7 +417,7 @@ public class NiciraNvpResourceTest {
|
|||
resource.configure("NiciraNvpResource", parameters);
|
||||
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).deleteLogicalRouter(eq("aaaaa"));
|
||||
final DeleteLogicalRouterAnswer dlspa = (DeleteLogicalRouterAnswer)resource.executeRequest(new DeleteLogicalRouterCommand("aaaaa"));
|
||||
final DeleteLogicalRouterAnswer dlspa = (DeleteLogicalRouterAnswer) resource.executeRequest(new DeleteLogicalRouterCommand("aaaaa"));
|
||||
assertFalse(dlspa.getResult());
|
||||
}
|
||||
|
||||
|
|
@ -433,9 +433,9 @@ public class NiciraNvpResourceTest {
|
|||
when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa");
|
||||
when(cmd.getL3GatewayServiceUuid()).thenReturn("bbbbb");
|
||||
when(nvpApi.findLogicalRouterPortByGatewayServiceUuid("aaaaa", "bbbbb")).thenReturn(list);
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalRouterPort((String)any(), (LogicalRouterPort)any());
|
||||
doThrow(new NiciraNvpApiException()).when(nvpApi).updateLogicalRouterPort((String) any(), (LogicalRouterPort) any());
|
||||
|
||||
final ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
assertFalse(answer.getResult());
|
||||
|
||||
}
|
||||
|
|
@ -450,7 +450,7 @@ public class NiciraNvpResourceTest {
|
|||
when(cmd.getL3GatewayServiceUuid()).thenReturn("bbbbb");
|
||||
when(nvpApi.findLogicalRouterPortByGatewayServiceUuid("aaaaa", "bbbbb")).thenThrow(new NiciraNvpApiException("retry 1")).thenThrow(new NiciraNvpApiException("retry 2"));
|
||||
|
||||
final ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
assertFalse(answer.getResult());
|
||||
|
||||
}
|
||||
|
|
@ -458,9 +458,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigureStaticNatRulesOnLogicalRouter() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -481,19 +480,19 @@ public class NiciraNvpResourceTest {
|
|||
final NatRule[] rulepair = resource.generateStaticNatRulePair("10.10.10.10", "11.11.11.11");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, atLeast(2)).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final NatRule rule = (NatRule)argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule)rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
final NatRule rule = (NatRule) argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
return true;
|
||||
}
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule)rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule) rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -504,9 +503,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigureStaticNatRulesOnLogicalRouterExistingRules() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -521,7 +519,7 @@ public class NiciraNvpResourceTest {
|
|||
final NatRule[] rulepair = resource.generateStaticNatRulePair("10.10.10.10", "11.11.11.11");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -531,17 +529,17 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResults()).thenReturn(Arrays.asList(rulepair));
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, never()).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final NatRule rule = (NatRule)argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule)rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
final NatRule rule = (NatRule) argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
return true;
|
||||
}
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule)rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule) rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -552,9 +550,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigureStaticNatRulesOnLogicalRouterRemoveRules() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -571,7 +568,7 @@ public class NiciraNvpResourceTest {
|
|||
final UUID rule1Uuid = UUID.randomUUID();
|
||||
rulepair[0].setUuid(rule0Uuid);
|
||||
rulepair[1].setUuid(rule1Uuid);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -581,13 +578,13 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResults()).thenReturn(Arrays.asList(rulepair));
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, atLeast(2)).deleteLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<UUID>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final UUID uuid = (UUID)argument;
|
||||
final UUID uuid = (UUID) argument;
|
||||
if (rule0Uuid.equals(uuid) || rule1Uuid.equals(uuid)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -599,9 +596,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigureStaticNatRulesOnLogicalRouterRollback() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -616,7 +612,7 @@ public class NiciraNvpResourceTest {
|
|||
final NatRule[] rulepair = resource.generateStaticNatRulePair("10.10.10.10", "11.11.11.11");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenThrow(new NiciraNvpApiException());
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -625,7 +621,7 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResultCount()).thenReturn(0);
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigureStaticNatRulesOnLogicalRouterAnswer a = (ConfigureStaticNatRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertFalse(a.getResult());
|
||||
verify(nvpApi, atLeastOnce()).deleteLogicalRouterNatRule(eq("aaaaa"), eq(rulepair[0].getUuid()));
|
||||
|
|
@ -634,9 +630,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigurePortForwardingRulesOnLogicalRouter() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -654,22 +649,22 @@ public class NiciraNvpResourceTest {
|
|||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
// Mock the api create calls
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {8080, 8080}, "11.11.11.11", new int[] {80, 80}, "tcp");
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, atLeast(2)).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final NatRule rule = (NatRule)argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule)rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
final NatRule rule = (NatRule) argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
return true;
|
||||
}
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule)rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule) rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -680,9 +675,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigurePortForwardingRulesOnLogicalRouterExistingRules() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -694,10 +688,10 @@ public class NiciraNvpResourceTest {
|
|||
when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa");
|
||||
|
||||
// Mock the api create calls
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {8080, 8080}, "11.11.11.11", new int[] {80, 80}, "tcp");
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -707,17 +701,17 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResults()).thenReturn(Arrays.asList(rulepair));
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, never()).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final NatRule rule = (NatRule)argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule)rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
final NatRule rule = (NatRule) argument;
|
||||
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
|
||||
return true;
|
||||
}
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule)rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
if (rule.getType().equals("SourceNatRule") && ((SourceNatRule) rule).getToSourceIpAddressMin().equals("11.11.11.11")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -728,9 +722,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigurePortForwardingRulesOnLogicalRouterRemoveRules() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -742,12 +735,12 @@ public class NiciraNvpResourceTest {
|
|||
when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa");
|
||||
|
||||
// Mock the api create calls
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {8080, 8080}, "11.11.11.11", new int[] {80, 80}, "tcp");
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp");
|
||||
final UUID rule0Uuid = UUID.randomUUID();
|
||||
final UUID rule1Uuid = UUID.randomUUID();
|
||||
rulepair[0].setUuid(rule0Uuid);
|
||||
rulepair[1].setUuid(rule1Uuid);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -757,13 +750,13 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResults()).thenReturn(Arrays.asList(rulepair));
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertTrue(a.getResult());
|
||||
verify(nvpApi, atLeast(2)).deleteLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<UUID>() {
|
||||
@Override
|
||||
public boolean matches(final Object argument) {
|
||||
final UUID uuid = (UUID)argument;
|
||||
final UUID uuid = (UUID) argument;
|
||||
if (rule0Uuid.equals(uuid) || rule1Uuid.equals(uuid)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -775,9 +768,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigurePortForwardingRulesOnLogicalRouterRollback() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -789,10 +781,10 @@ public class NiciraNvpResourceTest {
|
|||
when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa");
|
||||
|
||||
// Mock the api create calls
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {8080, 8080}, "11.11.11.11", new int[] {80, 80}, "tcp");
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenThrow(new NiciraNvpApiException());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenThrow(new NiciraNvpApiException());
|
||||
|
||||
// Mock the api find call
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -801,7 +793,7 @@ public class NiciraNvpResourceTest {
|
|||
when(storedRules.getResultCount()).thenReturn(0);
|
||||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
assertFalse(a.getResult());
|
||||
verify(nvpApi, atLeastOnce()).deleteLogicalRouterNatRule(eq("aaaaa"), eq(rulepair[0].getUuid()));
|
||||
|
|
@ -810,9 +802,8 @@ public class NiciraNvpResourceTest {
|
|||
@Test
|
||||
public void testConfigurePortForwardingRulesOnLogicalRouterPortRange() throws ConfigurationException, NiciraNvpApiException {
|
||||
resource.configure("NiciraNvpResource", parameters);
|
||||
/* StaticNat
|
||||
* Outside IP: 11.11.11.11
|
||||
* Inside IP: 10.10.10.10
|
||||
/*
|
||||
* StaticNat Outside IP: 11.11.11.11 Inside IP: 10.10.10.10
|
||||
*/
|
||||
|
||||
// Mock the command
|
||||
|
|
@ -830,12 +821,12 @@ public class NiciraNvpResourceTest {
|
|||
when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules);
|
||||
|
||||
// Mock the api create calls
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {80, 85}, "11.11.11.11", new int[] {80, 85}, "tcp");
|
||||
final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 80, 85 }, "11.11.11.11", new int[] { 80, 85 }, "tcp");
|
||||
rulepair[0].setUuid(UUID.randomUUID());
|
||||
rulepair[1].setUuid(UUID.randomUUID());
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule)any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]);
|
||||
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)resource.executeRequest(cmd);
|
||||
final ConfigurePortForwardingRulesOnLogicalRouterAnswer a = (ConfigurePortForwardingRulesOnLogicalRouterAnswer) resource.executeRequest(cmd);
|
||||
|
||||
// The expected result is false, Nicira does not support port ranges in DNAT
|
||||
assertFalse(a.getResult());
|
||||
|
|
@ -848,12 +839,12 @@ public class NiciraNvpResourceTest {
|
|||
assertTrue("DestinationNatRule".equals(rules[0].getType()));
|
||||
assertTrue("SourceNatRule".equals(rules[1].getType()));
|
||||
|
||||
final DestinationNatRule dnr = (DestinationNatRule)rules[0];
|
||||
final DestinationNatRule dnr = (DestinationNatRule) rules[0];
|
||||
assertTrue(dnr.getToDestinationIpAddress().equals("10.10.10.10"));
|
||||
assertTrue(dnr.getToDestinationPort() == null);
|
||||
assertTrue(dnr.getMatch().getDestinationIpAddresses().equals("11.11.11.11"));
|
||||
|
||||
final SourceNatRule snr = (SourceNatRule)rules[1];
|
||||
final SourceNatRule snr = (SourceNatRule) rules[1];
|
||||
assertTrue(snr.getToSourceIpAddressMin().equals("11.11.11.11") && snr.getToSourceIpAddressMax().equals("11.11.11.11"));
|
||||
assertTrue(snr.getToSourcePort() == null);
|
||||
assertTrue(snr.getMatch().getSourceIpAddresses().equals("10.10.10.10"));
|
||||
|
|
@ -861,18 +852,18 @@ public class NiciraNvpResourceTest {
|
|||
|
||||
@Test
|
||||
public void testGeneratePortForwardingRulePair() {
|
||||
final NatRule[] rules = resource.generatePortForwardingRulePair("10.10.10.10", new int[] {8080, 8080}, "11.11.11.11", new int[] {80, 80}, "tcp");
|
||||
final NatRule[] rules = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp");
|
||||
assertTrue("DestinationNatRule".equals(rules[0].getType()));
|
||||
assertTrue("SourceNatRule".equals(rules[1].getType()));
|
||||
|
||||
final DestinationNatRule dnr = (DestinationNatRule)rules[0];
|
||||
final DestinationNatRule dnr = (DestinationNatRule) rules[0];
|
||||
assertTrue(dnr.getToDestinationIpAddress().equals("10.10.10.10"));
|
||||
assertTrue(dnr.getToDestinationPort() == 8080);
|
||||
assertTrue(dnr.getMatch().getDestinationIpAddresses().equals("11.11.11.11"));
|
||||
assertTrue(dnr.getMatch().getDestinationPort() == 80);
|
||||
assertTrue(dnr.getMatch().getEthertype().equals("IPv4") && dnr.getMatch().getProtocol() == 6);
|
||||
|
||||
final SourceNatRule snr = (SourceNatRule)rules[1];
|
||||
final SourceNatRule snr = (SourceNatRule) rules[1];
|
||||
assertTrue(snr.getToSourceIpAddressMin().equals("11.11.11.11") && snr.getToSourceIpAddressMax().equals("11.11.11.11"));
|
||||
assertTrue(snr.getToSourcePort() == 80);
|
||||
assertTrue(snr.getMatch().getSourceIpAddresses().equals("10.10.10.10"));
|
||||
|
|
|
|||
Loading…
Reference in New Issue