Change in ovirt-engine[master]: core: Clean up SnapshotVmConfigurationHelperTest mocking
by Code Review
>From Allon Mureinik <amureini(a)redhat.com>:
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Clean up SnapshotVmConfigurationHelperTest mocking
......................................................................
core: Clean up SnapshotVmConfigurationHelperTest mocking
Inject the mocks that are needed by the SnapshotVmConfigurationHelper
under test and remove those that are not.
Change-Id: Idc23142febd2b50ea545ca3a5f5308bf350c6ad5
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
1 file changed, 3 insertions(+), 29 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/73962
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc23142febd2b50ea545ca3a5f5308bf350c6ad5
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[master]: core: GenericApiGWTServiceImplTest runner
by Code Review
>From Allon Mureinik <amureini(a)redhat.com>:
Allon Mureinik has submitted this change and it was merged.
Change subject: core: GenericApiGWTServiceImplTest runner
......................................................................
core: GenericApiGWTServiceImplTest runner
Use org.mockito.junit.MokcitoJUnitRunner instead of the deprecated
org.mockito.runners.MockitoJUnitRunner.
Change-Id: I78f3d1adc00b94b44d02b08ccee51ff5644cc178
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImplTest.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/73971
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78f3d1adc00b94b44d02b08ccee51ff5644cc178
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: core: when moving VM to another cluster, update its macs…
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: core: when moving VM to another cluster, update its macs…
......................................................................
core: when moving VM to another cluster, update its macs…
when moving VM to another cluster, and those clusters has set
different Mac Pools set, then macs needs to be updated. All macs of
such VM needs to be removed from Mac Pool of source Cluster and
added to Mac Pool of target cluster.
If target Mac Pool disallows duplicates and there's clash, operation
will be suspended.
Change-Id: Ic57ff7ac249946fa0eafc6034bada1ee86d31b7f
Bug-Url: https://bugzilla.redhat.com/1410440
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVmClusterValidator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveMacs.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ReadMacPool.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ChangeVMClusterCommandTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ChangeVmClusterValidatorTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveMacsTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecoratorRollbackTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.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/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
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
14 files changed, 615 insertions(+), 28 deletions(-)
Approvals:
Martin Mucha: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74029
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic57ff7ac249946fa0eafc6034bada1ee86d31b7f
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: core: added bulk methods to MacPool
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: core: added bulk methods to MacPool
......................................................................
core: added bulk methods to MacPool
to allow adding and 'force-adding' list of Macs.
Change-Id: I18e60646da2bd82952dd2eae3d4849d1fb39d311
Bug-Url: https://bugzilla.redhat.com/1410440
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/DelegatingMacPoolDecorator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolUsingRanges.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/WriteMacPool.java
4 files changed, 62 insertions(+), 3 deletions(-)
Approvals:
Martin Mucha: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74028
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18e60646da2bd82952dd2eae3d4849d1fb39d311
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: core: refactorings related to update cluster flow.
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: core: refactorings related to update cluster flow.
......................................................................
core: refactorings related to update cluster flow.
• renamed parameters
• created new parameter: macToMigrate, which was formerly initialized
inside of method
Change-Id: I5e74e218895d6c0b6fbc015d29a424fffab033ed
Bug-Url: https://bugzilla.redhat.com/1410440
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveMacsOfUpdatedCluster.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
2 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Martin Mucha: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74026
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e74e218895d6c0b6fbc015d29a424fffab033ed
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: core: renamed class MoveMacsOfUpdatedCluster.
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: core: renamed class MoveMacsOfUpdatedCluster.
......................................................................
core: renamed class MoveMacsOfUpdatedCluster.
MoveMacsOfUpdatedCluster.java -> MoveMacs.java
Class was renamed, because macs will be moved not only because of
updating cluster.
Change-Id: I524abafd06ab5e57e8e2fc36f62c31fd58ec993e
Bug-Url: https://bugzilla.redhat.com/1410440
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveMacs.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Martin Mucha: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74027
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I524abafd06ab5e57e8e2fc36f62c31fd58ec993e
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: core: add ID property to MacPool.
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: core: add ID property to MacPool.
......................................................................
core: add ID property to MacPool.
Adding ID to MacPool to be able to identify different MacPools in the
logs. The DB ID (mac_pools.id) will be used for this.
Note:
ID is not a 'required' property of in-memory object (with an exception
in compensation flow), and might bind itself to DB, it *is* a property
of MacPool, and a good candidate to identify pool. A pool is related
to db record, and has ID. It's very unlikely, that any future
implementation of pools won't be able to have ID, thus proceeding
without pool having ID is just complicating work for ourselves.
Change-Id: Icb688c24e9105850e70291a67d7fcc129773a9ca
Bug-Url: https://bugzilla.redhat.com/1395462
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/DecoratedMacPoolFactory.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/DelegatingMacPoolDecorator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolDecorator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolFactory.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolPerCluster.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolUsingRanges.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ReadMacPool.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/DecoratedMacPoolFactoryTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/MacPoolPerClusterTest.java
10 files changed, 93 insertions(+), 35 deletions(-)
Approvals:
Martin Mucha: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74053
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb688c24e9105850e70291a67d7fcc129773a9ca
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[ovirt-engine-4.1]: restapi: Don't use GetAllDisksByVmId
by Code Review
>From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged.
Change subject: restapi: Don't use GetAllDisksByVmId
......................................................................
restapi: Don't use GetAllDisksByVmId
Currently when version 3 of the API is used to request the disks of a
virtual machine, the API uses the GetAllDisksByVmId query, which in turn
uses the GetDisksbyVmGuid stored procedure to retrive the disks. In
addition this query, for each disk, calls the GetSnapshotByLeafGuid
stored procedure, to retrieve snapshot details, and the
GetDiskVmElementVyDiskVmElementId, to get attachment details. The
GetSnapshotByLeafGuid stored procedure is complex, and consumes a
important amount of database time. Version 4 of the API uses lighter
stored procedures. This patch changes the V3 compatibility layer of the
API so that it calls the V4 disk attachments and disk resources instead
of using the GetAllDisksByVmId query. In an otherwise idle enviroment
with approxy 4000 virtual machines this reduces the total use of CPU
(85% database + 15% engine) from 57 minutes to 14 minutes.
This can be reproduced using the following Ruby script, which uses the
'ovirt' gem to retrieve the virtual machines and their disks:
require 'active_support/all'
require 'ovirt'
service = Ovirt::Service.new(
server: 'rhvm41.local',
port: 443,
domain: 'internal',
username: 'admin',
password: '...',
verify_ssl: false,
timeout: 1.hour
)
vms = Ovirt::Vm.all(service)
vms.each do |vm|
vm.disks.each do |disk|
puts "#{vm[:name]}: #{disk[:name]}"
end
end
service.disconnect
Change-Id: I4429aadb4c33271c6ba10752cd3502ceb1d2329e
Bug-Url: https://bugzilla.redhat.com/1431578
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 85779a0ab4bf5fbdb1f343963f101c314afbd70a)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/helpers/V3VmHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmDiskServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmDisksServer.java
3 files changed, 68 insertions(+), 38 deletions(-)
Approvals:
Juan Hernandez: Verified
Jenkins CI: Passed CI tests
Oved Ourfali: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74009
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4429aadb4c33271c6ba10752cd3502ceb1d2329e
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[master]: restapi: Update to model 4.2.8
by Code Review
>From Juan Hernandez <juan.hernandez(a)redhat.com>:
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Update to model 4.2.8
......................................................................
restapi: Update to model 4.2.8
The more relevant changes in this new version of the model are the
following:
* Add `unregistered` parameter for the operations to list disks,
virtual machines, and templates in storage domains.
* Rename `NetworkFilterParameter` service to `NicNetworkFilterParameter`.
* Fix the direction of the `statistic` parameter of the `Statistic`
service, must be out only.
Change-Id: I8d8982e438e99c528c6206bdc804e2e1946fea2d
Related-to: https://bugzilla.redhat.com/1428159
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java
M pom.xml
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Dominik Holler: Looks good to me, but someone else must approve
Juan Hernandez: Verified
Jenkins CI: Passed CI tests
Maor Lipchuk: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/74042
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d8982e438e99c528c6206bdc804e2e1946fea2d
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in ovirt-engine[master]: core: ImportExportRepoImageCommandTest spacing
by Code Review
>From Allon Mureinik <amureini(a)redhat.com>:
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportExportRepoImageCommandTest spacing
......................................................................
core: ImportExportRepoImageCommandTest spacing
Remove redundant spacing between members which does nothing for the
class' readability.
Change-Id: I2bd14d4e468e19a805303b169341715d2fc100a5
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/73949
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd14d4e468e19a805303b169341715d2fc100a5
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months