Change in ovirt-engine[master]: restapi: Use "current" object to build links
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Use "current" object to build links
......................................................................
restapi: Use "current" object to build links
Currently the "LinkHelper" class receives an "UriInfo" object that it
uses to extract the prefix of the application, in order to build links.
This patch changes it so that it uses the "Current" object, as this will
have support for multiple versions of the API in the future.
Change-Id: Idb78608ed9f085000b6ff38ced48c6cb175abbdb
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/AbstractBackendActionableResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkHelperTest.java
19 files changed, 143 insertions(+), 162 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/52704
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb78608ed9f085000b6ff38ced48c6cb175abbdb
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
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: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[master]: restapi: Move link helper to implementation module
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Move link helper to implementation module
......................................................................
restapi: Move link helper to implementation module
This patch moves the "LinkHelper" class from the definition module to
the implementation module, where it will be able to use the "current"
object to build links that depend on the current request.
Change-Id: I81d5323470ce463eb71809ec37474adbd0488353
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
R backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/LinkCreatorTest.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java
R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java
R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkHelperTest.java
17 files changed, 33 insertions(+), 35 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/52703
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81d5323470ce463eb71809ec37474adbd0488353
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
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: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[master]: restapi: Split link helper
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Split link helper
......................................................................
restapi: Split link helper
Currently the "LinkHelper" class contains method that work with links
that don't depend on the current request and also with links that do
depend. The methods that work with links that dpened on the current
request will in the future be changed to use the "Current" class instead
of the "UriInfo" class, and to do so the class needs to be part of the
"jaxrs" module. To enable that future change this patch splits the
"LinkHelper" class into two: "LinkHelper" and "LinkCreator". The first
will contain the methods that work with the current request, and the
second will contain the methods that work with links that don't work
with the current request.
Change-Id: I61c48887e8ba4bf5fd23905d51e24d95dce8f5ca
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
A backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/LinkCreatorTest.java
M backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/LinkHelperTest.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ApiRootLinksCreator.java
A backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkCreator.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAsyncStatusResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
9 files changed, 203 insertions(+), 159 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/52702
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61c48887e8ba4bf5fd23905d51e24d95dce8f5ca
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
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: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[master]: restapi: Simplify generation of root service links
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Simplify generation of root service links
......................................................................
restapi: Simplify generation of root service links
Currently the links generated for the root service (for the /api URL)
are calculated using the JAX-RS "UriInfo" class. In order to simplify
these calculations, and in order to be able to support multiple versions
of the API, this patch changes the root service so that it uses instead
the methods provided by the "current" object.
Change-Id: I9de13aa71e0587bb31add94e7609185082f19be9
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/BackendApiResource.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
2 files changed, 36 insertions(+), 75 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/52690
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de13aa71e0587bb31add94e7609185082f19be9
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
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: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[master]: restapi: Improve multiple version support
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Improve multiple version support
......................................................................
restapi: Improve multiple version support
This patch adds a new HTTP filter that is responsible for extracting the
version information from the request, and adding it to the object that
handles the information about the current request. This used to be part
of the "current" filter, but it is better to separate the two concerns.
The new filter supports extracting the version from the HTTP "Version"
request header:
GET /api/...
Version: 4
Or from an optional prefix of the request URL:
GET /api/v4/...
Later patches will use this version information to dispatch requests to
different versions of the API.
Change-Id: I32881539b7489f51109b03e34b4713263221b288
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/invocation/Current.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/invocation/CurrentFilter.java
A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/invocation/VersionFilter.java
A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/invocation/VersionSource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
M backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml
6 files changed, 304 insertions(+), 26 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/52688
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32881539b7489f51109b03e34b4713263221b288
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
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: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-hosted-engine-setup[master]: storage: remove mount.glusterfs related warning
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: storage: remove mount.glusterfs related warning
......................................................................
storage: remove mount.glusterfs related warning
The issues with mount.glusterfs has been fixed,
removing the warning.
Change-Id: I74f43a13a92a2bca4e91c52bc61a124ec8b79762
Bug-Url: https://bugzilla.redhat.com/1287397
Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/storage/nfs.py
1 file changed, 0 insertions(+), 11 deletions(-)
Approvals:
Sandro Bonazzola: Looks good to me, approved
Simone Tiraboschi: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/52443
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74f43a13a92a2bca4e91c52bc61a124ec8b79762
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in jenkins[master]: ovirt-guest-agent: add 3.6 branch
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: ovirt-guest-agent: add 3.6 branch
......................................................................
ovirt-guest-agent: add 3.6 branch
Change-Id: Iae4135c73a7caa8714a820f4e8577e6557b1f69d
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M jobs/confs/projects/ovirt-guest-agent/ovirt-guest-agent_standard.yaml
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me; Ready for merge
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/52978
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae4135c73a7caa8714a820f4e8577e6557b1f69d
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: David Caro <dcaro(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[master]: core: cleanup in vms monitoring
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: core: cleanup in vms monitoring
......................................................................
core: cleanup in vms monitoring
1. Rename timeToUpdateStatistics to updateStatistics
2. Use early return when the monitored VMs are empty
3. Use dbFacade and resourceManager members directly
4. Use early return in tryLockVmForUpdate
5. Simplify refreshVmStats with simpler forEach syntax
6. Improve indentation in saveVmGuestAgentNetworkDevices
Change-Id: Ic1843227ca60546424a4df30c4655a8967e2efb2
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
1 file changed, 66 insertions(+), 74 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/52818
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1843227ca60546424a4df30c4655a8967e2efb2
Gerrit-PatchSet: 14
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, 10 months
Change in ovirt-engine[ovirt-engine-3.6.3]: webadmin: use the cluster version rather than host one
by tnisan@redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: use the cluster version rather than host one
......................................................................
webadmin: use the cluster version rather than host one
I use the cluster version rather than host one as that could lead
to an NPE thrown in case tha host is newer than the engine.
Change-Id: I8773775960364e83e76e226ce7b4aa24e57ea8ba
Bug-Url: https://bugzilla.redhat.com/1297490
Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java
1 file changed, 4 insertions(+), 8 deletions(-)
Approvals:
Alona Kaplan: Looks good to me, approved
Jenkins CI: Passed CI tests
Yevgeny Zaspitsky: Verified
--
To view, visit https://gerrit.ovirt.org/52945
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8773775960364e83e76e226ce7b4aa24e57ea8ba
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6.3
Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months
Change in ovirt-engine[ovirt-engine-3.6]: webadmin: use the cluster version rather than host one
by tnisan@redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: use the cluster version rather than host one
......................................................................
webadmin: use the cluster version rather than host one
I use the cluster version rather than host one as that could lead
to an NPE thrown in case tha host is newer than the engine.
Change-Id: I8773775960364e83e76e226ce7b4aa24e57ea8ba
Bug-Url: https://bugzilla.redhat.com/1297490
Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java
1 file changed, 4 insertions(+), 8 deletions(-)
Approvals:
Alona Kaplan: Looks good to me, approved
Jenkins CI: Passed CI tests
Yevgeny Zaspitsky: Verified
--
To view, visit https://gerrit.ovirt.org/52943
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8773775960364e83e76e226ce7b4aa24e57ea8ba
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 10 months