Change in ovirt-engine[master]: webadmin: Don't display DCs that imported external network
Lior Vernia has submitted this change and it was merged.
Change subject: webadmin: Don't display DCs that imported external network
......................................................................
webadmin: Don't display DCs that imported external network
Changed the import networks dialog so that the choice of DC to import
an external network to, will only include DCs where the network
doesn't exist yet.
This required modification of the backend query to not only retrieve
all the external networks that exist on a provider, but also map each
network to the set of DCs where that network had already been
imported. This set is then used to efficiently check whether a certain
external network had been imported to a certain DC.
Change-Id: Ifd76b527500957ec47db6d60894b0d7316d17058
Bug-Url: https://bugzilla.redhat.com/989909
Signed-off-by: Lior Vernia <lvernia(a)redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/GetAllExternalNetworksOnProviderQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/network/GetAllExternalNetworksOnProviderQueryTest.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
M packaging/dbscripts/storages_sp.sql
A packaging/dbscripts/upgrade/03_04_0070_index_network_by_external_id.sql
12 files changed, 136 insertions(+), 18 deletions(-)
Approvals:
Lior Vernia: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/20582
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd76b527500957ec47db6d60894b0d7316d17058
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server