October 2015 - Engine-commits - oVirt List Archives

Change in ovirt-engine-sdk[sdk_3.5]: sdk: Regenerate against the latest API
by juan.hernandez＠redhat.com 27 Oct '15

27 Oct '15

Juan Hernandez has submitted this change and it was merged. Change subject: sdk: Regenerate against the latest API ...................................................................... sdk: Regenerate against the latest API This patch regenerates the SDK using the latest API obtained from the engine built from commit 451c8f5. Change-Id: Ie519017024cc879dfcf5394cd6ee1eca1be2cb12 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M Makefile M generator/src/main/resources/api.rsdl M generator/src/main/resources/api.xsd M src/ovirtsdk/api.py M src/ovirtsdk/infrastructure/brokers.py M src/ovirtsdk/xml/params.py 6 files changed, 148 insertions(+), 8 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me; Passed CI tests; Ready for merge Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/47716 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie519017024cc879dfcf5394cd6ee1eca1be2cb12 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: sdk_3.5 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-hosted-engine-ha[ovirt-hosted-engine-ha-1.2]: build: ovirt-hosted-engine-ha-1.2.8
by msivak＠redhat.com 27 Oct '15

27 Oct '15

Martin Sivák has submitted this change and it was merged. Change subject: build: ovirt-hosted-engine-ha-1.2.8 ...................................................................... build: ovirt-hosted-engine-ha-1.2.8 Change-Id: I52c707b711f3ad8d99c6d90cf72c5161764cc9c2 Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M configure.ac M ovirt-hosted-engine-ha.spec.in 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Sandro Bonazzola: Verified Martin Sivák: Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/47759 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52c707b711f3ad8d99c6d90cf72c5161764cc9c2 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: ovirt-hosted-engine-ha-1.2 Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

1 0

Change in ovirt-hosted-engine-ha[ovirt-hosted-engine-ha-1.2]: Do not start any services while in maintenance mode
by msivak＠redhat.com 27 Oct '15

27 Oct '15

Martin Sivák has submitted this change and it was merged. Change subject: Do not start any services while in maintenance mode ...................................................................... Do not start any services while in maintenance mode This patch is needed for a correct node update as that requires a vdsm shutdown. But we immediately started VDSM back up. Change-Id: I1914cafe0bdde9e0d4d5c056ee695e1373b657ab Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1254196 Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- M initscripts/ovirt-ha-agent.init.in M initscripts/ovirt-ha-agent.service M ovirt_hosted_engine_ha/agent/agent.py M ovirt_hosted_engine_ha/agent/hosted_engine.py 4 files changed, 34 insertions(+), 4 deletions(-) Approvals: Martin Sivák: Verified; Looks good to me, approved Simone Tiraboschi: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/47335 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1914cafe0bdde9e0d4d5c056ee695e1373b657ab Gerrit-PatchSet: 3 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: ovirt-hosted-engine-ha-1.2 Gerrit-Owner: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Ryan Barry <rbarry(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: restapi: Remove "RsdlIgnore"
by juan.hernandez＠redhat.com 27 Oct '15

27 Oct '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Remove "RsdlIgnore" ...................................................................... restapi: Remove "RsdlIgnore" As it isn't used. Change-Id: Ib2a44a0d2df0572a02b93b4d3e3ed2364bdeada1 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- D backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/RsdlIgnore.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java 2 files changed, 0 insertions(+), 19 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/47748 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2a44a0d2df0572a02b93b4d3e3ed2364bdeada1 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: Introduce metamodel
by juan.hernandez＠redhat.com 27 Oct '15

27 Oct '15

Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Introduce metamodel ...................................................................... restapi: Introduce metamodel Currently the model of the RESTAPI is defined using a XML schema. This XML schema is processed with the JAXB "xjc" compiler and the Java classes of the model are generated. This has several inconveniences: 1. The model is tied to the XML schema model, even if we aim to support both XML and JSON. JSON happens to work correctly because we are lucky enough that the JSON library that we use supports the JAXB annotations. 2. It is difficult to extract information from the XML schema. Tools like the generators of the SDKs have to do some ugly tricks, like using XPath queries and using reflection to ispect the code generated by the JAXB "xjc" compiler. 3. The XML schema is single giant file, more than 6000 lines at the moment. In order to improve the situation this patch introduces a metamodel that will be used to describe the data types used by the RESTAPI. This metamodel will be written in Java, using interfaces and annotations to describe the types. For example, to describe the bookmark type an interface like the following will be used: @Type public interface Bookmark { String value(); } This only purpose of this interface is to describe the characteristics of the type: its name, its attributes, etc. It isn't intended to be implemented or used during runtime in any way. The metamodel analyzer will inspect this source code and create a data structure easier to digest and use for applications, like the generators of the SDKs. For example, a tool could use the generated data structure to list the attributes of the bookmark type as follows: // Analyze the model files: Model model = new Model(); ModelAnalyzer analyzer = new ModelAnalyzer(); analyzer.setModel(model); analyzer.analyzeSource(...); // Find the bookmark type and list its attributes: Name bookmarkName = NameParser.parseUsingCase("Bookmark"); Type bookmarType = model.getType(bookmarkName); for (Attribute attribute : bookmarkType.getAttributes()) { System.out.println(attribute.getName()); } The metamodel includes also a tool that will be used to generate code from the model. Currently it only supports generating fragmetns of the XML schema. This is needed in order to preserve compatibility with the current RESTAPI implementation. The tool will take the existing XML schema, and will add to it the fragments generated to the model. This way it is possible to gradually replace the XML schema description of types with the equivalent Java description. In the future the tool will be extended to generate other outputs: * Java interfaces, containers and builders to be used during runtime, instead of the code currently generated by the JAXB "xjc" compiler. * Java code used to parse and serialize XML and JSON documents using an streaming approach, instead of the "all in memory" approach used by JAXB (and also by the JSON implementation that we use). * Documentation, extracted from the Javadoc comments of the type interfaces. Change-Id: I80b036b5c3b3f9ad4d316c8f6c0a568b0465adb9 Related: https://bugzilla.redhat.com/1201197 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/restapi/interface/definition/pom.xml A backend/manager/modules/restapi/metamodel/analyzer/README.md A backend/manager/modules/restapi/metamodel/analyzer/pom.xml A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/ModelAnalyzer.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/ModelAnnotations.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/ServiceSetter.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/ServiceUsage.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/TypeSetter.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/TypeUsage.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/UndefinedService.java A backend/manager/modules/restapi/metamodel/analyzer/src/main/java/org/ovirt/api/metamodel/analyzer/UndefinedType.java A backend/manager/modules/restapi/metamodel/annotations/README.md A backend/manager/modules/restapi/metamodel/annotations/pom.xml A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/In.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Link.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Method.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Out.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Root.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Service.java A backend/manager/modules/restapi/metamodel/annotations/src/main/java/org/ovirt/api/metamodel/annotations/Type.java A backend/manager/modules/restapi/metamodel/concepts/README.md A backend/manager/modules/restapi/metamodel/concepts/pom.xml A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Attribute.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Concept.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Constraint.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/EnumType.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/EnumValue.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Expression.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Link.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/ListType.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Locator.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Method.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Model.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Module.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Name.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/NameParser.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Parameter.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/PrimitiveType.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Service.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/StructType.java A backend/manager/modules/restapi/metamodel/concepts/src/main/java/org/ovirt/api/metamodel/concepts/Type.java A backend/manager/modules/restapi/metamodel/pom.xml A backend/manager/modules/restapi/metamodel/tool/README.md A backend/manager/modules/restapi/metamodel/tool/pom.xml A backend/manager/modules/restapi/metamodel/tool/src/main/java/org/ovirt/api/metamodel/tool/Main.java A backend/manager/modules/restapi/metamodel/tool/src/main/java/org/ovirt/api/metamodel/tool/SchemaGenerator.java A backend/manager/modules/restapi/metamodel/tool/src/main/java/org/ovirt/api/metamodel/tool/Tool.java A backend/manager/modules/restapi/metamodel/tool/src/main/resources/META-INF/beans.xml A backend/manager/modules/restapi/metamodel/tool/src/main/resources/log4j.xml A backend/manager/modules/restapi/model/pom.xml A backend/manager/modules/restapi/model/src/main/java/types/package-info.java M backend/manager/modules/restapi/pom.xml 52 files changed, 3,557 insertions(+), 2 deletions(-) Approvals: Ori Liel: Looks good to me, but someone else must approve Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/45852 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80b036b5c3b3f9ad4d316c8f6c0a568b0465adb9 Gerrit-PatchSet: 23 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(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: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[ovirt-engine-3.5]: Select the first CPU profile when multiple are available
by tnisan＠redhat.com 27 Oct '15

27 Oct '15

Tal Nisan has submitted this change and it was merged. Change subject: Select the first CPU profile when multiple are available ...................................................................... Select the first CPU profile when multiple are available This patch fixes a regression where a VM could not be added to a cluster where multiple CPU profiles were defined without having a specific CPU profile assigned by the REST call. The fix is not ideal as we should redo the whole mechanism to make sure all permissions and quotas are obeyed. Change like that would be too invasive at this stage of development and we will address it for the next version or update. Change-Id: I462579ff12c8c4f97c72c08e12637cfedd766f10 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1273037 Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelper.java 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/47580 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I462579ff12c8c4f97c72c08e12637cfedd766f10 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[ovirt-engine-3.5]: core: load only managed device payload on run vm
by piotr.kliczewski＠gmail.com 27 Oct '15

27 Oct '15

Piotr Kliczewski has submitted this change and it was merged. Change subject: core: load only managed device payload on run vm ...................................................................... core: load only managed device payload on run vm run vm command loads the vm payload from the devices in order to send it to vdsm. we should only load devices that are managed, as unmanaged devices were not created in the engine or not meant to be persisted and sent on later runs. Change-Id: Icc0c1876228d9b8cc72cb5698b8d8f12135594d0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1274708 Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Omer Frenkel: Verified Arik Hadas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/47562 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc0c1876228d9b8cc72cb5698b8d8f12135594d0 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: webadmin: close button errata
by masayag＠redhat.com 27 Oct '15

27 Oct '15

Moti Asayag has submitted this change and it was merged. Change subject: webadmin: close button errata ...................................................................... webadmin: close button errata - The close button on the errata dialog was not functional This patch fixes the issue. - Make the scroll bar appear when the errata text is too big to fit in the window. Change-Id: Ia8845a9cb333309153131badf089336eb5e1d794 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1260503 Signed-off-by: Alexander Wels <awels(a)redhat.com> Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/AbstractErrataCountModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ErrataListWithDetailsPopupView.ui.xml 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: Alona Kaplan: Looks good to me, approved Moti Asayag: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/47751 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8845a9cb333309153131badf089336eb5e1d794 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Require Java 8 during runtime
by juan.hernandez＠redhat.com 27 Oct '15

27 Oct '15

Juan Hernandez has submitted this change and it was merged. Change subject: core: Require Java 8 during runtime ...................................................................... core: Require Java 8 during runtime WildFly requires Java 8 since version 10. Change-Id: I0c45a7e257257ff6b43e6879ad8d8ff5433636b3 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M packaging/bin/java-home 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, but someone else must approve Martin Peřina: Looks good to me, but someone else must approve Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/46872 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c45a7e257257ff6b43e6879ad8d8ff5433636b3 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: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-hosted-engine-setup[ovirt-hosted-engine-setup-1.3]: packaging: setup: do not accept '_' character in FQDN
by sbonazzo＠redhat.com 27 Oct '15

27 Oct '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: do not accept '_' character in FQDN ...................................................................... packaging: setup: do not accept '_' character in FQDN Synced with ovirt-engine. Can't use \w metacharacter because it matches '_' character. Change-Id: I28d240c4be8e8b84aebeb25fdbc8afc6e8f5d828 Bug-Url: https://bugzilla.redhat.com/1269182 Signed-off-by: Rafael Martins <rmartins(a)redhat.com> (cherry picked from commit abd7e559dd27589c5eec7ab353bcd57fdc071d75) --- M src/plugins/ovirt-hosted-engine-setup/engine/fqdn.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Sandro Bonazzola: Looks good to me, approved Jenkins CI: Passed CI tests Rafael Martins: Verified -- To view, visit https://gerrit.ovirt.org/46986 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28d240c4be8e8b84aebeb25fdbc8afc6e8f5d828 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: ovirt-hosted-engine-setup-1.3 Gerrit-Owner: Rafael Martins <rmartins(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Rafael Martins <rmartins(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0