Change in ovirt-engine[ovirt-engine-3.6]: core: fix import from configuration as clone
by tnisan@redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: fix import from configuration as clone
......................................................................
core: fix import from configuration as clone
Apparently, when importing a VM as a new entity (clone) the REST-API
client does not necessarily set the ID of the VM in the parameters
(not as part of the VM object) and recent changes done in the import
command cause the command to ignore the request for cloning the VM
in this case.
Therefore, the decision whether to import a VM as clone is changed
to include the case that the import-as-new-entity flag is set and
the ID of the VM is not set in the parameters as well.
Change-Id: Ia750fda289f2a8da3deddce273cc15f51a062a44
Bug-Url: https://bugzilla.redhat.com/1322602
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/55933
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia750fda289f2a8da3deddce273cc15f51a062a44
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: history: removed dwh_disk_vm_map_history_view
by emesika@redhat.com
Eli Mesika has submitted this change and it was merged.
Change subject: history: removed dwh_disk_vm_map_history_view
......................................................................
history: removed dwh_disk_vm_map_history_view
Change-Id: I14519fc13386b997fd8fd0a93bf84a051ed0881c
Bug-Url: https://bugzilla.redhat.com/1325699
Signed-off-by: Shirly Radco <sradco(a)redhat.com>
---
M packaging/dbscripts/create_dwh_views.sql
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Shirly Radco: Verified; Looks good to me, but someone else must approve
Eli Mesika: Looks good to me, approved; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/55924
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14519fc13386b997fd8fd0a93bf84a051ed0881c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
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: Shirly Radco <sradco(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-dwh[master]: history: removed collection of vm_disks_map
by Shirly Radco
Shirly Radco has submitted this change and it was merged.
Change subject: history: removed collection of vm_disks_map
......................................................................
history: removed collection of vm_disks_map
removed redundant collection of vm_disks_map.
Change-Id: I940cdad4f1e5c817522eb77c09682ee4389c3bd1
Bug-Url: https://bugzilla.redhat.com/1323605
Signed-off-by: Shirly Radco <sradco(a)redhat.com>
---
M etl_export/src/main/java/ovirt_engine_dwh/configurationsync_4_0/ConfigurationSync.java
A packaging/dbscripts/upgrade/04_00_0010_drop_disks_vm_map_table.sql
M tos_project/process/ConfigurationSync_4.0.item
M tos_project/process/ConfigurationSync_4.0.properties
4 files changed, 1,760 insertions(+), 5,896 deletions(-)
Approvals:
Shirly Radco: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/55923
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I940cdad4f1e5c817522eb77c09682ee4389c3bd1
Gerrit-PatchSet: 2
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: Shirly Radco <sradco(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-dwh[master]: packaging: rebase to talend open studio 6.1.1
by Shirly Radco
Shirly Radco has submitted this change and it was merged.
Change subject: packaging: rebase to talend open studio 6.1.1
......................................................................
packaging: rebase to talend open studio 6.1.1
Change-Id: I6fedd85198ba76585552fb9056300b96ee1aa76e
Bug-Url: https://bugzilla.redhat.com/1302611
Signed-off-by: Shirly Radco <sradco(a)redhat.com>
---
R etl_export/src/main/java/ovirt_engine_dwh/aggregationtodaily_4_0/AggregationToDaily.java
R etl_export/src/main/java/ovirt_engine_dwh/aggregationtohourly_4_0/AggregationToHourly.java
R etl_export/src/main/java/ovirt_engine_dwh/configurationsync_4_0/ConfigurationSync.java
R etl_export/src/main/java/ovirt_engine_dwh/dailytimekeepingjob_4_0/DailyTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/deletetimekeepingjob_4_0/DeleteTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/historydelete_4_0/HistoryDelete.java
R etl_export/src/main/java/ovirt_engine_dwh/historyetl_4_0/HistoryETL.java
R etl_export/src/main/java/ovirt_engine_dwh/hostconfigcheck_4_0/HostConfigCheck.java
R etl_export/src/main/java/ovirt_engine_dwh/hourlytimekeepingjob_4_0/HourlyTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/minimalversioncheck_4_0/MinimalVersionCheck.java
R etl_export/src/main/java/ovirt_engine_dwh/osenumupdate_4_0/OsEnumUpdate.java
R etl_export/src/main/java/ovirt_engine_dwh/parallelrun_4_0/ParallelRun.java
R etl_export/src/main/java/ovirt_engine_dwh/samplerunjobs_4_0/SampleRunJobs.java
R etl_export/src/main/java/ovirt_engine_dwh/sampletimekeepingjob_4_0/SampleTimeKeepingJob.java
R etl_export/src/main/java/ovirt_engine_dwh/statisticssync_4_0/StatisticsSync.java
R etl_export/src/main/java/ovirt_engine_dwh/validateinstallation_4_0/ValidateInstallation.java
R etl_export/src/main/java/routines/DataOperation.java
R etl_export/src/main/java/routines/Mathematical.java
R etl_export/src/main/java/routines/Numeric.java
R etl_export/src/main/java/routines/Relational.java
R etl_export/src/main/java/routines/RoutineHistoryETL.java
R etl_export/src/main/java/routines/StringHandling.java
R etl_export/src/main/java/routines/TalendDataGenerator.java
R etl_export/src/main/java/routines/TalendDate.java
R etl_export/src/main/java/routines/TalendString.java
R etl_export/src/main/java/routines/system/AssertCatcherUtils.java
R etl_export/src/main/java/routines/system/BufferedOutput.java
R etl_export/src/main/java/routines/system/Constant.java
R etl_export/src/main/java/routines/system/DBDateParser.java
R etl_export/src/main/java/routines/system/Document.java
R etl_export/src/main/java/routines/system/DocumentGenerateOrderHelper.java
R etl_export/src/main/java/routines/system/DocumentHelper.java
R etl_export/src/main/java/routines/system/DocumentLookupCache.java
R etl_export/src/main/java/routines/system/DocumentToFlat.java
R etl_export/src/main/java/routines/system/FastDateParser.java
R etl_export/src/main/java/routines/system/FormatterUtils.java
A etl_export/src/main/java/routines/system/GetJarsToRegister.java
R etl_export/src/main/java/routines/system/GlobalResource.java
R etl_export/src/main/java/routines/system/Hex.java
R etl_export/src/main/java/routines/system/IPersistableComparableLookupRow.java
R etl_export/src/main/java/routines/system/IPersistableLookupRow.java
R etl_export/src/main/java/routines/system/IPersistableRow.java
A etl_export/src/main/java/routines/system/JDBCUtil.java
R etl_export/src/main/java/routines/system/JSONObject.java
R etl_export/src/main/java/routines/system/LocaleProvider.java
R etl_export/src/main/java/routines/system/LogCatcherUtils.java
R etl_export/src/main/java/routines/system/MRRunStat.java
R etl_export/src/main/java/routines/system/MetterCatcherUtils.java
R etl_export/src/main/java/routines/system/NameSpaceTool.java
R etl_export/src/main/java/routines/system/NestXMLTool.java
R etl_export/src/main/java/routines/system/NoHeaderObjectInputStream.java
R etl_export/src/main/java/routines/system/NoHeaderObjectOutputStream.java
R etl_export/src/main/java/routines/system/ParserUtils.java
R etl_export/src/main/java/routines/system/PasswordEncryptUtil.java
R etl_export/src/main/java/routines/system/PigHelper.java
R etl_export/src/main/java/routines/system/PrintfFormat.java
R etl_export/src/main/java/routines/system/ResumeUtil.java
A etl_export/src/main/java/routines/system/RowState.java
R etl_export/src/main/java/routines/system/RunStat.java
R etl_export/src/main/java/routines/system/RunTrace.java
R etl_export/src/main/java/routines/system/RuntimeMap.java
R etl_export/src/main/java/routines/system/RuntimeUtils.java
R etl_export/src/main/java/routines/system/SharedDBConnection.java
R etl_export/src/main/java/routines/system/SharedDBPreparedStatement.java
A etl_export/src/main/java/routines/system/SparkRunStat.java
A etl_export/src/main/java/routines/system/SparkStreamingRunStat.java
R etl_export/src/main/java/routines/system/StatCatcherUtils.java
R etl_export/src/main/java/routines/system/StringUtils.java
R etl_export/src/main/java/routines/system/TDieException.java
R etl_export/src/main/java/routines/system/TRunJobException.java
R etl_export/src/main/java/routines/system/TalendDataSource.java
R etl_export/src/main/java/routines/system/TalendThread.java
R etl_export/src/main/java/routines/system/TalendThreadPool.java
R etl_export/src/main/java/routines/system/TalendThreadResult.java
R etl_export/src/main/java/routines/system/TalendTimestampWithTZ.java
R etl_export/src/main/java/routines/system/TraceBean.java
R etl_export/src/main/java/routines/system/TraceDataBean.java
R etl_export/src/main/java/routines/system/TraceStatusBean.java
R etl_export/src/main/java/routines/system/TypeConvert.java
R etl_export/src/main/java/routines/system/UnicodeReader.java
R etl_export/src/main/java/routines/system/XMLHelper.java
R etl_export/src/main/java/routines/system/api/ESBConsumer.java
R etl_export/src/main/java/routines/system/api/ESBEndpointInfo.java
R etl_export/src/main/java/routines/system/api/ESBEndpointRegistry.java
R etl_export/src/main/java/routines/system/api/ESBJobInterruptedException.java
R etl_export/src/main/java/routines/system/api/ESBProviderCallback.java
R etl_export/src/main/java/routines/system/api/TalendESBJob.java
R etl_export/src/main/java/routines/system/api/TalendESBJobFactory.java
R etl_export/src/main/java/routines/system/api/TalendESBRoute.java
R etl_export/src/main/java/routines/system/api/TalendJob.java
R etl_export/src/main/java/routines/system/api/TalendMDMJob.java
A etl_export/src/main/resources/ovirt_engine_dwh/aggregationtodaily_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/aggregationtohourly_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/configurationsync_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/dailytimekeepingjob_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/deletetimekeepingjob_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/historydelete_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/historyetl_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/hostconfigcheck_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/hourlytimekeepingjob_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/minimalversioncheck_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/osenumupdate_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/parallelrun_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/samplerunjobs_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/sampletimekeepingjob_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/statisticssync_4_0/contexts/Default.properties
A etl_export/src/main/resources/ovirt_engine_dwh/validateinstallation_4_0/contexts/Default.properties
M ovirt-engine-dwh/advancedPersistentLookupLib/build.xml
D ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/exception/ExceptionHandler.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/data/map/MultiLazyValuesMap.java
C ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/time/ITimeMeasureLogger.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/time/TimeMeasure.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/time/TimeStack.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/core/model/process/ILookupMode.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/core/model/process/IMatchingMode.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/common/ICommonLookup.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/common/ILookupManagerUnit.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/memory/AdvancedMemoryLookup.java
A ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/memory/ConcurrentAdvancedMemoryLookup.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/memory/IMemoryLookup.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/AbstractPersistentLookup.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistableLookup.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistentLookupManager.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistentRowManager.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/MemoryHelper.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupAll.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchAll.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchFirst.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchLast.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/PersistentRowSorterIterator.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/PersistentSortedLookupManager.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/RowProvider.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/IRowCreator.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/IRowProvider.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/utils/FileUtils.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/IMapHashFile.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/ILightSerializable.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/IPersistentBean.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/KeyForMap.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/DataContainer.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/FlowSorterIterator.java
M ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/SortedMultipleHashFile.java
M ovirt-engine-dwh/etltermination/build.xml
M ovirt-engine-dwh/historyETL/build.xml
M ovirt-engine-dwh/historyETL/src/main/java/ovirt_engine_dwh
M ovirt-engine-dwh/routines/build.xml
M ovirt-engine-dwh/routines/src/main/java/routines
M tos_project/code/routines/system/DataOperation_0.1.item
M tos_project/code/routines/system/DataOperation_0.1.properties
M tos_project/code/routines/system/Mathematical_0.1.item
M tos_project/code/routines/system/Mathematical_0.1.properties
M tos_project/code/routines/system/Numeric_0.1.item
M tos_project/code/routines/system/Numeric_0.1.properties
M tos_project/code/routines/system/Relational_0.1.item
M tos_project/code/routines/system/Relational_0.1.properties
M tos_project/code/routines/system/TalendDate_0.1.item
M tos_project/code/routines/system/TalendDate_0.1.properties
M tos_project/code/routines/system/TalendString_0.1.item
M tos_project/code/routines/system/TalendString_0.1.properties
M tos_project/process/AggregationToDaily_4.0.item
M tos_project/process/AggregationToDaily_4.0.properties
M tos_project/process/AggregationToHourly_4.0.item
M tos_project/process/AggregationToHourly_4.0.properties
M tos_project/process/ConfigurationSync_4.0.item
M tos_project/process/ConfigurationSync_4.0.properties
M tos_project/process/DailyTimeKeepingJob_4.0.item
M tos_project/process/DailyTimeKeepingJob_4.0.properties
M tos_project/process/DeleteTimeKeepingJob_4.0.item
M tos_project/process/DeleteTimeKeepingJob_4.0.properties
M tos_project/process/HistoryDelete_4.0.item
M tos_project/process/HistoryDelete_4.0.properties
M tos_project/process/HistoryETL_4.0.item
M tos_project/process/HistoryETL_4.0.properties
M tos_project/process/HostConfigCheck_4.0.item
M tos_project/process/HostConfigCheck_4.0.properties
M tos_project/process/HourlyTimeKeepingJob_4.0.item
M tos_project/process/HourlyTimeKeepingJob_4.0.properties
M tos_project/process/OsEnumUpdate_4.0.item
M tos_project/process/OsEnumUpdate_4.0.properties
M tos_project/process/SampleTimeKeepingJob_4.0.item
M tos_project/process/SampleTimeKeepingJob_4.0.properties
M tos_project/process/StatisticsSync_4.0.item
M tos_project/process/StatisticsSync_4.0.properties
M tos_project/talend.project
184 files changed, 7,221 insertions(+), 7,071 deletions(-)
Approvals:
Shirly Radco: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/54585
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fedd85198ba76585552fb9056300b96ee1aa76e
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Shirly Radco <sradco(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(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, 8 months
Change in ovirt-engine[master]: webadmin: Fix event handling after CPU Count change of runni...
by tjelinek@redhat.com
Tomas Jelinek has submitted this change and it was merged.
Change subject: webadmin: Fix event handling after CPU Count change of running VM
......................................................................
webadmin: Fix event handling after CPU Count change of running VM
Fix of CPU topology event handling in Edit VM dialog for existing VM
by disabling additional event processing during recomputation.
The CPU Total was not properly recomputed when num of sockets changed.
Similar to computation of Num of Sockets when Total CPU changed.
The Total CPU limit is limited to host cpu count conforming the CPUPolicyUnit.
Change-Id: I592d428a9854a4c092ac7cce8ab17888e65ec7cd
Bug-Url: https://bugzilla.redhat.com/1317473
Signed-off-by: Marek Libra <mlibra(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
2 files changed, 33 insertions(+), 7 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Marek Libra: Verified
--
To view, visit https://gerrit.ovirt.org/55201
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I592d428a9854a4c092ac7cce8ab17888e65ec7cd
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Marek Libra <mlibra(a)redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marek Libra <mlibra(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: core: fix possible NPE
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: core: fix possible NPE
......................................................................
core: fix possible NPE
Theoretically, the VM in the parameters might be null in the
ImportVmFromConfiguration command and the tests simulate this case.
Therefore, adding a protection.
Change-Id: I3a149358d731dcd272bbc57b72dba74481908b9d
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromConfigurationCommand.java
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/55941
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a149358d731dcd272bbc57b72dba74481908b9d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: core: fix import from configuration as clone
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: core: fix import from configuration as clone
......................................................................
core: fix import from configuration as clone
Apparently, when importing a VM as a new entity (clone) the REST-API
client does not necessarily set the ID of the VM in the parameters
(not as part of the VM object) and recent changes done in the import
command cause the command to ignore the request for cloning the VM
in this case.
Therefore, the decision whether to import a VM as clone is changed
to include the case that the import-as-new-entity flag is set and
the ID of the VM is not set in the parameters as well.
Change-Id: Ia750fda289f2a8da3deddce273cc15f51a062a44
Bug-Url: https://bugzilla.redhat.com/1322602
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromConfigurationCommand.java
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/55913
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia750fda289f2a8da3deddce273cc15f51a062a44
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: userportal: use the default host that was set in template in...
by rgolan@redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: userportal: use the default host that was set in template in a vm
......................................................................
userportal: use the default host that was set in template in a vm
When creating a vm in user portal from template that specifies a
default host the host was not passed.
The fix was to call the "doChangeDefaultHost" method in
VmModelBehaviorBase that populates the defaultHost and the
autoAssign parameters in the new vm.
Change-Id: I01e30e1831a17729f72e3cc52acec26710bc36bc
Bug-Url: https://bugzilla.redhat.com/1284472
Signed-off-by: Jenny Tokar <jtokar(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, but someone else must approve
Jenny Tokar: Verified
--
To view, visit https://gerrit.ovirt.org/55911
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01e30e1831a17729f72e3cc52acec26710bc36bc
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: Ignore memory and CPU hotplug errors for hosted engine VM
by rgolan@redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: Ignore memory and CPU hotplug errors for hosted engine VM
......................................................................
Ignore memory and CPU hotplug errors for hosted engine VM
The current implementation reverts changes to CPU topology
and memory sizes when hotplug fails. Hosted engine VM falls
back to saving the values to the OVF store and uses them
after HE VM restart.
The old behaviour reset the fields, preventing OVF from
getting the new values.
The new behaviour does not revert and OVF gets the right
values. The new CPU count and memory size are then
automatically applied when the HE VM is restarted.
Change-Id: I101a8fce0bed2fa5dcc3f2bddbf2d58978156d77
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1304387
Signed-off-by: Martin Sivak <msivak(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Martin Sivák: Verified
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/55818
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I101a8fce0bed2fa5dcc3f2bddbf2d58978156d77
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months
Change in ovirt-engine[master]: core: Refactored ProfileParametersBase constructor
by rgolan@redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: core: Refactored ProfileParametersBase constructor
......................................................................
core: Refactored ProfileParametersBase constructor
ProfileParametersBase accepted both Profile and Id. Id can be retrieved
from profile.getId() instead of as an argument in the constructor.
This is bad practice and has potential for problems. So, now the
constructor only accepts a profile and the id is taken from the profile
itself.
Methods that were using the constructor were changed inorder to comply
with the new constructor arguments.
Change-Id: I0b9fa9ff81422fa5a9782e847892d79f2e5e7b74
Bug-Url: https://bugzilla.redhat.com/1143869
Signed-off-by: Tomer Saban <tsaban(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddClusterCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CpuProfileParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DiskProfileParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProfileParametersBase.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCpuProfileResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDiskProfileResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDiskProfilesResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCpuProfileResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDiskProfileResource.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileBaseModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileBaseModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveCpuProfileModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveDiskProfileModel.java
14 files changed, 22 insertions(+), 26 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Tomer Saban: Verified
Roy Golan: Looks good to me, approved
Jenny Tokar: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/52378
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b9fa9ff81422fa5a9782e847892d79f2e5e7b74
Gerrit-PatchSet: 32
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomer Saban <tsaban(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 Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(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: Tomer Saban <tsaban(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 8 months