- Engine-commits - oVirt List Archives

Change in ovirt-engine[ovirt-engine-3.6]: core: Don't replace Jackson provided by application server
by piotr.kliczewski＠gmail.com 30 Sep '15

30 Sep '15

Piotr Kliczewski has submitted this change and it was merged. Change subject: core: Don't replace Jackson provided by application server ...................................................................... core: Don't replace Jackson provided by application server The following patch replaced the version of Jackson provided by the application server (1.9.2) with the one needed by the OpenStack client (1.9.9): core: Use Jackson 1.9.9 https://gerrit.ovirt.org/33959 That is no longer needed because WildFly 8.2 includes version 1.9.13 (in addition to version 2.x, in a different Java package). JBoss EAP includes version 1.9.9 since version 6.1. Change-Id: I4f003f68e74dadb7ae22a3ba2cd0d561a4f5eedd Bug-Url: https://bugzilla.redhat.com/1266544 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit a3733ff62e7dcb9d0c06842c6c2217cfacd7b186) --- M backend/manager/dependencies/common/pom.xml D backend/manager/dependencies/common/src/main/modules/org/codehaus/jackson/jackson-core-asl/main/module.xml D backend/manager/dependencies/common/src/main/modules/org/codehaus/jackson/jackson-jaxrs/main/module.xml D backend/manager/dependencies/common/src/main/modules/org/codehaus/jackson/jackson-mapper-asl/main/module.xml D backend/manager/dependencies/common/src/main/modules/org/codehaus/jackson/jackson-xc/main/module.xml 5 files changed, 0 insertions(+), 134 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, but someone else must approve Martin Peřina: Looks good to me, approved; Passed CI tests Juan Hernandez: Verified -- To view, visit https://gerrit.ovirt.org/46813 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f003f68e74dadb7ae22a3ba2cd0d561a4f5eedd Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Remove "bricks.replica_count" and "bricks.stripe_co...
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Remove "bricks.replica_count" and "bricks.stripe_count" ...................................................................... restapi: Remove "bricks.replica_count" and "bricks.stripe_count" These elements aren't really part of the representation of a collection of bricks, but parameters of the operations to add and remove bricks. They have now been removed, and replaced by a new "replica_count" and "stripe_count" matrix parameters: POST .../bricks;replica_count=3;stripe_count=2 DELETE .../bricks;replica_count=3 Change-Id: Ib3d21f95efc9e2278a4b2b0d281e9dc50dbbaa5b Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/README.md M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java 4 files changed, 41 insertions(+), 12 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/46821 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3d21f95efc9e2278a4b2b0d281e9dc50dbbaa5b Gerrit-PatchSet: 2 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: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Fix cardinality of "balances.balance" type
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Fix cardinality of "balances.balance" type ...................................................................... restapi: Fix cardinality of "balances.balance" type It should be "unbounded", as it is a collection. Change-Id: I206a2c68d7bfac930e2c618e6c17edf6a8e2222a Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendBalancesResource.java 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/46820 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I206a2c68d7bfac930e2c618e6c17edf6a8e2222a Gerrit-PatchSet: 2 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: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Add JAXB annotation to "scheduling_policy"
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Add JAXB annotation to "scheduling_policy" ...................................................................... restapi: Add JAXB annotation to "scheduling_policy" This annotation is used to make sure that the name of the corresponding Java getter is "getSchedulingPolicies", as this, plural, is what is used in the rest of the API. Change-Id: Id7ccb2aa84e0c024bd3d73ff61c84dd64e5c07df Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSchedulingPoliciesResource.java 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46819 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7ccb2aa84e0c024bd3d73ff61c84dd64e5c07df Gerrit-PatchSet: 1 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: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Remove scheduling policy built-in names and thresholds
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Remove scheduling policy built-in names and thresholds ...................................................................... restapi: Remove scheduling policy built-in names and thresholds In the past the specification of scheduling policies for clusters was based in built-in names and thresholds. For example a cluster that used the evenly distributed scheduling policy was represented as follows: <cluster> <name>mycluster</name> <scheduling_policy> <policy>evenly_distributed</policy> <thresholds high="80" duration="120"/> </scheduling_policy> ... </cluster> This mechanism was replaced with a top level /schedulingpolicies collection where scheduling policies can be defined with arbitrary names and properties. For example, the same scheduling policy is represented as follows in that top level collection: <scheduling_policy> <name>evenly_distributed</name> <properties> <property> <name>CpuOverCommitDurationMinutes</name> <value>2</value> </property> <property> <name>HighUtilization</name> <value>80</value> </property> </properties> </scheduling_policy> The representation of the cluster references the scheduling policy with its identifier: <cluster> <name>mycluster</name> <scheduling_policy id="..."/> ... </cluster> To preserve backwards compatibility the old "policy" and "thresholds" elements were preserved. The scheduling policy representation embedded within the cluster was also preserved. All these things have been completely removed now, so the only way to specify a scheduling policy when retrieving, creating or updating a cluster is to reference an existing one using its identifier. For example, when retrieving a cluster only the "id" (and "href") will be populated: GET /clusters/{cluster:id} <cluster> ... <scheduling_policy id="..." href="..."/> ... </cluster> When creating or updating a cluster only the "id" will be accepted. Change-Id: Iefabfc9b1d81ac650c2a7e352e9cbef9f1e63b49 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/README.md D backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/SchedulingPolicyType.java M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd 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/validation/ClusterValidator.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/SchedulingPolicyValidator.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java 11 files changed, 182 insertions(+), 318 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46098 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefabfc9b1d81ac650c2a7e352e9cbef9f1e63b49 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: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Don't replace JAXB provided by application server
by mperina＠redhat.com 29 Sep '15

29 Sep '15

Martin Peřina has submitted this change and it was merged. Change subject: core: Don't replace JAXB provided by application server ...................................................................... core: Don't replace JAXB provided by application server The following patch replaced the version of JAXB provided by the application server (2.2.4) with a newer one: restapi: Replace JAXB version provided by JBoss https://gerrit.ovirt.org/30713 That was needed to avoid the following JAXB bug: https://java.net/jira/browse/JAXB-860 This is no longer needed because both WildFly 8.2 and EAP 6.1 provide version 2.2.5 of JAXB, which includes the fix for that bug. Change-Id: I17370356dbf1bd614c96ff5fe4bf0af8486929c0 Bug-Url: https://bugzilla.redhat.com/1266544 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/dependencies/common/pom.xml D backend/manager/dependencies/common/src/main/modules/com/sun/xml/bind/main/module.xml 2 files changed, 0 insertions(+), 70 deletions(-) Approvals: Martin Peřina: Looks good to me, approved; Passed CI tests Juan Hernandez: Verified -- To view, visit https://gerrit.ovirt.org/46806 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17370356dbf1bd614c96ff5fe4bf0af8486929c0 Gerrit-PatchSet: 3 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: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Make windows time zone mapping maps private
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: core: Make windows time zone mapping maps private ...................................................................... core: Make windows time zone mapping maps private This is needed in order to avoid the following findbugs warning: Field is a mutable collection which should be package protected A mutable collection instance is assigned to a final static field, thus can be changed by malicious code or by accident from another package. The field could be made package protected to avoid this vulnerability. Alternatively you may wrap this field into Collections.unmodifiableSet/List/Map/etc. to avoid this vulnerability. Bug kind and pattern: MS - MS_MUTABLE_COLLECTION_PKGPROTECT Change-Id: I812de9ba3e9aa19ac4ede4d1d39bef8ecfd50356 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/TimeZoneTypeTest.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/WindowsJavaTimezoneMapping.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java 4 files changed, 14 insertions(+), 5 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46618 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I812de9ba3e9aa19ac4ede4d1d39bef8ecfd50356 Gerrit-PatchSet: 3 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: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Exclude the ME_ENUM_FIELD_SETTER findbugs warning
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: core: Exclude the ME_ENUM_FIELD_SETTER findbugs warning ...................................................................... core: Exclude the ME_ENUM_FIELD_SETTER findbugs warning Findbugs doesn't like that the OsRepositoryImpl.init method is public, but we need that because it is the mechanism that we use to lazyly initialize the OS repository. This is the findbugs warning: Public enum method unconditionally sets its field This public method declared in public enum unconditionally sets enum field, thus this field can be changed by malicious code or by accident from another package. Though mutable enum fields may be used for lazy initialization, it's a bad practice to expose them to the outer world. Consider removing this method or declaring it package-private. Bug kind and pattern: ME - ME_ENUM_FIELD_SETTER This patch changes the exclude filters for the "utils" project so that this findbugs warning will be ignored. Change-Id: Ibe37f727663fef92bc559edc7d2d665ccdf1aed5 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/utils/exclude-filters.xml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46595 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe37f727663fef92bc559edc7d2d665ccdf1aed5 Gerrit-PatchSet: 3 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: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Make "SysprepHandler.timeZoneIndex" private
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: core: Make "SysprepHandler.timeZoneIndex" private ...................................................................... core: Make "SysprepHandler.timeZoneIndex" private This is needed in order to avoid the following findbugs warning: Field is a mutable collection which should be package protected A mutable collection instance is assigned to a final static field, thus can be changed by malicious code or by accident from another package. The field could be made package protected to avoid this vulnerability. Alternatively you may wrap this field into Collections.unmodifiableSet/List/Map/etc. to avoid this vulnerability. Bug kind and pattern: MS - MS_MUTABLE_COLLECTION_PKGPROTECT Change-Id: I6fc8e9cf3218312d53acc87eda3b66e373ef9ca0 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fc8e9cf3218312d53acc87eda3b66e373ef9ca0 Gerrit-PatchSet: 3 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: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Remove the intermediate "tag.parent" element
by juan.hernandez＠redhat.com 29 Sep '15

29 Sep '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Remove the intermediate "tag.parent" element ...................................................................... restapi: Remove the intermediate "tag.parent" element Currently the relationship bettween a tag and it's parent tag used to be represented using an intermedite "parent" tag, that in turn contains another "tag" element: <tag> <name>mytag</name> <parent> <tag id="..." href="..."/> </parent> </tag> This patch simplifies this structure so that only one "parent" element is used now: <tag> <name>mytag</name> <parent id="..." href="..."/> </tag> Change-Id: I2c4b7a5147a60e55360ca0c4326d7613238b0709 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/README.md M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TagMapper.java 8 files changed, 52 insertions(+), 42 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/46810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c4b7a5147a60e55360ca0c4326d7613238b0709 Gerrit-PatchSet: 3 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: automation(a)ovirt.org

1 0