Change in ovirt-engine-sdk-ruby[master]: Improve the automation scripts
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: Improve the automation scripts
......................................................................
Improve the automation scripts
This patch improves the automation scripts so that they decide
automatically when to do release or scratch builds. Release builds will
be automatically performed when the version in the POM file doesn't
contain the -SNAPSHOT suffix.
Change-Id: I6ca9884411d83e29b0731ad144bf758cf9a9fa94
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M .gitignore
A automation/build-artifacts.packages
D automation/build-artifacts.sh
A automation/build-artifacts.sh
R automation/build.packages
A automation/build.py
D automation/check-merged.packages
A automation/check-merged.packages
D automation/check-merged.sh
A automation/check-merged.sh
D automation/check-patch.packages
A automation/check-patch.packages
D automation/check-patch.sh
A automation/check-patch.sh
M generator/pom.xml
M generator/src/main/java/org/ovirt/sdk/ruby/Tool.java
M generator/src/main/java/org/ovirt/sdk/ruby/VersionGenerator.java
M packaging/README.adoc
D packaging/build.sh
M packaging/spec.el7.in
M packaging/spec.fc23.in
M pom.xml
M sdk/pom.xml
23 files changed, 484 insertions(+), 166 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59497
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ca9884411d83e29b0731ad144bf758cf9a9fa94
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine-sdk-ruby
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[master]: scheduling: Handle empty selector and add selector validation
by rgolan＠redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: scheduling: Handle empty selector and add selector validation
......................................................................
scheduling: Handle empty selector and add selector validation
This change reverts the empty selector handling to the original
idea which is more safe (at runtime) and in alignment with
the rest of the SchedulingManager code.
Validation is also added to ClusterPolicy commands so an
invalid selector value can be detected and reported.
Change-Id: I99aa1e6750fc49d013271c8983d46982dff8bd0f
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1346669
Signed-off-by: Martin Sivak <msivak(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.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
8 files changed, 21 insertions(+), 9 deletions(-)
Approvals:
Martin Sivák: Verified
Roman Mohr: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/59250
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99aa1e6750fc49d013271c8983d46982dff8bd0f
Gerrit-PatchSet: 9
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-dwh[master]: build: moved major version to 4.1.0
by Shirly Radco
Shirly Radco has submitted this change and it was merged.
Change subject: build: moved major version to 4.1.0
......................................................................
build: moved major version to 4.1.0
Change-Id: I1e0c909f7059e4d992918a794e334a644f8d0821
Signed-off-by: Shirly Radco <sradco(a)redhat.com>
---
R etl_export/ovirt_engine_dwh/aggregationtodaily_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/aggregationtohourly_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/configurationsync_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/dailytimekeepingjob_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/deletetimekeepingjob_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/historydelete_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/historyetl_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/hostconfigcheck_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/hourlytimekeepingjob_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/minimalversioncheck_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/osenumupdate_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/parallelrun_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/samplerunjobs_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/sampletimekeepingjob_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/statisticssync_4_1/contexts/Default.properties
R etl_export/ovirt_engine_dwh/validateinstallation_4_1/contexts/Default.properties
R etl_export/src/main/java/ovirt_engine_dwh/aggregationtodaily_4_1/AggregationToDaily.java
R etl_export/src/main/java/ovirt_engine_dwh/aggregationtohourly_4_1/AggregationToHourly.java
R etl_export/src/main/java/ovirt_engine_dwh/configurationsync_4_1/ConfigurationSync.java
R etl_export/src/main/java/ovirt_engine_dwh/dailytimekeepingjob_4_1/DailyTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/deletetimekeepingjob_4_1/DeleteTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/historydelete_4_1/HistoryDelete.java
R etl_export/src/main/java/ovirt_engine_dwh/historyetl_4_1/HistoryETL.java
R etl_export/src/main/java/ovirt_engine_dwh/hostconfigcheck_4_1/HostConfigCheck.java
R etl_export/src/main/java/ovirt_engine_dwh/hourlytimekeepingjob_4_1/HourlyTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/minimalversioncheck_4_1/MinimalVersionCheck.java
R etl_export/src/main/java/ovirt_engine_dwh/osenumupdate_4_1/OsEnumUpdate.java
R etl_export/src/main/java/ovirt_engine_dwh/parallelrun_4_1/ParallelRun.java
R etl_export/src/main/java/ovirt_engine_dwh/samplerunjobs_4_1/SampleRunJobs.java
R etl_export/src/main/java/ovirt_engine_dwh/sampletimekeepingjob_4_1/SampleTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/statisticssync_4_1/StatisticsSync.java
R etl_export/src/main/java/ovirt_engine_dwh/validateinstallation_4_1/ValidateInstallation.java
R etl_export/src/main/resources/ovirt_engine_dwh/aggregationtodaily_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/aggregationtohourly_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/configurationsync_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/dailytimekeepingjob_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/deletetimekeepingjob_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/historydelete_4_1/contexts/Default.properties
D etl_export/src/main/resources/ovirt_engine_dwh/historyetl_4_0/contexts/Default.properties
C etl_export/src/main/resources/ovirt_engine_dwh/historyetl_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/hostconfigcheck_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/hourlytimekeepingjob_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/minimalversioncheck_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/osenumupdate_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/parallelrun_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/samplerunjobs_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/sampletimekeepingjob_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/statisticssync_4_1/contexts/Default.properties
R etl_export/src/main/resources/ovirt_engine_dwh/validateinstallation_4_1/contexts/Default.properties
M ovirt-engine-dwh.spec.in
A packaging/dbscripts/create_views_4_1.sql
M packaging/dbscripts/dbfunc-custom.sh
M packaging/dbscripts/upgrade/pre_upgrade/set_etl_minimal_version.sql
M packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py
R tos_project/code/routines/RoutineHistoryETL_4.1.item
R tos_project/code/routines/RoutineHistoryETL_4.1.properties
R tos_project/context/connectionJDBC_4.1.item
R tos_project/context/connectionJDBC_4.1.properties
R tos_project/process/AggregationToDaily_4.1.item
R tos_project/process/AggregationToDaily_4.1.properties
R tos_project/process/AggregationToHourly_4.1.item
R tos_project/process/AggregationToHourly_4.1.properties
R tos_project/process/ConfigurationSync_4.1.item
R tos_project/process/ConfigurationSync_4.1.properties
R tos_project/process/DailyTimeKeepingJob_4.1.item
R tos_project/process/DailyTimeKeepingJob_4.1.properties
R tos_project/process/DeleteTimeKeepingJob_4.1.item
R tos_project/process/DeleteTimeKeepingJob_4.1.properties
R tos_project/process/HistoryDelete_4.1.item
R tos_project/process/HistoryDelete_4.1.properties
R tos_project/process/HistoryETL_4.1.item
R tos_project/process/HistoryETL_4.1.properties
R tos_project/process/HostConfigCheck_4.1.item
R tos_project/process/HostConfigCheck_4.1.properties
R tos_project/process/HourlyTimeKeepingJob_4.1.item
R tos_project/process/HourlyTimeKeepingJob_4.1.properties
R tos_project/process/MinimalVersionCheck_4.1.item
R tos_project/process/MinimalVersionCheck_4.1.properties
R tos_project/process/OsEnumUpdate_4.1.item
R tos_project/process/OsEnumUpdate_4.1.properties
R tos_project/process/ParallelRun_4.1.item
R tos_project/process/ParallelRun_4.1.properties
R tos_project/process/SampleRunJobs_4.1.item
R tos_project/process/SampleRunJobs_4.1.properties
R tos_project/process/SampleTimeKeepingJob_4.1.item
R tos_project/process/SampleTimeKeepingJob_4.1.properties
R tos_project/process/StatisticsSync_4.1.item
R tos_project/process/StatisticsSync_4.1.properties
R tos_project/process/ValidateInstallation_4.1.item
R tos_project/process/ValidateInstallation_4.1.properties
M tos_project/talend.project
M version.mak
92 files changed, 1,770 insertions(+), 298 deletions(-)
Approvals:
Shirly Radco: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59654
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e0c909f7059e4d992918a794e334a644f8d0821
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Shirly Radco <sradco(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Shirly Radco <sradco(a)redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[master]: core: Allow user to create a vm from blank template on local...
by rgolan＠redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: core: Allow user to create a vm from blank template on local storage
......................................................................
core: Allow user to create a vm from blank template on local storage
When user creates a new vm from blank template on local storage the vm
is pinned to the one host that exists on the storage.
Since the blank template is not pinned to a specific host the
authorization for that action fails (the dedicated host of the vm is
compared to the dedicated host of the template and since only admin is
allowed to change hosts and the template is not pinned an exception is
thrown).
The fix is to remove the comparison of hosts in case the vm is created
from a default template.
Change-Id: I5f30844e3f992e4a1454e0ddeab6ae4d13591997
Bug-Url: https://bugzilla.redhat.com/1284472
Signed-off-by: Jenny Tokar <jtokar(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
Jenny Tokar: Verified
--
To view, visit https://gerrit.ovirt.org/59434
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f30844e3f992e4a1454e0ddeab6ae4d13591997
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[master]: engine: Snmp protocols should be read according to security ...
by mperina＠redhat.com
Martin Peřina has submitted this change and it was merged.
Change subject: engine: Snmp protocols should be read according to security level
......................................................................
engine: Snmp protocols should be read according to security level
SNMP_AUTH_PROTOCOL should only be read
for security levels 2 and 3.
SNMP_PRIVACY_PROTOCOL should only be read
for security level 3.
Change-Id: Ia529e544a4aead5dcae6dd9197745674e99c443a
Bug-Url: https://bugzilla.redhat.com/1268133
Signed-off-by: Ravi Nori <rnori(a)redhat.com>
---
M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Martin Peřina: Looks good to me, approved
Ravi Nori: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59647
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia529e544a4aead5dcae6dd9197745674e99c443a
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-guest-agent[master]: Additional filtering data point for updates
by vfeenstr＠redhat.com
Vinzenz Feenstra has submitted this change and it was merged.
Change subject: Additional filtering data point for updates
......................................................................
Additional filtering data point for updates
Updates by Microsoft usually contain a 'HelpLink' field which points
to somewhere at http://support.microsoft.com
This patch utilizes this fact to additionally detect otherwise
undetected items to filter.
Change-Id: Iee20995c2b832e5cda42838c8a2965633785f69c
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M ovirt-guest-agent/GuestAgentWin32.py
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Vinzenz Feenstra: Verified; Looks good to me, approved
Milan Zamazal: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/29596
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee20995c2b832e5cda42838c8a2965633785f69c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-guest-agent
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[ovirt-engine-4.0]: webadmin: Remove extra input field
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: Remove extra input field
......................................................................
webadmin: Remove extra input field
- For some reason we were using an input field/label
combination as a label and not hiding the input field.
This patch switches it to a label that takes the state
of the associated field into account to enable/disable
the label.
Change-Id: Ib869feccfa740d832ed2e3ba7aec35f8996cb74f
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1346299
Signed-off-by: Alexander Wels <awels(a)redhat.com>
---
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Tal Nisan: Passed CI tests
Alexander Wels: Verified
Yaniv Bronhaim: Looks good to me, but someone else must approve
Greg Sheremeta: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/59636
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib869feccfa740d832ed2e3ba7aec35f8996cb74f
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[ovirt-engine-4.0]: core: Add status/shared status support in search
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Add status/shared status support in search
......................................................................
core: Add status/shared status support in search
Problem was that StorageDomainFieldAutoCompleter was addressing
StorageDomainStatus while using auto-complete from the
StorageDomainSharedStatus enum.
This patch adds correct support for both status and shared_status fields
using StorageDomainStatus enum values to validate status and
StorageDomainSharedStatus enum values to validate the shared status.
Change-Id: Ic496e15516fc90928589232ebad08fe234c0499e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1347007
Signed-off-by: emesika <emesika(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java
M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java
2 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Martin Peřina: Looks good to me, approved
Eli Mesika: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59611
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic496e15516fc90928589232ebad08fe234c0499e
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[ovirt-engine-4.0]: webadmin: Make DiskModel's default interface not abstract.
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: Make DiskModel's default interface not abstract.
......................................................................
webadmin: Make DiskModel's default interface not abstract.
Disk's interface has nothing to do with the kind of Model inherited
from AbstractDiskModel (e.g NewDiskModel, EditDiskModel, ReadOnlyDiskModel).
If a disk is attached to a VM, the model should retrieve the right interface.
otherwise, it should just take a default one.
The current implementation also caused an error in ReadOnlyDiskModel,
when resuming an upload. The model tried to retrieve the selected
interface, but since the disk was not attached to a VM, an error was
thrown.
Change-Id: I0e85d980e130a973a865a54eb82758b8f8e30dfb
Bug-Url: https://bugzilla.redhat.com/1344367
Signed-off-by: Amit Aviram <aaviram(a)redhat.com>
(cherry picked from commit c61b9ba573ccd0f2b6bf709a60627136d89fc5de)
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ReadOnlyDiskModel.java
4 files changed, 8 insertions(+), 17 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Amit Aviram: Verified
--
To view, visit https://gerrit.ovirt.org/59614
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e85d980e130a973a865a54eb82758b8f8e30dfb
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Amit Aviram <aaviram(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months
Change in ovirt-engine[ovirt-engine-4.0]: core: Fix wrong db initialization
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Fix wrong db initialization
......................................................................
core: Fix wrong db initialization
Before this patch, when pool got empty during its initialization, and
tried to write log about it into AuditLog, NPE was thrown, because
DbFacade wasn't initialized yet. Such NPE brought several singletons
down blocking ear from being deployed.
The reason for that is probably that there's a code using
org.ovirt.engine.core.dal.dbbroker.DbFacade#getInstance
which gets initialized only after DbFacade bean is properly constructed.
Injecting DbFacade into MacPoolPerCluster seems to fix the issue, since
DbFacade gets initialized during inject and thus getInstance will
return correct non-null instance when called.
Change-Id: I3e44d5da98b31f502252f9418a068cb509408d4d
Bug-Url: https://bugzilla.redhat.com/1343332
Signed-off-by: Martin Mucha <mmucha(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacPoolPerDc.java
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Martin Mucha: Verified
Alona Kaplan: Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59527
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e44d5da98b31f502252f9418a068cb509408d4d
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 6 months