Lior Vernia has uploaded a new change for review.
Change subject: webadmin: Added VNIC profiles to imported networks
......................................................................
webadmin: Added VNIC profiles to imported networks
The public use checkbox had been useless since VNIC profiles were
introduced since networks don't have a public use member anymore, this
fixes it.
Change-Id: I79bd4ccc581e282a03ae4426e0fc8c58bbdfa29a
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
1 file changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/18270/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
index a279431..18afe98 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
@@ -7,10 +7,12 @@
import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VnicProfileParameters;
import org.ovirt.engine.core.common.businessentities.Provider;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import
org.ovirt.engine.core.common.businessentities.comparators.NameableComparator;
import org.ovirt.engine.core.common.businessentities.network.Network;
+import org.ovirt.engine.core.common.businessentities.network.VnicProfile;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.ui.frontend.AsyncQuery;
@@ -162,8 +164,9 @@
public void onImport() {
List<VdcActionParametersBase> mulipleActionParameters =
new LinkedList<VdcActionParametersBase>();
+ List<IFrontendActionAsyncCallback> callbacks = new
LinkedList<IFrontendActionAsyncCallback>();
- for (ExternalNetwork externalNetwork : (Iterable<ExternalNetwork>)
importedNetworks.getItems()) {
+ for (final ExternalNetwork externalNetwork :
(Iterable<ExternalNetwork>) importedNetworks.getItems()) {
final Network network = externalNetwork.getNetwork();
Guid dcId = ((StoragePool)
externalNetwork.getDataCenters().getSelectedItem()).getId();
network.setName(externalNetwork.getDisplayName());
@@ -171,9 +174,27 @@
AddNetworkStoragePoolParameters params =
new AddNetworkStoragePoolParameters(dcId, network);
mulipleActionParameters.add(params);
+ callbacks.add(new IFrontendActionAsyncCallback() {
+
+ @Override
+ public void executed(FrontendActionAsyncResult result) {
+ network.setId((Guid)
result.getReturnValue().getActionReturnValue());
+ addVnicProfile(network, externalNetwork.isPublicUse());
+ }
+ });
}
- Frontend.RunMultipleActions(VdcActionType.AddNetwork,
mulipleActionParameters, new IFrontendActionAsyncCallback() {
+ Frontend.RunMultipleActions(VdcActionType.AddNetwork,
mulipleActionParameters, callbacks);
+ cancel();
+ }
+
+ private void addVnicProfile(Network network, boolean publicUse) {
+ VnicProfile vnicProfile = new VnicProfile();
+ vnicProfile.setName(network.getName());
+ vnicProfile.setNetworkId(network.getId());
+ VnicProfileParameters parameters = new
VnicProfileParameters(vnicProfile);
+ parameters.setPublicUse(publicUse);
+ Frontend.RunAction(VdcActionType.AddVnicProfile, parameters, new
IFrontendActionAsyncCallback() {
@Override
public void executed(FrontendActionAsyncResult result) {
--
To view, visit http://gerrit.ovirt.org/18270
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79bd4ccc581e282a03ae4426e0fc8c58bbdfa29a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
