Change in ovirt-engine[master]: packaging: setup: partial cleanup - db only
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: setup: partial cleanup - db only
......................................................................
packaging: setup: partial cleanup - db only
Before this change, if during cleanup the user only asked to delete
only the database, then ran setup again, setup wrongly identified
the system as being legacy 3.2 and tried to upgrade, which failed.
This change makes the identification of upgrade from 3.2 legacy
more strict and in such a situation setup-engine will continue as
a new setup.
Bug-Url: https://bugzilla.redhat.com/987939
Change-Id: Id9aa1791eb7ccdbc8c679e72ed6eaa4f72ac29c6
Signed-off-by: Yedidyah Bar David <didi(a)redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/legacy/core.py
M packaging/setup/plugins/ovirt-engine-setup/legacy/database.py
3 files changed, 73 insertions(+), 18 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19689
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9aa1791eb7ccdbc8c679e72ed6eaa4f72ac29c6
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
11 years, 2 months
Change in ovirt-engine[master]: engine: change formatter "addNewLine" to "insert"
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: engine: change formatter "addNewLine" to "insert"
......................................................................
engine: change formatter "addNewLine" to "insert"
Change the code formatter configuration to have "addNewLine"
set to "insert" instead of "do not insert" to align it with the
checkstyle validations that fails if there's no new line in the end of
file.
Change-Id: I495e11e20c315e267e9f8141f7fecf45e39a3363
Signed-off-by: Alissa Bonas <abonas(a)redhat.com>
---
M config/engine-code-format.xml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/20150
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I495e11e20c315e267e9f8141f7fecf45e39a3363
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
11 years, 2 months
Change in ovirt-engine[master]: core: add import/export support
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: add import/export support
......................................................................
core: add import/export support
Change-Id: I7e99c737cceb022b8cbd6f026d21181dab3c1f7a
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
4 files changed, 32 insertions(+), 1 deletion(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15592
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e99c737cceb022b8cbd6f026d21181dab3c1f7a
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: Add support to search by instance and image types
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: Add support to search by instance and image types
......................................................................
Add support to search by instance and image types
This patch add support to search instance and image types:
"InstanceType: .."
Change-Id: I1ab8c12b61faa79eadee6ec2dd069f23a7c0c9fa
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/SearchType.java
M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java
M packaging/dbscripts/create_views.sql
5 files changed, 64 insertions(+), 5 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/14308
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ab8c12b61faa79eadee6ec2dd069f23a7c0c9fa
Gerrit-PatchSet: 16
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: use instance type in addVm + permissions
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: use instance type in addVm + permissions
......................................................................
core: use instance type in addVm + permissions
Added new ActionGroup CREATE_INSTANCE that allow user to create only
instance, which is more 'weak' than create vm because of the smaller set
of parameters the user can set to an instance compared to vm.
Added new roles to be used: InstanceCreator and UserInstanceManager
which are compatible with vm roles to allow instance manipulation by
users.
AddVmCommand: handle creation of instance (vm from instance type and
image type)
Change-Id: If9058907d1021b09981671e905defb91ed645d65
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
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
A packaging/dbscripts/upgrade/03_04_0020_add_instance_permissions.sql
14 files changed, 265 insertions(+), 25 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12281
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9058907d1021b09981671e905defb91ed645d65
Gerrit-PatchSet: 24
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: add get*Type to template DAO
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: add get*Type to template DAO
......................................................................
core: add get*Type to template DAO
Add methods in VmTemplateDAO to get specific types Instance and Image,
using these will assure the user that the object return is of the right
type.
Change-Id: Ic9f0eef1e61b51cc941b8dd9403f5733a69f9dfc
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAO.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
4 files changed, 160 insertions(+), 0 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12280
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9f0eef1e61b51cc941b8dd9403f5733a69f9dfc
Gerrit-PatchSet: 24
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: Add Image and Instance type interfaces
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: Add Image and Instance type interfaces
......................................................................
core: Add Image and Instance type interfaces
Add new interface InstanceType and ImageType to describe these entities.
make VmTemplate implement these.
Change-Id: Ia4ef6393038588383a6f110d9743e4412ee97f75
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/InstanceType.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
4 files changed, 111 insertions(+), 1 deletion(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12279
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4ef6393038588383a6f110d9743e4412ee97f75
Gerrit-PatchSet: 25
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: add support for instance type
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: add support for instance type
......................................................................
core: add support for instance type
This patch introduce Instance Types:
Add Instance and Image type id to vm, which links to the instance/image
type it was created from.
Add new Types to VmEntityType enum, and add a field to template which now can be Template/Instance/Image
Type.
Change-Id: I110e74c6fc8906e3d257c7cf31d2af2b1b800218
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmEntityType.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
M packaging/dbscripts/create_views.sql
A packaging/dbscripts/upgrade/03_04_0010_add_instance_type_to_vm.sql
M packaging/dbscripts/vm_templates_sp.sql
M packaging/dbscripts/vms_sp.sql
14 files changed, 135 insertions(+), 30 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12278
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I110e74c6fc8906e3d257c7cf31d2af2b1b800218
Gerrit-PatchSet: 24
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: scheduling: fixups
by dfediuck＠redhat.com
Doron Fediuck has submitted this change and it was merged.
Change subject: core: scheduling: fixups
......................................................................
core: scheduling: fixups
- Remove unused method
- List.contains() was comparing VDS and Guid wrongfully
Change-Id: I9b645459ecdca96bf19fccadab551be7f4b00f3f
Bug-Url: https://bugzilla.redhat.com/1007282
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
1 file changed, 8 insertions(+), 28 deletions(-)
Approvals:
Doron Fediuck: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/20148
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b645459ecdca96bf19fccadab551be7f4b00f3f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: restapi: Reduce backend calls for DC network list
by masayag＠redhat.com
Moti Asayag has submitted this change and it was merged.
Change subject: restapi: Reduce backend calls for DC network list
......................................................................
restapi: Reduce backend calls for DC network list
In case user provides both ID and Name for the network
to be attached to a cluster, same networks list
returned by querying the backend could be reused.
Change-Id: Icf65412ace7b5e2da44af9d9288362ab08505129
Signed-off-by: Moti Asayag <masayag(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java
2 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Moti Asayag: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/14780
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf65412ace7b5e2da44af9d9288362ab08505129
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months