Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Validations for exported external network
......................................................................
engine: Validations for exported external network
External network that is being added on the prodiver cannot have MTU
set.
Also, there is no sense in checking VLAN value for it.
Change-Id: I4f02ba293689ddc341345f8cb6984ee7d4d46a83
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/AddNetworkOnProviderCommand.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
7 files changed, 43 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/13572/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
index 0c74ddc..75af3ff 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
@@ -40,7 +40,7 @@
@Override
protected boolean canDoAction() {
- AddNetworkValidator validator = new AddNetworkValidator(getNetwork());
+ AddNetworkValidator validator = getNetworkValidator();
return validate(validator.dataCenterExists())
&& validate(validator.vmNetworkSetCorrectly())
&& validate(validator.stpForVmNetworkOnly())
@@ -51,6 +51,10 @@
&& (getNetwork().getProvidedBy() == null ||
externalNetworkValid(validator));
}
+ protected AddNetworkValidator getNetworkValidator() {
+ return new AddNetworkValidator(getNetwork());
+ }
+
private boolean externalNetworkValid(AddNetworkValidator validator) {
ProviderValidator providerValidator =
new
ProviderValidator(getDbFacade().getProviderDao().get(getNetwork().getProvidedBy().getProviderId()));
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/AddNetworkOnProviderCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/AddNetworkOnProviderCommand.java
index cc1b4ca..0b140a8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/AddNetworkOnProviderCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/AddNetworkOnProviderCommand.java
@@ -1,8 +1,11 @@
package org.ovirt.engine.core.bll.provider;
+import org.ovirt.engine.core.bll.ValidationResult;
import org.ovirt.engine.core.bll.network.dc.AddNetworkCommand;
import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
import org.ovirt.engine.core.common.businessentities.Provider;
+import org.ovirt.engine.core.common.businessentities.network.Network;
+import org.ovirt.engine.core.dal.VdcBllMessages;
@SuppressWarnings("serial")
public class AddNetworkOnProviderCommand<T extends
AddNetworkStoragePoolParameters> extends AddNetworkCommand<T> {
@@ -20,4 +23,32 @@
super.executeCommand();
}
+
+ @Override
+ protected AddNetworkValidator getNetworkValidator() {
+ return new AddNetworkOnProviderValidator(getNetwork());
+ }
+
+ protected class AddNetworkOnProviderValidator extends AddNetworkValidator {
+ public AddNetworkOnProviderValidator(Network network) {
+ super(network);
+ }
+
+ /**
+ * External networks can't have an MTU set since the provider can't
assure this.
+ */
+ @Override
+ public ValidationResult mtuValid() {
+ return network.getMtu() == 0 ? ValidationResult.VALID
+ : new
ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU);
+ }
+
+ /**
+ * VLAN ID is not relevant in this case, so don't check it.
+ */
+ @Override
+ public ValidationResult vlanIdNotUsed() {
+ return ValidationResult.VALID;
+ }
+ }
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
index 53a556a..e50f441 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
@@ -444,6 +444,7 @@
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_DISPLAY,
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_REQUIRED,
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_PORT_MIRRORED,
+ ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU,
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED,
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_ADDRESS_CANNOT_BE_CHANGED,
ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_IN_STORAGE_POOL,
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 44b5cc8..24dab64 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -468,6 +468,7 @@
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_DISPLAY=Cannot ${action}
${type}. External network cannot be used as a display network.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_REQUIRED=Cannot ${action}
${type}. External network cannot be set as required in the cluster.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_PORT_MIRRORED=Cannot ${action}
${type}. External network cannot be used when port mirroring is set.
+ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU=Cannot ${action} ${type}.
External network cannot have MTU set.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED=Cannot ${action} ${type}. The
management network '${NetworkName}' must be required, please change the network
to be required and try again.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_ADDRESS_CANNOT_BE_CHANGED=Cannot
${action} ${type}. The management network address cannot be modified without
reinstalling the host, since this address was used to create the host's
certification.
CANNOT_PREIEW_CURRENT_IMAGE=The currently used VM Snapshot Image cannot be
used in Preview command.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index aee7157..54653a2 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1261,6 +1261,9 @@
@DefaultStringValue("Cannot ${action} ${type}. External network cannot be
used when port mirroring is set.")
String ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_PORT_MIRRORED();
+ @DefaultStringValue("Cannot ${action} ${type}. External network cannot
have MTU set.")
+ String ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU();
+
@DefaultStringValue("Cannot ${action} ${type}. The management network
'${NetworkName}' must be required, please change the network to be required and
try again.")
String ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index c1776ed..ac44c77 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -465,6 +465,7 @@
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_DISPLAY=Cannot ${action}
${type}. External network cannot be used as a display network.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_REQUIRED=Cannot ${action}
${type}. External network cannot be set as required in the cluster.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_PORT_MIRRORED=Cannot ${action}
${type}. External network cannot be used when port mirroring is set.
+ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU=Cannot ${action} ${type}.
External network cannot have MTU set.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED=Cannot ${action} ${type}. The
management network '${NetworkName}' must be required, please change the network
to be required and try again.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_ADDRESS_CANNOT_BE_CHANGED=Cannot
${action} ${type}. The management network address cannot be modified without
reinstalling the host, since this address was used to create the host's
certification.
CANNOT_PREIEW_CURRENT_IMAGE=The currently used VM Snapshot Image cannot be
used in Preview command.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index be98c33..ddb0983 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -462,6 +462,7 @@
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_DISPLAY=Cannot ${action}
${type}. External network cannot be used as a display network.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_REQUIRED=Cannot ${action}
${type}. External network cannot be set as required in the cluster.
ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_BE_PORT_MIRRORED=Cannot ${action}
${type}. External network cannot be used when port mirroring is set.
+ACTION_TYPE_FAILED_EXTERNAL_NETWORK_CANNOT_HAVE_MTU=Cannot ${action} ${type}.
External network cannot have MTU set.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED=Cannot ${action} ${type}. The
management network '${NetworkName}' must be required, please change the network
to be required and try again.
ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_ADDRESS_CANNOT_BE_CHANGED=Cannot
${action} ${type}. The management network address cannot be modified without
reinstalling the host, since this address was used to create the host's
certification.
CANNOT_PREIEW_CURRENT_IMAGE=The currently used VM Snapshot Image cannot be
used in Preview command.
--
To view, visit http://gerrit.ovirt.org/13572
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f02ba293689ddc341345f8cb6984ee7d4d46a83
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
