Yevgeny Zaspitsky has posted comments on this change. Change subject: webadmin: Add managemenet network field to new/edit cluster dialog ......................................................................
Patch Set 9: (10 comments) http://gerrit.ovirt.org/#/c/37141/9/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java: Line 649: aQuery); Line 650: } Line 651: Line 652: public void getDefaultManagementNetwork(AsyncQuery aQuery, Guid dataCenterId) { Line 653: aQuery.converterCallback = new AsIsAsyncConverter(); > I'm not sure I understand you agreed to leave that as is Line 654: Frontend.getInstance().runQuery( Line 655: VdcQueryType.GetDefaultManagementNetwork, Line 656: new IdQueryParameters(dataCenterId), Line 657: aQuery); Line 657: aQuery); Line 658: } Line 659: Line 660: public void getManagementNetwork(AsyncQuery aQuery, Guid clusterId) { Line 661: aQuery.converterCallback = new AsIsAsyncConverter(); > And here? same Line 662: Frontend.getInstance().runQuery( Line 663: VdcQueryType.GetManagementNetwork, Line 664: new IdQueryParameters(clusterId), Line 665: aQuery); http://gerrit.ovirt.org/#/c/37141/9/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java: Line 762: final Network managementNetwork = model.getManagementNetwork().getSelectedItem(); Line 763: final Guid managementNetworkId = managementNetwork == null ? null : managementNetwork.getId(); Line 764: clusterOperationParameters = new AddClusterOperationParameters(cluster, managementNetworkId); Line 765: } else { Line 766: actionType = VdcActionType.UpdateVdsGroup; > I'm not sure in this case you don't have to choose a management network - i To be fixed in a separate backend patch Line 767: clusterOperationParameters = new VdsGroupOperationParameters(cluster); Line 768: } Line 769: Frontend.getInstance().runAction( Line 770: actionType, http://gerrit.ovirt.org/#/c/37141/9/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java: Line 1362: clusterModel.setMigrateOnErrorOption(clusterModel.getEntity().getMigrateOnError()); Line 1363: Line 1364: if (getIsEdit()) { Line 1365: if (dataCenterId == null) { Line 1366: setEmptyNetworkList(clusterModel); > In this case you shouldn't have to do anything - it doesn't hurt to have th Done Line 1367: } else { Line 1368: loadCurrentClusteManagementNetwork(); Line 1369: } Line 1370: } Line 1377: final AsyncQuery getManagementNetworkQuery = new AsyncQuery(this, new INewAsyncCallback() { Line 1378: @Override Line 1379: public void onSuccess(Object model, Object returnValue) { Line 1380: final ClusterModel clusterModel = (ClusterModel) model; Line 1381: final Network managementNetwork = (Network) returnValue; > All you have to do here is invoke clusterModel.setSelectedItem(managementNe Done Line 1382: if (managementNetwork == null) { Line 1383: setEmptyNetworkList(clusterModel); Line 1384: } else { Line 1385: clusterModel.getManagementNetwork().setItems(Collections.singletonList(managementNetwork)); Line 1389: }); Line 1390: AsyncDataProvider.getInstance().getManagementNetwork(getManagementNetworkQuery, getEntity().getId()); Line 1391: } Line 1392: Line 1393: private void setEmptyNetworkList(ClusterModel clusterModel) { > I don't think there's any case where invoking this method is actually neces Done Line 1394: clusterModel.getManagementNetwork().setItems(Collections.<Network> emptyList()); Line 1395: } Line 1396: Line 1397: private void loadDcNetworks(final Guid dataCenterId) { Line 1395: } Line 1396: Line 1397: private void loadDcNetworks(final Guid dataCenterId) { Line 1398: if (dataCenterId == null) { Line 1399: setEmptyNetworkList(this); > I think returning here is enough. Done Line 1400: return; Line 1401: } Line 1402: final AsyncQuery getAllDataCenterNetworksQuery = new AsyncQuery(this, new INewAsyncCallback() { Line 1403: @Override Line 1421: } Line 1422: } Line 1423: } Line 1424: }); Line 1425: AsyncDataProvider.getInstance() > How about cache the default management network per cluster in a Map<Guid, N Done Line 1426: .getDefaultManagementNetwork(getDefaultManagementNetworkQuery, dataCenterId); Line 1427: } Line 1428: }); Line 1429: AsyncDataProvider.getInstance().getAllDataCenterNetworks(getAllDataCenterNetworksQuery, dataCenterId); Line 1836: } Line 1837: }; Line 1838: AsyncDataProvider.getInstance().getDataCenterVersions(_asyncQuery, selectedDataCenter.getId()); Line 1839: Line 1840: if (!getIsEdit()) { > This doesn't need to depend on !getIsEdit() - the DC can only be changed if dc networks should be loaded only when we create a new cluster or when a detached one being edited otherwise only the cluster management network should be loaded. Line 1841: loadDcNetworks(selectedDataCenter.getId()); Line 1842: } Line 1843: } Line 1844: http://gerrit.ovirt.org/#/c/37141/9/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java File frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java: Line 2507: Line 2508: @DefaultStringValue("This field is not a valid Guid (use 0-9,A-F format: 00000000-0000-0000-0000-000000000000)") Line 2509: String invalidGuidMsg(); Line 2510: Line 2511: @DefaultStringValue("Changing management network is allowed through manage networks screen") > "Changing management network is only permitted via the 'Manage Cluster Netw Done Line 2512: String prohibitManagementNetworkChangeInEditClusterInfoMessage(); -- To view, visit http://gerrit.ovirt.org/37141 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I055babd6037f127235c349499f1545396e38333f Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com> Gerrit-Reviewer: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourf...@redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzasp...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
