From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110177; cv=none; d=zohomail.com; s=zohoarc; b=nc3ZoPJCpuPrkGpnPZLLRKJQ2+dTfekWxcYU8zKI2nfyGGcE5hJzBoDaGEePeDFYGCZhAtYxxHC6sTiQ09L7EJTLnYwJ75gz6hl0Osx5c1TietYpyxLNJqk5R3W/0e0ocsufciCjzeYOGDcE617F6M+f3llIIdtphJhnfC6euEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110177; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vaD+Xt98GebdiuZfd7kC8O7UtffqL7+3j1GoeDp0HzY=; b=BeJXsBMLnIvVn9LUQ6XWqaBMVJl9vJprNg8fZIvsmvUG84vr+VpOALShyrPxbpZxp986pF6ep+T5N2f8q0iZqkbMJZGxOvOoSp4yn05TGvY2CxYJEn6JV5YKldt6yOUwX2rkusoabANkIpYQhQ9RP3XTDfjfbdst3r6nb8OQRs4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110177271611.1969076848621; Mon, 19 Oct 2020 05:22:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420--t_-iziAO6C_8GIFUBThHg-1; Mon, 19 Oct 2020 08:22:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65A2E192AB7C; Mon, 19 Oct 2020 12:22:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43F875D9D2; Mon, 19 Oct 2020 12:22:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A8D7418408AB; Mon, 19 Oct 2020 12:22:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCMdBl001863 for ; Mon, 19 Oct 2020 08:22:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 658836198E; Mon, 19 Oct 2020 12:22:39 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0B8B6198C for ; Mon, 19 Oct 2020 12:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110174; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vaD+Xt98GebdiuZfd7kC8O7UtffqL7+3j1GoeDp0HzY=; b=eSzknh6JnXF2TkZdNq7MGqCq8SQGIV4yMK60hP1W1vo1+yWOMikZe9fiZA32yQlD7wgN30 JZ44v+YH8okszSsW8T8pKABfDoAZ0Ir+6r03oeGcPqTiPyt7E0QJRxUPg9rtugF2E5rkS6 7sm5y7cdwnTXQgGl9bxG2JA12a4zLpI= X-MC-Unique: -t_-iziAO6C_8GIFUBThHg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 01/18] virschematest: Rewrite internals to allow increasing XML test coverage Date: Mon, 19 Oct 2020 14:22:10 +0200 Message-Id: <9aa7e6ba73a8511da7d4288566560ae77f743348.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 317 ++++++++++++++++++++++++++---------------- 1 file changed, 199 insertions(+), 118 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index 17eb2a4b34..e6e176eef3 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -30,36 +30,49 @@ VIR_LOG_INIT("tests.schematest"); +struct testSchemaEntry { + const char *dir; + const char *file; +}; + + struct testSchemaData { virXMLValidatorPtr validator; - const char *schema; const char *xml_path; }; static int -testSchemaFile(const void *args) +testSchemaValidateXML(const void *args) { const struct testSchemaData *data =3D args; bool shouldFail =3D virStringHasSuffix(data->xml_path, "-invalid.xml"); - xmlDocPtr xml =3D NULL; - int ret =3D -1; + g_autoptr(xmlDoc) xml =3D NULL; if (!(xml =3D virXMLParseFile(data->xml_path))) return -1; - if (virXMLValidatorValidate(data->validator, xml) < 0) { - if (!shouldFail) - goto cleanup; - } else { - if (shouldFail) - goto cleanup; - } + if ((virXMLValidatorValidate(data->validator, xml) < 0) !=3D shouldFai= l) + return -1; - ret =3D 0; - cleanup: - xmlFreeDoc(xml); - return ret; + return 0; +} + + +static int +testSchemaFile(const char *schema, + virXMLValidatorPtr validator, + const char *path) +{ + g_autofree char *test_name =3D NULL; + struct testSchemaData data =3D { + .validator =3D validator, + .xml_path =3D path, + }; + + test_name =3D g_strdup_printf("Checking %s against %s", path, schema); + + return virTestRun(test_name, testSchemaValidateXML, &data); } @@ -72,9 +85,6 @@ testSchemaDir(const char *schema, struct dirent *ent; int ret =3D 0; int rc; - struct testSchemaData data =3D { - .validator =3D validator, - }; if (virDirOpen(&dir, dir_path) < 0) { virTestPropagateLibvirtError(); @@ -82,7 +92,6 @@ testSchemaDir(const char *schema, } while ((rc =3D virDirRead(dir, &ent, dir_path)) > 0) { - g_autofree char *test_name =3D NULL; g_autofree char *xml_path =3D NULL; if (!virStringHasSuffix(ent->d_name, ".xml")) @@ -92,10 +101,7 @@ testSchemaDir(const char *schema, xml_path =3D g_strdup_printf("%s/%s", dir_path, ent->d_name); - test_name =3D g_strdup_printf("Checking %s against %s", ent->d_nam= e, schema); - - data.xml_path =3D xml_path; - if (virTestRun(test_name, testSchemaFile, &data) < 0) + if (testSchemaFile(schema, validator, xml_path) < 0) ret =3D -1; } @@ -109,122 +115,197 @@ testSchemaDir(const char *schema, } +/** + * testSchemaGrammarReport: + * + * We need to parse the schema regardless since it's necessary also when t= ests + * are skipped using VIR_TEST_RANGE so this function merely reports whethe= r the + * schema was parsed successfully via virTestRun. + */ static int -testSchemaDirs(const char *schema, virXMLValidatorPtr validator, ...) +testSchemaGrammarReport(const void *opaque) { - va_list args; - int ret =3D 0; - const char *dir; + const virXMLValidator *validator =3D opaque; - va_start(args, validator); + if (!validator) + return -1; - while ((dir =3D va_arg(args, char *))) { - g_autofree char *dir_path =3D g_strdup_printf("%s/%s", abs_srcdir,= dir); - if (testSchemaDir(schema, validator, dir_path) < 0) - ret =3D -1; - } + return 0; +} + +static virXMLValidatorPtr +testSchemaGrammarLoad(const char *schema) +{ + g_autofree char *schema_path =3D NULL; + g_autofree char *testname =3D NULL; + virXMLValidatorPtr ret; + + schema_path =3D g_strdup_printf("%s/%s", abs_top_srcdir, schema); + + ret =3D virXMLValidatorInit(schema_path); + + testname =3D g_strdup_printf("test schema grammar file: '%s'", schema); + + ignore_value(virTestRun(testname, testSchemaGrammarReport, ret)); - va_end(args); return ret; } static int -testSchemaGrammar(const void *opaque) +testSchemaEntries(const char *schema, + const struct testSchemaEntry *entries, + size_t nentries) { - struct testSchemaData *data =3D (struct testSchemaData *) opaque; - g_autofree char *schema_path =3D NULL; - - schema_path =3D g_strdup_printf("%s/docs/schemas/%s", abs_top_srcdir, - data->schema); + g_autoptr(virXMLValidator) validator =3D NULL; + size_t i; + int ret =3D 0; - if (!(data->validator =3D virXMLValidatorInit(schema_path))) + if (!(validator =3D testSchemaGrammarLoad(schema))) return -1; - return 0; + for (i =3D 0; i < nentries; i++) { + const struct testSchemaEntry *entry =3D entries + i; + + if (!entry->file =3D=3D !entry->dir) { + VIR_TEST_VERBOSE("\nmust specify exactly one of 'dir' and 'fil= e' for struct testSchemaEntry\n"); + ret =3D -1; + continue; + } + + if (entry->dir) { + g_autofree char *path =3D g_strdup_printf("%s/%s", abs_top_src= dir, entry->dir); + + if (testSchemaDir(schema, validator, path) < 0) + ret =3D -1; + } + + if (entry->file) { + g_autofree char *path =3D g_strdup_printf("%s/%s", abs_top_src= dir, entry->file); + + if (testSchemaFile(schema, validator, path) < 0) + ret =3D -1; + } + } + + return ret; } +static const struct testSchemaEntry schemaCapability[] =3D { + { .dir =3D "tests/capabilityschemadata" }, + { .dir =3D "tests/vircaps2xmldata" }, +}; + +static const struct testSchemaEntry schemaDomain[] =3D { + { .dir =3D "tests/domainschemadata" }, + { .dir =3D "tests/qemuxml2argvdata" }, + { .dir =3D "tests/xmconfigdata" }, + { .dir =3D "tests/qemuxml2xmloutdata" }, + { .dir =3D "tests/lxcxml2xmldata" }, + { .dir =3D "tests/lxcxml2xmloutdata" }, + { .dir =3D "tests/bhyvexml2argvdata" }, + { .dir =3D "tests/bhyvexml2xmloutdata" }, + { .dir =3D "tests/genericxml2xmlindata" }, + { .dir =3D "tests/genericxml2xmloutdata" }, + { .dir =3D "tests/xlconfigdata" }, + { .dir =3D "tests/libxlxml2domconfigdata" }, + { .dir =3D "tests/qemuhotplugtestdomains" }, +}; + +static const struct testSchemaEntry schemaDomainCaps[] =3D { + { .dir =3D "tests/domaincapsdata" }, +}; + +static const struct testSchemaEntry schemaDomainBackup[] =3D { + { .dir =3D "tests/domainbackupxml2xmlin" }, + { .dir =3D "tests/domainbackupxml2xmlout" }, +}; + +static const struct testSchemaEntry schemaDomainCheckpoint[] =3D { + { .dir =3D "tests/qemudomaincheckpointxml2xmlin" }, + { .dir =3D "tests/qemudomaincheckpointxml2xmlout" }, +}; + +static const struct testSchemaEntry schemaDomainSnapshot[] =3D { + { .dir =3D "tests/qemudomainsnapshotxml2xmlin" }, + { .dir =3D "tests/qemudomainsnapshotxml2xmlout" }, +}; + +static const struct testSchemaEntry schemaInterface[] =3D { + { .dir =3D "tests/interfaceschemadata" }, +}; + +static const struct testSchemaEntry schemaNetwork[] =3D { + { .dir =3D "src/network" }, + { .dir =3D "tests/networkxml2xmlin" }, + { .dir =3D "tests/networkxml2xmlout" }, + { .dir =3D "tests/networkxml2confdata" }, +}; + +static const struct testSchemaEntry schemaNetworkport[] =3D { + { .dir =3D "tests/virnetworkportxml2xmldata" }, +}; + +static const struct testSchemaEntry schemaNodedev[] =3D { + { .dir =3D "tests/nodedevschemadata" }, +}; + +static const struct testSchemaEntry schemaNwfilter[] =3D { + { .dir =3D "tests/nwfilterxml2xmlout" }, + { .dir =3D "src/nwfilter" }, +}; + +static const struct testSchemaEntry schemaNwfilterbinding[] =3D { + { .dir =3D "tests/virnwfilterbindingxml2xmldata" }, +}; + +static const struct testSchemaEntry schemaSecret[] =3D { + { .dir =3D "tests/secretxml2xmlin" }, +}; + +static const struct testSchemaEntry schemaStoragepoolcaps[] =3D { + { .dir =3D "tests/storagepoolcapsschemadata" }, +}; + +static const struct testSchemaEntry schemaStoragePool[] =3D { + { .dir =3D "tests/storagepoolxml2xmlin" }, + { .dir =3D "tests/storagepoolxml2xmlout" }, + { .dir =3D "tests/storagepoolschemadata" }, +}; + +static const struct testSchemaEntry schemaStorageVol[] =3D { + { .dir =3D "tests/storagevolxml2xmlin" }, + { .dir =3D "tests/storagevolxml2xmlout" }, + { .dir =3D "tests/storagevolschemadata" }, +}; + + static int mymain(void) { int ret =3D 0; - struct testSchemaData data; - - memset(&data, 0, sizeof(data)); - -#define DO_TEST_DIR(sch, ...) \ - do { \ - data.schema =3D sch; \ - if (virTestRun("test schema grammar file: " sch, \ - testSchemaGrammar, &data) =3D=3D 0) { \ - /* initialize the validator even if the schema test \ - * was skipped because of VIR_TEST_RANGE */ \ - if (!data.validator && testSchemaGrammar(&data) < 0) { \ - ret =3D -1; \ - break; \ - } \ - if (testSchemaDirs(sch, data.validator, __VA_ARGS__, NULL) < 0= ) \ - ret =3D -1; \ - \ - virXMLValidatorFree(data.validator); \ - data.validator =3D NULL; \ - } else { \ - ret =3D -1; \ - } \ - } while (0) - -#define DO_TEST_FILE(sch, xmlfile) \ - do { \ - data.schema =3D sch; \ - data.xml_path =3D abs_srcdir "/" xmlfile; \ - if (virTestRun("test schema grammar file: " sch, \ - testSchemaGrammar, &data) =3D=3D 0) { \ - /* initialize the validator even if the schema test \ - * was skipped because of VIR_TEST_RANGE */ \ - if (!data.validator && testSchemaGrammar(&data) < 0) { \ - ret =3D -1; \ - break; \ - } \ - if (virTestRun("Checking " xmlfile " against " sch, \ - testSchemaFile, &data) < 0) \ - ret =3D -1; \ - \ - virXMLValidatorFree(data.validator); \ - data.validator =3D NULL; \ - } else { \ - ret =3D -1; \ - } \ - } while (0) - - DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata= "); - DO_TEST_DIR("domain.rng", "domainschemadata", - "qemuxml2argvdata", "xmconfigdata", - "qemuxml2xmloutdata", "lxcxml2xmldata", - "lxcxml2xmloutdata", "bhyvexml2argvdata", - "bhyvexml2xmloutdata", "genericxml2xmlindata", - "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconf= igdata", - "qemuhotplugtestdomains"); - DO_TEST_DIR("domaincaps.rng", "domaincapsdata"); - DO_TEST_DIR("domainbackup.rng", "domainbackupxml2xmlin", - "domainbackupxml2xmlout"); - DO_TEST_DIR("domaincheckpoint.rng", "qemudomaincheckpointxml2xmlin", - "qemudomaincheckpointxml2xmlout"); - DO_TEST_DIR("domainsnapshot.rng", "qemudomainsnapshotxml2xmlin", - "qemudomainsnapshotxml2xmlout"); - DO_TEST_DIR("interface.rng", "interfaceschemadata"); - DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", - "networkxml2xmlout", "networkxml2confdata"); - DO_TEST_DIR("networkport.rng", "virnetworkportxml2xmldata"); - DO_TEST_DIR("nodedev.rng", "nodedevschemadata"); - DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout", "../src/nwfilter"); - DO_TEST_DIR("nwfilterbinding.rng", "virnwfilterbindingxml2xmldata"); - DO_TEST_DIR("secret.rng", "secretxml2xmlin"); - DO_TEST_DIR("storagepoolcaps.rng", "storagepoolcapsschemadata"); - DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml= 2xmlout", - "storagepoolschemadata"); - DO_TEST_DIR("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xm= lout", - "storagevolschemadata"); + +#define DO_TEST(sch, ent) \ + if (testSchemaEntries((sch), (ent), G_N_ELEMENTS(ent)) < 0) \ + ret =3D -1; + + DO_TEST("docs/schemas/capability.rng", schemaCapability); + DO_TEST("docs/schemas/domain.rng", schemaDomain); + DO_TEST("docs/schemas/domaincaps.rng", schemaDomainCaps); + DO_TEST("docs/schemas/domainbackup.rng", schemaDomainBackup); + DO_TEST("docs/schemas/domaincheckpoint.rng", schemaDomainCheckpoint); + DO_TEST("docs/schemas/domainsnapshot.rng", schemaDomainSnapshot); + DO_TEST("docs/schemas/interface.rng", schemaInterface); + DO_TEST("docs/schemas/network.rng", schemaNetwork); + DO_TEST("docs/schemas/networkport.rng", schemaNetworkport); + DO_TEST("docs/schemas/nodedev.rng", schemaNodedev); + DO_TEST("docs/schemas/nwfilter.rng", schemaNwfilter); + DO_TEST("docs/schemas/nwfilterbinding.rng", schemaNwfilterbinding); + DO_TEST("docs/schemas/secret.rng", schemaSecret); + DO_TEST("docs/schemas/storagepoolcaps.rng", schemaStoragepoolcaps); + DO_TEST("docs/schemas/storagepool.rng", schemaStoragePool); + DO_TEST("docs/schemas/storagevol.rng", schemaStorageVol); return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110174; cv=none; d=zohomail.com; s=zohoarc; b=QO11lY5vJQ9ZlqBZvQO4Jpri0S5lpZyKCjUPbdkrmt2zdkT40AS/QjJTmXXMp5dBYSK0gK3Or69b/l3H4sOcr4BVWJ73d9Xkhfc6+lFAq7N/lAS2oMy/7TIyfhgW9ruG+vZ/6P33oixRjtvYcLpvcrTvLIhqiobUv4HpwIxY0Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110174; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S0JDCdleaOL4oMN4jRTI46XuBvtq5WR/lIEO9myZlsY=; b=nNO9mKP3m+opfbKpX8X3TmCtyM57JnfBICz/CMEcjkwv1a8xk+S/h9C3rTgkMN61hVcUrQsV+6mvS3lu3oUiYAYEd9W5PBjSbIJ/6NW9SqFwcNszB52R1+CVubTbKLg2pee2nViQQP5/WYdSl0zVmQj4jyccSG94kUQvu4EuG5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110174625733.6329972486124; Mon, 19 Oct 2020 05:22:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-InQN0lr9P_GZaEafVXwDXQ-1; Mon, 19 Oct 2020 08:22:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 875BB84F226; Mon, 19 Oct 2020 12:22:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67A4E5D9D2; Mon, 19 Oct 2020 12:22:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 36E6D8C7A8; Mon, 19 Oct 2020 12:22:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCMgcA001875 for ; Mon, 19 Oct 2020 08:22:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA7CB6198E; Mon, 19 Oct 2020 12:22:42 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6CC86198C for ; Mon, 19 Oct 2020 12:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110173; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=S0JDCdleaOL4oMN4jRTI46XuBvtq5WR/lIEO9myZlsY=; b=V8Mx5vhDqkRZ6jNlK6ZydzvRwZLMD4B6Fb10qWrhEDxCdJhj33NncsIV+SZ3mOxDM6rlAV VrXFZiEvmCLsFfusS8C+IRiWi9IpNw9iOZlx31aPEMhJ4ahuOldQHnOnGfnHuLM8Zn0Dr3 akwSuG/vp4cWPyPXHQL2ubkggfopEsI= X-MC-Unique: InQN0lr9P_GZaEafVXwDXQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 02/18] virschematest: Add regex filtering for directory contents Date: Mon, 19 Oct 2020 14:22:11 +0200 Message-Id: <8c700de246a2a15ab72f292afa4c3597401fd4f4.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index e6e176eef3..7d7db3e354 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -32,6 +32,10 @@ VIR_LOG_INIT("tests.schematest"); struct testSchemaEntry { const char *dir; + /* if dirRegex is non-NULL the provided regular expression is used to = match + * the file names in a directory (without path prefixed) and only matc= hing + * files are validated */ + const char *dirRegex; const char *file; }; @@ -79,18 +83,29 @@ testSchemaFile(const char *schema, static int testSchemaDir(const char *schema, virXMLValidatorPtr validator, - const char *dir_path) + const char *dir_path, + const char *filterstr) { DIR *dir =3D NULL; struct dirent *ent; int ret =3D 0; int rc; + g_autoptr(GRegex) filter =3D NULL; if (virDirOpen(&dir, dir_path) < 0) { virTestPropagateLibvirtError(); return -1; } + if (filterstr) { + g_autoptr(GError) err =3D NULL; + + if (!(filter =3D g_regex_new(filterstr, 0, 0, &err))) { + VIR_TEST_VERBOSE("\nfailed to compile regex '%s': %s", filters= tr, err->message); + return -1; + } + } + while ((rc =3D virDirRead(dir, &ent, dir_path)) > 0) { g_autofree char *xml_path =3D NULL; @@ -98,6 +113,9 @@ testSchemaDir(const char *schema, continue; if (ent->d_name[0] =3D=3D '.') continue; + if (filter && + !g_regex_match(filter, ent->d_name, 0, NULL)) + continue; xml_path =3D g_strdup_printf("%s/%s", dir_path, ent->d_name); @@ -176,7 +194,7 @@ testSchemaEntries(const char *schema, if (entry->dir) { g_autofree char *path =3D g_strdup_printf("%s/%s", abs_top_src= dir, entry->dir); - if (testSchemaDir(schema, validator, path) < 0) + if (testSchemaDir(schema, validator, path, entry->dirRegex) < = 0) ret =3D -1; } --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110177; cv=none; d=zohomail.com; s=zohoarc; b=j0XELhdEoArmC951Sex7eLs00Wc0GrhAatmHiiR8AoBjj78b/RHH4mnFoGgE3GNbdaomi/bTmT/bp1zdFSBpphhqIrI3VX8DclaluGqoPWL5W5IXTu6OdjCS/wPVhhYJChGFlFhHHnksrmkBaxDOfHxfO6TlZU3JzTysG6buzyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110177; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=t4PQQ34lgC8pdz3TrDXWcB8nqoMA0GXr+OgR2d4iL4A=; b=lrk9TIbo1YgIZ+WeIhk0kmn5Ymsld6tdN5IYk4DW1gYUPICThMAwtnFW2auTY3Zaw2/Moy6OguR9OFFUMtPppiXiduiWuO8jlosWTqXhNWXMJXeI6QGZGVnR1is4WXNrEeZyYeV6gNH3RhcvPgGzdSbiUCUjJOBQNoLz2Frwqvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110177248604.595530045349; Mon, 19 Oct 2020 05:22:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-26-QBgmcxjhOvOS1-3Fhq5egA-1; Mon, 19 Oct 2020 08:22:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F960879529; Mon, 19 Oct 2020 12:22:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF4331007615; Mon, 19 Oct 2020 12:22:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BD94218408A1; Mon, 19 Oct 2020 12:22:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCMjv0001891 for ; Mon, 19 Oct 2020 08:22:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id A26EB61983; Mon, 19 Oct 2020 12:22:45 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AE856716C for ; Mon, 19 Oct 2020 12:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=t4PQQ34lgC8pdz3TrDXWcB8nqoMA0GXr+OgR2d4iL4A=; b=h0YFYmAQvBXg7R7xrkfTR9berOkG8gaoyTjm80Wq6spnFy9AXDopqkWC7Q+UJ67JFwE0c3 VTOrVHpfm8tETJMQP39E0U2HB6eCLLenfvYaCnK0rd0KpTrBu8dFLt0/EWpAPHY0AWuDZQ veIXvrvk4IDD2unLyQ1GM0FIqHH48eo= X-MC-Unique: QBgmcxjhOvOS1-3Fhq5egA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 03/18] examples: xml: Fix 'pool-netfs.xml' example Date: Mon, 19 Oct 2020 14:22:12 +0200 Message-Id: <7e1fe20600987bdaf6c491f6cfc9ec903f2db509.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Schema mandates a '' element, not ''. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- examples/xml/storage/pool-netfs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/xml/storage/pool-netfs.xml b/examples/xml/storage/poo= l-netfs.xml index d1df2e2b7c..446d4b41bd 100644 --- a/examples/xml/storage/pool-netfs.xml +++ b/examples/xml/storage/pool-netfs.xml @@ -2,7 +2,7 @@ virtimages - + /var/lib/virt/images --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110179; cv=none; d=zohomail.com; s=zohoarc; b=U24OCii9+QFe//JGdjxuRXHX+KJiblKzuJYnA9MpoeaHfYC3Fl9oaC3tN5hPz89FdQhwF5BqsmB2BJ8KVMfpNPcA1+qzEV8Hzd4Hpx9bgNpcxi6AHThZ6yOPyA7B50bahr5vJTp/T4nAye8ZTvEw8qXxfrsgsrCAZPtrmZj+7NY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110179; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SP8kyuXFi5pHYwfPT3mEpliFeDND5sJOVOzH7OT5BIo=; b=bRhS/SKOLHQnOuHHgwjs+PrhaZDOOJxXqGXgbn8QQLrKXQ+qYpc+MgSLYtvAO794Q4LxTJfv619QJL6NUgSAzmppKjX3yvk2QhIONR0hxpotlU60rXgsw6/shQ66Sra2sNV1kJvJUMOIqNJg0mggyHjdUmUFtEJNXQmxukxyHxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110179427718.341012275833; Mon, 19 Oct 2020 05:22:59 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-Pip2L0yyMyq8_gFzqr1CAw-1; Mon, 19 Oct 2020 08:22:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC3E98799F0; Mon, 19 Oct 2020 12:22:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6D3719C71; Mon, 19 Oct 2020 12:22:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8CF038C7AA; Mon, 19 Oct 2020 12:22:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCMnMS001904 for ; Mon, 19 Oct 2020 08:22:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CE3E6198C; Mon, 19 Oct 2020 12:22:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89A986716C for ; Mon, 19 Oct 2020 12:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110178; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SP8kyuXFi5pHYwfPT3mEpliFeDND5sJOVOzH7OT5BIo=; b=aZ07s5xi77Yx8L6md1cLoEhRzYqG3WCnMpM+G75DK4RbiRXdL7ZuPYPonr/VYwInTWRUSC QofRx4COCKOPIxQA/teIuPbYR3vf5N6w+gCQEhK5+Rs1eXlJA2Jo6fYm+PN+OuoAeTeuhY 2JD8aJwh0YOKUdNnlsOeJYKtE4UiM1k= X-MC-Unique: Pip2L0yyMyq8_gFzqr1CAw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 04/18] examples: xml: Fix 'vol-raw.xml' and 'vol-sparse.xml' Date: Mon, 19 Oct 2020 14:22:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Our schema forces a element which was not present in the files. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- examples/xml/storage/vol-raw.xml | 3 +++ examples/xml/storage/vol-sparse.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/examples/xml/storage/vol-raw.xml b/examples/xml/storage/vol-ra= w.xml index bc4e049a35..e6c5a28a25 100644 --- a/examples/xml/storage/vol-raw.xml +++ b/examples/xml/storage/vol-raw.xml @@ -2,4 +2,7 @@ raw.img 10 1000 + + + diff --git a/examples/xml/storage/vol-sparse.xml b/examples/xml/storage/vol= -sparse.xml index 2ec9f0b748..21f14a4ac7 100644 --- a/examples/xml/storage/vol-sparse.xml +++ b/examples/xml/storage/vol-sparse.xml @@ -2,4 +2,7 @@ sparse.img 0 1 + + + --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110185; cv=none; d=zohomail.com; s=zohoarc; b=Y2rs0g+1cU26GGJTLU5vlliSpv7XdIrs63MctlgZG9ttleojavJMjAk/ivguhpsIvvmA+FJ65OZX9Zi0RThXUVYdZ5zYhmBvIil3Lr8yMC17Di+/TLAJpzHrOkL+nWKfPnNE5ln60RS07OGlWqfur9dZWEPwXbH673+t+tk+ZpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110185; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=opgK/mHGoxvDQbjGbfiJu14MYZa4/urRELB9URdPR3M=; b=KBEt9HHHxB1l/4Cjha1YjvPzeycDILSwuB7QANq4+Af2O486cgzsUYaNwNB/UExiLma1ruOssFCRkM5qnPK3vY6O73a+JHfpwjQ6+Rn3rhyX13jusQ59+7WNlZweFePYmdcjRMVZ7WqCE6DOJwXXY2f9If3rearscsb3CbvHWp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110185268272.3580868171382; Mon, 19 Oct 2020 05:23:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-512-vmA-45poNEOUQY1qoOCgjQ-1; Mon, 19 Oct 2020 08:23:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2B8C1084C87; Mon, 19 Oct 2020 12:22:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 805CA5D9D2; Mon, 19 Oct 2020 12:22:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4D3B58C7AC; Mon, 19 Oct 2020 12:22:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCMsrV001922 for ; Mon, 19 Oct 2020 08:22:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 636F460C05; Mon, 19 Oct 2020 12:22:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C20FA60C13 for ; Mon, 19 Oct 2020 12:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110184; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=opgK/mHGoxvDQbjGbfiJu14MYZa4/urRELB9URdPR3M=; b=L9Vq7pBAwYnyF9J2hMBnbhApDrvJvpSdPShpP8RUHAC5NWZX5pttFhYaX2x0K8V+DXvUfx ThilaEZ4EwRt1Zn16qiCsyxxkOIlwYtmMQy7YEu3qOA0sgMuchIbA/X1SX6apad9fUbc+s KhIqKs3OOnCk7CO9YrMFZFMf6jOVTfA= X-MC-Unique: vmA-45poNEOUQY1qoOCgjQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 05/18] virschematest: Add coverage for 'examples/xml/storage' Date: Mon, 19 Oct 2020 14:22:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Match the correct subsets of the files via the 'dirRegex' property. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 7d7db3e354..29cd5cc6e3 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -290,12 +290,16 @@ static const struct testSchemaEntry schemaStoragePool= [] =3D { { .dir =3D "tests/storagepoolxml2xmlin" }, { .dir =3D "tests/storagepoolxml2xmlout" }, { .dir =3D "tests/storagepoolschemadata" }, + { .dir =3D "examples/xml/storage", + .dirRegex =3D "pool-.*" }, }; static const struct testSchemaEntry schemaStorageVol[] =3D { { .dir =3D "tests/storagevolxml2xmlin" }, { .dir =3D "tests/storagevolxml2xmlout" }, { .dir =3D "tests/storagevolschemadata" }, + { .dir =3D "examples/xml/storage", + .dirRegex =3D "vol-.*" }, }; --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110193; cv=none; d=zohomail.com; s=zohoarc; b=JUUkdY0AcvArfc8dazK+LSkVmBs0M4Phh5c0+tOdysPnjioGFIBowBrrxgnXx6eu9xBWiFLi5s4zADQwpW7M1xbHACqxWqk2InsaFPPacLKGmza5LJx9vFdb5gD4UIjwMLozzHCnzfFeYhRVw+8HjALLDfqfilGO3ttNurA9wqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110193; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tJsQ/guKpAjdl3eRGAbV2PtVnRet8VriNF3NQpP8cCA=; b=UeGZnocOWMwxW1hHlXoO5CmLktpwGc17F623YbrOsV6KIXvdJQLvJYxEULY6fBb0bnjmprP2kUhEqmqHL1ctYqMd4jZjTvBpX7mYJfp5vQEoJ2YPOhyF52H2hB5Fcud+QHE4EwBx0UkDNnoz95bZkHWTv9VqPMQWVhoZnH2F1Qw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 160311019357923.47127527865746; Mon, 19 Oct 2020 05:23:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-INwHzt62P7GvQHNEn9iC5A-1; Mon, 19 Oct 2020 08:23:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4F2764155; Mon, 19 Oct 2020 12:23:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B152C10013C4; Mon, 19 Oct 2020 12:23:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7C38C18408AD; Mon, 19 Oct 2020 12:23:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCN1xB001944 for ; Mon, 19 Oct 2020 08:23:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id B01E260C05; Mon, 19 Oct 2020 12:23:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 158AD60FC2 for ; Mon, 19 Oct 2020 12:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110192; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tJsQ/guKpAjdl3eRGAbV2PtVnRet8VriNF3NQpP8cCA=; b=HciP8WfXlyjgE6w0pLmpZHxYtUXIGr8Abfy8ImifjrvYmW4DqHhHZWC1yAcNG4aQhzyKko 1xyTsX1zMqG49lF+ZamuEZq2AtSlEQroWlNPGcOmc5K7rPKJua0xycWH+XNfBnkKCtdr1Z Go1RcYi4rDaE2JRNV4GCjgsZXZDjwL8= X-MC-Unique: INwHzt62P7GvQHNEn9iC5A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 06/18] virschematest: Add coverage for 'examples/xml/test' Date: Mon, 19 Oct 2020 14:22:15 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 29cd5cc6e3..816305d776 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -229,6 +229,8 @@ static const struct testSchemaEntry schemaDomain[] =3D { { .dir =3D "tests/xlconfigdata" }, { .dir =3D "tests/libxlxml2domconfigdata" }, { .dir =3D "tests/qemuhotplugtestdomains" }, + { .dir =3D "examples/xml/test/", + .dirRegex =3D "testdom.*" }, }; static const struct testSchemaEntry schemaDomainCaps[] =3D { @@ -259,6 +261,8 @@ static const struct testSchemaEntry schemaNetwork[] =3D= { { .dir =3D "tests/networkxml2xmlin" }, { .dir =3D "tests/networkxml2xmlout" }, { .dir =3D "tests/networkxml2confdata" }, + { .dir =3D "examples/xml/test/", + .dirRegex =3D "testnet.*" }, }; static const struct testSchemaEntry schemaNetworkport[] =3D { @@ -267,6 +271,7 @@ static const struct testSchemaEntry schemaNetworkport[]= =3D { static const struct testSchemaEntry schemaNodedev[] =3D { { .dir =3D "tests/nodedevschemadata" }, + { .file =3D "examples/xml/test/testdev.xml" }, }; static const struct testSchemaEntry schemaNwfilter[] =3D { @@ -292,6 +297,7 @@ static const struct testSchemaEntry schemaStoragePool[]= =3D { { .dir =3D "tests/storagepoolschemadata" }, { .dir =3D "examples/xml/storage", .dirRegex =3D "pool-.*" }, + { .file =3D "examples/xml/test/testpool.xml" }, }; static const struct testSchemaEntry schemaStorageVol[] =3D { @@ -300,6 +306,7 @@ static const struct testSchemaEntry schemaStorageVol[] = =3D { { .dir =3D "tests/storagevolschemadata" }, { .dir =3D "examples/xml/storage", .dirRegex =3D "vol-.*" }, + { .file =3D "examples/xml/test/testvol.xml" }, }; --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110198; cv=none; d=zohomail.com; s=zohoarc; b=epMd0ejNLPz5q68KSKZobrbQiR7goP3Nlu+1cE770kiVirFvU+mra81V34O6+SWSsi0sKCtpFOzSuHt1WeFg5mTBb6A/C3/pabkqqG2CrJoKRYWnju0hVL5TsUads0TyWeGcIbjCnWMCQPbUolbIB8qUV4uWUg3mmJBDDg1ZBcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110198; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jq/8ZCHnWLN4t2Tp6AeocpSvvkWC5zJ+vFJaIO12s0w=; b=SL9mMzNdHKeSw3XFkbV6AfvJkOC4M8FJoWioTBWyjsWl5nWfXKbT1aKD5cy+BGoT1uGMKHx6lRcVI0OXiPMqq6aMu6DR6GZH2rVek2jfpAZJxLgSfR4HxEazWx9OrcI3m4mBZDMv0me/EvqoTwtSmqdG0g5N/LE6DZzboeAhrc4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110198456584.8999989678489; Mon, 19 Oct 2020 05:23:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-HrbWRxCbNfeHj-E_YUAoWA-1; Mon, 19 Oct 2020 08:23:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE1211084D82; Mon, 19 Oct 2020 12:23:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 950F561983; Mon, 19 Oct 2020 12:23:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 61FC418408B5; Mon, 19 Oct 2020 12:23:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCN5th001986 for ; Mon, 19 Oct 2020 08:23:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id B6E4D60C13; Mon, 19 Oct 2020 12:23:05 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 133B860C05 for ; Mon, 19 Oct 2020 12:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110197; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Jq/8ZCHnWLN4t2Tp6AeocpSvvkWC5zJ+vFJaIO12s0w=; b=DZ1+UmObExsT8ceusclCPnP/Nc768hdpu7LHYscpWMOA42te0dcTPOsNdVscrYQRcGp/Md k4I6EuySot/gsNM6tRtvM3YZF4y4YaRj3/rxJMENe0Uri/6ORCqWMEzP4NdgNHIpb5iESC UVqpUxrqf2fhjeK/Xnu3tHMgVe/mJVw= X-MC-Unique: HrbWRxCbNfeHj-E_YUAoWA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 07/18] virschematest: Fix testing of 'nwfilter' xmls Date: Mon, 19 Oct 2020 14:22:16 +0200 Message-Id: <26ed590b1959d26343d37386ea5402d78fd6c0d4.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The files are under 'src/nwfilter/xml' Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index 816305d776..0a1639bf44 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -276,7 +276,7 @@ static const struct testSchemaEntry schemaNodedev[] =3D= { static const struct testSchemaEntry schemaNwfilter[] =3D { { .dir =3D "tests/nwfilterxml2xmlout" }, - { .dir =3D "src/nwfilter" }, + { .dir =3D "src/nwfilter/xml" }, }; static const struct testSchemaEntry schemaNwfilterbinding[] =3D { --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110202; cv=none; d=zohomail.com; s=zohoarc; b=XqFWlp6QqEqSSeQ8tZJ46bmA+CE45mTuNTIFyogUMF1qSdmLtnKMKstvAkLpBTNYDT2z7ExD5UmNpmFhC3RWK189npg80JxhEL0AZJsP/rO9HrWvlnJeU/+CSYaU75K/pib65hWnNlHh1LhA6HxBhR5M82Od5b8Rs9OzyXW2DaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110202; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1FYTe2o071uNvwijNezbTORDCy1QNLWZwBwjQBwj4aU=; b=QLaBxhF/4eUf2WxXDXaMC8z3EfPZHMU3HtDKoAbQLA4xDp3Mu7mXGMKvvTqjaC2EeIedsxU2gO1rQU5ZD5kH8tAeRbssEdTEQoRIAkgIT+Rt25mRtlJjHcLJNqAqlIFXRiUAyPs2psIRej/kcMzvBGc1emYGu3isQuMlSePzKC4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160311020213254.61198148395556; Mon, 19 Oct 2020 05:23:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-IsRBq2elO8W2nbCAcj0HlQ-1; Mon, 19 Oct 2020 08:23:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97CBC192AB63; Mon, 19 Oct 2020 12:23:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 727B95C22A; Mon, 19 Oct 2020 12:23:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3F71B8C7AF; Mon, 19 Oct 2020 12:23:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCN99i002011 for ; Mon, 19 Oct 2020 08:23:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id A9F2060C05; Mon, 19 Oct 2020 12:23:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17F8961983 for ; Mon, 19 Oct 2020 12:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110201; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1FYTe2o071uNvwijNezbTORDCy1QNLWZwBwjQBwj4aU=; b=b+bvMorVYjDsS3eX8Zqk3j2YsHFb3UfJO2iYu/BKSKbucVJNO8KlNl86xrD4usDUL3Qhlg B/OCUh5p8Z80+zEmhcu2t8q9T017En9Gf1pvE0l6P7rVgWfg635UAzXuLwpxwFTtcub1ss GIGknURCZoibRNjTtq5fhtcDab5vu0Y= X-MC-Unique: IsRBq2elO8W2nbCAcj0HlQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 08/18] domainconfdata/getfilesystem.xml: Remove element Date: Mon, 19 Oct 2020 14:22:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The element is not needed for the test and doesn't conform to the domain XML schema. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/domainconfdata/getfilesystem.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/domainconfdata/getfilesystem.xml b/tests/domainconfdata/= getfilesystem.xml index 2ee78b4eb9..2d8c963eaf 100644 --- a/tests/domainconfdata/getfilesystem.xml +++ b/tests/domainconfdata/getfilesystem.xml @@ -6,7 +6,6 @@ 1 hvm - /bin/sh destroy --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110315; cv=none; d=zohomail.com; s=zohoarc; b=aAQNyaV2JIhFkaYcpv3SvNl27i5dMhjxCew9lZdwY054L213+/EgNeQztbCSh7uOzfz0qbKiL06K5xpYcQuh0te6GwJnmFmhCDyNGiWBQc3tsWm0pQRAtPA72rqqyHLRrdlylFGTNAIeyZwDxhxNarU1Y+q2fY80GSieYx+A4ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110315; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vKTGc4jgO3LHu0Z0jfVOKYkozjwr+u07Jv0E/fVHdQ4=; b=dLH0069F1KGdwkSDCeuVbhyzt/7m8iPWbXmcvx+fw8k181S838zfVaLma+ghDp/u75+UDv29dqPOQdz+0z3zk1Hs2xnWHmIojiXZ9jhqgnplZd22PyKItnwj+bKW3PfqNGV8hW38it6xnwJ8cXnEJIWj7nhfBUsJ2yof/6BmcZE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110315945852.9906397987975; Mon, 19 Oct 2020 05:25:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-I-oRgVsEPKmQi5IQM2ittA-1; Mon, 19 Oct 2020 08:23:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 326708030B7; Mon, 19 Oct 2020 12:23:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13E1C6EF7C; Mon, 19 Oct 2020 12:23:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D45DC8C7B1; Mon, 19 Oct 2020 12:23:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNEGr002035 for ; Mon, 19 Oct 2020 08:23:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CEF0619B5; Mon, 19 Oct 2020 12:23:14 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9414A6CE4F for ; Mon, 19 Oct 2020 12:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110314; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vKTGc4jgO3LHu0Z0jfVOKYkozjwr+u07Jv0E/fVHdQ4=; b=JMTJHJZ2jF7D+lVcK0ElhH/YtYwYmA5Mj26K6W4OHDuHSz3ePaRRp+2BquECtKrW2Xr7G6 rgLEDZTBZat+X0eIRaynqMJPYBMHNWS+6TPGcGtWKASeNjJVV1+y1oTbFShgPl3zcoxa3z Bn268RGd8teWyO/pALZKS4BS4Ux3rVU= X-MC-Unique: I-oRgVsEPKmQi5IQM2ittA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 09/18] schema: nwfilter: Allow all accepted values for 'ipsetflags' Date: Mon, 19 Oct 2020 14:22:18 +0200 Message-Id: <5d56a9b504dc1904f5e48face6724b66155c53e5.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The parser for the 'ipsetflags' accepts the 'src' and 'dst' values stripping case. Express the same in the schema to pass validation of any accepted string. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- docs/schemas/nwfilter.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index 75caf61b89..64a607e62f 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -980,7 +980,7 @@ - (src|dst)(,(src|dst)){0,5} + ([Ss][Rr][Cc]|[Dd][Ss][Tt])(,([Ss][Rr][Cc]|[= Dd][Ss][Tt])){0,5} --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110212; cv=none; d=zohomail.com; s=zohoarc; b=TaFuWyYu8VbPSuAxCD5cBaOVuhpMYHMkjJez1S1S3b7b1VLxoX036MVs67dDddvGy4ruMFCz0g1YQmXTf8XgDfzqA3zXdcKxqgjZFxfn/qXORCTFHhtxD2z7qF3bXh9yW2ggd1FeFDUy2uXiui6TS/4yPZ8RC9xV+DAHpbc34+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110212; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o61O+1iGiQozjEAbc57kiWPWYogrs+S+e51G3ErF35g=; b=fy9zVKCaMJFjpcMr+m1S5zLMc5tu3FWTMRtZAisJfSvzWBj/1BCCl4llXd6AFADifyy6f5qBeIrMNrF/P/76GSRh7W3qrpco3wcYMcddsdXLrrZYLyuTbWVNa4dVtzMA/kfh6svfK8U8sWmf8UcQmNQjofv9objpzmjbs9cAxWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110212881292.28570486802573; Mon, 19 Oct 2020 05:23:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-sGIUAuNyNWW_HD7xUg3xcQ-1; Mon, 19 Oct 2020 08:23:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8D038030A4; Mon, 19 Oct 2020 12:23:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 933C15C22A; Mon, 19 Oct 2020 12:23:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5D33718408C2; Mon, 19 Oct 2020 12:23:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNME4002068 for ; Mon, 19 Oct 2020 08:23:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DDBE60FC2; Mon, 19 Oct 2020 12:23:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77B6C672C0 for ; Mon, 19 Oct 2020 12:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110211; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o61O+1iGiQozjEAbc57kiWPWYogrs+S+e51G3ErF35g=; b=gg7AM4i92P3NxehEnQJSfijRRtutjtIOzL0pl3CFuKGHuIAoc1SRkRhntgVVIjvi7GVZkr sSmE+4RZmpktFxMqvdzesw0DCWrtK5bxK6E8MVjdHkilNLl6NVjSD/JmdirnmJ2aAjEjLF XpkPcfyxH9bDaPVtp8gvKEtBVnGcLIo= X-MC-Unique: sGIUAuNyNWW_HD7xUg3xcQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 10/18] schema: nwfiter: Allow leading/trailing whitespace in 'variable-name-type' Date: Mon, 19 Oct 2020 14:22:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The reference string parser tolerates some leading/trailing whitespace for the reference strings as witnessed by tests/nwfilterxml2xmlin/iter-test3.xml Allow them in the schema so that the test passes schema validation. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- docs/schemas/nwfilter.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index 64a607e62f..a75de7ed3e 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -725,7 +725,7 @@ - $[a-zA-Z0-9_]+(\[[ ]*[@]?[0-9]+[ ]*\])? + $[ ]*[a-zA-Z0-9_]+(\[[ ]*[@]?[0-9]+[ ]*\])?[= ]* --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110219; cv=none; d=zohomail.com; s=zohoarc; b=dKFyn2YG1NMmb5OI1+Ultt3vs5xY5aX1NDVnGSufbfVhEVfQGgQiV0MYtmvH/cDnZErUY01RINvoQ87yCbAhq3CxIXLp4DQ0P7WrfJhw3/q3A2DGoYr4cXNvHP1gffnDUfrM426V5Ew4Gy68Icn4duxg5j6utoYhiha8pLsAjok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110219; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BEmyNRx76Mq7lEQIVOAApdfTpr9hgTWxlYBb8GTLZeY=; b=RamDMqxU30B0xMIbEv96Dt5+gQk2rd6C92C49S2HPM6n4+A34BLJQUGLi2W427S3ivAC5g3g2qOtx3etOK8/LBwsdQRhs8TLpDOpJyzPWVHUFhn34bH6S+sj2YumTcr3qsZQtyddVWTCqU1oJsG28wSm2kv0hRvRZFt9nW0CiIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160311021992647.87376319764155; Mon, 19 Oct 2020 05:23:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-3Y3BIfX-NUqD528Kr09nRA-1; Mon, 19 Oct 2020 08:23:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30F661020908; Mon, 19 Oct 2020 12:23:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 110E05D9EF; Mon, 19 Oct 2020 12:23:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D1D7618408AE; Mon, 19 Oct 2020 12:23:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNRc3002100 for ; Mon, 19 Oct 2020 08:23:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 37379619C4; Mon, 19 Oct 2020 12:23:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9991C619B5 for ; Mon, 19 Oct 2020 12:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110218; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BEmyNRx76Mq7lEQIVOAApdfTpr9hgTWxlYBb8GTLZeY=; b=cOBtItSXSU6S0+zVHLbB6BBC7zhuj+jqPE69uLALnvRXx2k4bA2U45frxLVImBkQMxIDN8 L+O8nJ1tGRF49aP80WXqAF4aub0K2RHBdmcydkui6B6hYcDfdVZr9UAXZq7CLK9Kv+HDbn U2Mvst2w//jN8w0ZoW0mT2z+fA9kubQ= X-MC-Unique: 3Y3BIfX-NUqD528Kr09nRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 11/18] nwfilterxml2firewall: Fix schema compilance of 'tcp' test case Date: Mon, 19 Oct 2020 14:22:20 +0200 Message-Id: <59c185d3645d5b4715dd44441c3bebc625ca4e6c.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Fix the 'flags' of the last rule to conform to the RNG schema. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/nwfilterxml2firewalldata/tcp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nwfilterxml2firewalldata/tcp.xml b/tests/nwfilterxml2fir= ewalldata/tcp.xml index 14ebd35d38..1321f1a513 100644 --- a/tests/nwfilterxml2firewalldata/tcp.xml +++ b/tests/nwfilterxml2firewalldata/tcp.xml @@ -29,6 +29,6 @@ - + --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110230; cv=none; d=zohomail.com; s=zohoarc; b=Ne6szKtlCMqMRi32sJRzFcpv//+YCTq4t0gfDa+qt2t+zS1tO976BSDbAaarnpPt7xMbHKH9+wLXpz+tVty3luhWrrD2flfoDCNuu0b7f5dXIM1kb9uJM8tcLVa55lUqrlaQSqNRe/JVXuKYK4CPBjrtJu7N9/p/zptXb+nXfK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110230; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pmqg+RsJ/Ed3OpNgKxkaheGyMmUatoMAhUzGlcmgbIo=; b=co6jvbV9yXJ7lmjomT/5wMvasrglLykPUBj7zJCfcheRPyGbImm5FzbVtrJJGOi1XPifluDDmItNp7DHOuCj8DBSn+uH9hn79ND3EMO7ydr4IesV9sbpR6qs8P7GfPX7m0RhEKzgMxoAtOTeycdwUjJNIIqoSL/2R2Wa+HPeri4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110230361311.3212797861635; Mon, 19 Oct 2020 05:23:50 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-o6WKOnSfPZydKp749Bd44w-1; Mon, 19 Oct 2020 08:23:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B54ED192AB79; Mon, 19 Oct 2020 12:23:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 916E81002C00; Mon, 19 Oct 2020 12:23:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5CA3F8C7B7; Mon, 19 Oct 2020 12:23:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNVL3002150 for ; Mon, 19 Oct 2020 08:23:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5E0F4619B5; Mon, 19 Oct 2020 12:23:31 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B73C7672CF for ; Mon, 19 Oct 2020 12:23:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110222; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Pmqg+RsJ/Ed3OpNgKxkaheGyMmUatoMAhUzGlcmgbIo=; b=KHB7CzUzQWzZxNm1fZeI7d9B7K6v00ocyB/nzL2Q9G2qy+Syb0jJ7Jn89ra8N8r8IHmrOr XfcE8tSlyDoB7iuE18gDda4mo5whpqR06C7fR6h6+4AJ4zSV84VVoZvw29CgwW+G5+Pboc QB3q04F3KEvyvciaYDn19phDnb7jcFc= X-MC-Unique: o6WKOnSfPZydKp749Bd44w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 12/18] nwfilterxml2xmltest: Rename cases with XMLs not conforming to schema Date: Mon, 19 Oct 2020 14:22:21 +0200 Message-Id: <47b76d2d76fa342b9f3d0308e47d96b41d4d24a7.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's quite a few negative tests. In anticipation of schema testing of the 'nwfilterxml2xmlin' directory rename all negative/non-conformant XMLs with the -invalid suffix. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...ipv6-test.xml =3D> ah-ipv6-test-invalid.xml} | 0 ...pv6-test.xml =3D> all-ipv6-test-invalid.xml} | 0 .../{arp-test.xml =3D> arp-test-invalid.xml} | 0 ...est1.xml =3D> chain_prefixtest1-invalid.xml} | 0 ...ment-test.xml =3D> comment-test-invalid.xml} | 0 ...pv6-test.xml =3D> esp-ipv6-test-invalid.xml} | 0 ...ata-test.xml =3D> hex-data-test-invalid.xml} | 0 .../{icmp-test.xml =3D> icmp-test-invalid.xml} | 0 ...cmpv6-test.xml =3D> icmpv6-test-invalid.xml} | 0 .../{ip-test.xml =3D> ip-test-invalid.xml} | 0 .../{ipv6-test.xml =3D> ipv6-test-invalid.xml} | 0 .../{mac-test.xml =3D> mac-test-invalid.xml} | 0 .../{rarp-test.xml =3D> rarp-test-invalid.xml} | 0 ...v6-test.xml =3D> sctp-ipv6-test-invalid.xml} | 0 .../{sctp-test.xml =3D> sctp-test-invalid.xml} | 0 ...pv6-test.xml =3D> tcp-ipv6-test-invalid.xml} | 0 .../{tcp-test.xml =3D> tcp-test-invalid.xml} | 0 ...pv6-test.xml =3D> udp-ipv6-test-invalid.xml} | 0 .../{udp-test.xml =3D> udp-test-invalid.xml} | 0 ...test.xml =3D> udplite-ipv6-test-invalid.xml} | 0 .../{vlan-test.xml =3D> vlan-test-invalid.xml} | 0 tests/nwfilterxml2xmltest.c | 44 +++++++++---------- 22 files changed, 22 insertions(+), 22 deletions(-) rename tests/nwfilterxml2xmlin/{ah-ipv6-test.xml =3D> ah-ipv6-test-invalid= .xml} (100%) rename tests/nwfilterxml2xmlin/{all-ipv6-test.xml =3D> all-ipv6-test-inval= id.xml} (100%) rename tests/nwfilterxml2xmlin/{arp-test.xml =3D> arp-test-invalid.xml} (1= 00%) rename tests/nwfilterxml2xmlin/{chain_prefixtest1.xml =3D> chain_prefixtes= t1-invalid.xml} (100%) rename tests/nwfilterxml2xmlin/{comment-test.xml =3D> comment-test-invalid= .xml} (100%) rename tests/nwfilterxml2xmlin/{esp-ipv6-test.xml =3D> esp-ipv6-test-inval= id.xml} (100%) rename tests/nwfilterxml2xmlin/{hex-data-test.xml =3D> hex-data-test-inval= id.xml} (100%) rename tests/nwfilterxml2xmlin/{icmp-test.xml =3D> icmp-test-invalid.xml} = (100%) rename tests/nwfilterxml2xmlin/{icmpv6-test.xml =3D> icmpv6-test-invalid.x= ml} (100%) rename tests/nwfilterxml2xmlin/{ip-test.xml =3D> ip-test-invalid.xml} (100= %) rename tests/nwfilterxml2xmlin/{ipv6-test.xml =3D> ipv6-test-invalid.xml} = (100%) rename tests/nwfilterxml2xmlin/{mac-test.xml =3D> mac-test-invalid.xml} (1= 00%) rename tests/nwfilterxml2xmlin/{rarp-test.xml =3D> rarp-test-invalid.xml} = (100%) rename tests/nwfilterxml2xmlin/{sctp-ipv6-test.xml =3D> sctp-ipv6-test-inv= alid.xml} (100%) rename tests/nwfilterxml2xmlin/{sctp-test.xml =3D> sctp-test-invalid.xml} = (100%) rename tests/nwfilterxml2xmlin/{tcp-ipv6-test.xml =3D> tcp-ipv6-test-inval= id.xml} (100%) rename tests/nwfilterxml2xmlin/{tcp-test.xml =3D> tcp-test-invalid.xml} (1= 00%) rename tests/nwfilterxml2xmlin/{udp-ipv6-test.xml =3D> udp-ipv6-test-inval= id.xml} (100%) rename tests/nwfilterxml2xmlin/{udp-test.xml =3D> udp-test-invalid.xml} (1= 00%) rename tests/nwfilterxml2xmlin/{udplite-ipv6-test.xml =3D> udplite-ipv6-te= st-invalid.xml} (100%) rename tests/nwfilterxml2xmlin/{vlan-test.xml =3D> vlan-test-invalid.xml} = (100%) diff --git a/tests/nwfilterxml2xmlin/ah-ipv6-test.xml b/tests/nwfilterxml2x= mlin/ah-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/ah-ipv6-test.xml rename to tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/all-ipv6-test.xml b/tests/nwfilterxml2= xmlin/all-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/all-ipv6-test.xml rename to tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/arp-test.xml b/tests/nwfilterxml2xmlin= /arp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/arp-test.xml rename to tests/nwfilterxml2xmlin/arp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml b/tests/nwfilter= xml2xmlin/chain_prefixtest1-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/chain_prefixtest1.xml rename to tests/nwfilterxml2xmlin/chain_prefixtest1-invalid.xml diff --git a/tests/nwfilterxml2xmlin/comment-test.xml b/tests/nwfilterxml2x= mlin/comment-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/comment-test.xml rename to tests/nwfilterxml2xmlin/comment-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/esp-ipv6-test.xml b/tests/nwfilterxml2= xmlin/esp-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/esp-ipv6-test.xml rename to tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/hex-data-test.xml b/tests/nwfilterxml2= xmlin/hex-data-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/hex-data-test.xml rename to tests/nwfilterxml2xmlin/hex-data-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/icmp-test.xml b/tests/nwfilterxml2xmli= n/icmp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/icmp-test.xml rename to tests/nwfilterxml2xmlin/icmp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/icmpv6-test.xml b/tests/nwfilterxml2xm= lin/icmpv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/icmpv6-test.xml rename to tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/ip-test.xml b/tests/nwfilterxml2xmlin/= ip-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/ip-test.xml rename to tests/nwfilterxml2xmlin/ip-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/ipv6-test.xml b/tests/nwfilterxml2xmli= n/ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/ipv6-test.xml rename to tests/nwfilterxml2xmlin/ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/mac-test.xml b/tests/nwfilterxml2xmlin= /mac-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/mac-test.xml rename to tests/nwfilterxml2xmlin/mac-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/rarp-test.xml b/tests/nwfilterxml2xmli= n/rarp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/rarp-test.xml rename to tests/nwfilterxml2xmlin/rarp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/sctp-ipv6-test.xml b/tests/nwfilterxml= 2xmlin/sctp-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/sctp-ipv6-test.xml rename to tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/sctp-test.xml b/tests/nwfilterxml2xmli= n/sctp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/sctp-test.xml rename to tests/nwfilterxml2xmlin/sctp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/tcp-ipv6-test.xml b/tests/nwfilterxml2= xmlin/tcp-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/tcp-ipv6-test.xml rename to tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/tcp-test.xml b/tests/nwfilterxml2xmlin= /tcp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/tcp-test.xml rename to tests/nwfilterxml2xmlin/tcp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/udp-ipv6-test.xml b/tests/nwfilterxml2= xmlin/udp-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/udp-ipv6-test.xml rename to tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/udp-test.xml b/tests/nwfilterxml2xmlin= /udp-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/udp-test.xml rename to tests/nwfilterxml2xmlin/udp-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/udplite-ipv6-test.xml b/tests/nwfilter= xml2xmlin/udplite-ipv6-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/udplite-ipv6-test.xml rename to tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml diff --git a/tests/nwfilterxml2xmlin/vlan-test.xml b/tests/nwfilterxml2xmli= n/vlan-test-invalid.xml similarity index 100% rename from tests/nwfilterxml2xmlin/vlan-test.xml rename to tests/nwfilterxml2xmlin/vlan-test-invalid.xml diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 52a4af12cc..9def1e2634 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -89,32 +89,32 @@ mymain(void) ret =3D -1; \ } while (0) - DO_TEST("mac-test", true); - DO_TEST("vlan-test", true); + DO_TEST("mac-test-invalid", true); + DO_TEST("vlan-test-invalid", true); DO_TEST("stp-test", false); - DO_TEST("arp-test", true); - DO_TEST("rarp-test", true); - DO_TEST("ip-test", true); - DO_TEST("ipv6-test", true); - - DO_TEST("tcp-test", true); - DO_TEST("udp-test", true); - DO_TEST("icmp-test", true); + DO_TEST("arp-test-invalid", true); + DO_TEST("rarp-test-invalid", true); + DO_TEST("ip-test-invalid", true); + DO_TEST("ipv6-test-invalid", true); + + DO_TEST("tcp-test-invalid", true); + DO_TEST("udp-test-invalid", true); + DO_TEST("icmp-test-invalid", true); DO_TEST("igmp-test", false); - DO_TEST("sctp-test", true); + DO_TEST("sctp-test-invalid", true); DO_TEST("udplite-test", false); DO_TEST("esp-test", false); DO_TEST("ah-test", false); DO_TEST("all-test", false); - DO_TEST("tcp-ipv6-test", true); - DO_TEST("udp-ipv6-test", true); - DO_TEST("icmpv6-test", true); - DO_TEST("sctp-ipv6-test", true); - DO_TEST("udplite-ipv6-test", true); - DO_TEST("esp-ipv6-test", true); - DO_TEST("ah-ipv6-test", true); - DO_TEST("all-ipv6-test", true); + DO_TEST("tcp-ipv6-test-invalid", true); + DO_TEST("udp-ipv6-test-invalid", true); + DO_TEST("icmpv6-test-invalid", true); + DO_TEST("sctp-ipv6-test-invalid", true); + DO_TEST("udplite-ipv6-test-invalid", true); + DO_TEST("esp-ipv6-test-invalid", true); + DO_TEST("ah-ipv6-test-invalid", true); + DO_TEST("all-ipv6-test-invalid", true); DO_TEST("ref-test", false); DO_TEST("ref-rule-test", false); @@ -125,14 +125,14 @@ mymain(void) DO_TEST("conntrack-test", false); - DO_TEST("hex-data-test", true); + DO_TEST("hex-data-test-invalid", true); - DO_TEST("comment-test", true); + DO_TEST("comment-test-invalid", true); DO_TEST("example-1", false); DO_TEST("example-2", false); - DO_TEST("chain_prefixtest1", true); /* derived from arp-test */ + DO_TEST("chain_prefixtest1-invalid", true); /* derived from arp-test */ DO_TEST("attr-value-test", false); DO_TEST("iter-test1", false); --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110230; cv=none; d=zohomail.com; s=zohoarc; b=ippzgaRHXBIwVY896jItkOrqICXNrBDFNW5g4V/XdhjK2XnZY7+Cpb91f3jQhx0L2C6voPXFtDw8cUbr+Qs1hDGGuxcDwzuOeqPKs3yLAVXuRQwXwmSTDlFJIERDiNDiQJ3c1a2dn9r6vhH9eHqQpNgRvqkdZKfFte3Ad1+jERg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110230; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oS0GUGgQFchY3D0Rqx4RXUu6prc7vVmvsM9CxVZzhWE=; b=eytRoa+pc8bsrHUfhYIQCJGIC+3Nyg3g1nekDoMjJqpHEP+SgJkXDqn5+j60WLW0Wv09Hb+axfMW9WQ7+Tm7s4G2QkibbUM7Khd/e3NyUtr/xeWpTa3F4wZVxnvwGy+mKFFsw1KGpgd3M61fgMjEPHVOYhSkWWRNGu5itWYVofA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110230281229.29893602640186; Mon, 19 Oct 2020 05:23:50 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-qGMaGYyhMHi2loQR8p57xQ-1; Mon, 19 Oct 2020 08:23:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BCAA8030BD; Mon, 19 Oct 2020 12:23:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BE196EF7C; Mon, 19 Oct 2020 12:23:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3A00F18408C5; Mon, 19 Oct 2020 12:23:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNZR5002171 for ; Mon, 19 Oct 2020 08:23:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4FD15619C4; Mon, 19 Oct 2020 12:23:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2DCD672CF for ; Mon, 19 Oct 2020 12:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110226; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oS0GUGgQFchY3D0Rqx4RXUu6prc7vVmvsM9CxVZzhWE=; b=PzjgUwn1HpaFmsiVhMHq8gSNPdZLSjyZVoV0XI0Bq0mxL5NC6zNTFpbxlu0lS/s7cJZfOp NvUYFTGFdNISia4H5kOVoy5Tzze0Ro7uxAxish3cufgeLB1yeVgPhVCj5bEVPjw4smyKhm F/E6KwP8TwAK+fAUZE0ItXeqb9yFhks= X-MC-Unique: qGMaGYyhMHi2loQR8p57xQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 13/18] schema: domain: Add definition for the 'vmware' private namespace Date: Mon, 19 Oct 2020 14:22:22 +0200 Message-Id: <0acc1ca23c58e1a814c92d26af601c7c0902cd30.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The 'vmware' private namespace wasn't present in our schema definition making all XMLs having the element invalid. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- docs/schemas/domaincommon.rng | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 50d8aa9155..41803c8f99 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -90,6 +90,9 @@ + + + @@ -6835,6 +6838,16 @@ + + + + + + + --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110233; cv=none; d=zohomail.com; s=zohoarc; b=flC782j8ZkTqvSUsrgSZqTNPt5Z8KK9m/cbzN7lW22G6l28uirW+WsAZ29xx2xM80Ul/1vJQo0wc/lrr74wvhOjfzZWW/VnfKoYaT/7tQxMHG7xnNMzjmIev2hfcCI6MG2o9VzV6/6reSRiosQyoBpZh+lsZKofdggJFFfdQfLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110233; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DXoH3jDrB7iAzEo8yS9hUKQuyHWE68Y4SJTBYGSnhNg=; b=Mc3L04wJBQaJUxetqVvkcSCQVJT2zGrUpLnNuZLYwziPUMCBXJoS+z3aznQ7ncU0rQizNHtt/F+LKaZOvbCd73XDNQ2tPElzOin/S93UNpNHWpeVbjUwqN/fQsC7xbqknG0xQ+AQvyiZGHTN2DPYDDybcTaSIFn6oNX4cn1ajR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110233169527.7784398891916; Mon, 19 Oct 2020 05:23:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-249-d7eqnyQxMo6v2ZQjGIpfoA-1; Mon, 19 Oct 2020 08:23:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64B431020903; Mon, 19 Oct 2020 12:23:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FA8F27CDC; Mon, 19 Oct 2020 12:23:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0980B8C7AB; Mon, 19 Oct 2020 12:23:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNgpo002210 for ; Mon, 19 Oct 2020 08:23:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4A2E619B5; Mon, 19 Oct 2020 12:23:42 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id F41A5619C4 for ; Mon, 19 Oct 2020 12:23:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110232; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DXoH3jDrB7iAzEo8yS9hUKQuyHWE68Y4SJTBYGSnhNg=; b=fVjP4nG9m7Eemo8KEDsI3gUwx1JwcJpjvYMTQiEZ4zo8g9O4e43PYJtlVPpku6uj2CCqvq oQ0PRgnDD3tQqEECQueP6fsY8AooH4eizU4Q2AJfPBGy+HLLzr4NA1Up3n0lwXgYZSF8MA L6J+4RHk2uJXJz6gCNSjR8lrNGxPygM= X-MC-Unique: d7eqnyQxMo6v2ZQjGIpfoA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 14/18] schema: domain: Allow space in XML schema for bridge source Date: Mon, 19 Oct 2020 14:22:23 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" vmware's network names can contain space and they are used as bridge source. Modify the schema to allow it. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- docs/schemas/domaincommon.rng | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 41803c8f99..c25a742581 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2886,7 +2886,9 @@ - + + [a-zA-Z0-9_\.\-\\:/ ]* + --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110238; cv=none; d=zohomail.com; s=zohoarc; b=fe+KbaPLayR8uPLcIeZLLIEzQ4sL6PlWqnd8n+hkZPSoYKUyOtsOxh8bt6eauiGUdhrnXV6jCg2PppOyRyyBaWQ/QTN1deCP9DV9sRs3Ix+OxneHeapI/MiQKUL01ezLT4ql++TXOCvrEG/zzH7CQiFRgeYaDughsz8nYRvmWT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110238; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BXTVFsDxQu3p3tBvgzbk4bOKwKN3njHW7vVSkJF90bw=; b=Q7/BKgKwbsz+tN0vfFHex4W1GqnMVjWZTh347w4eUxhgPQ36mO/1Pa+tS/mNuWq1UdNrvSFs40YF2wyAjNh2SzHM20kqcRlC7jGQ6uUDtZ+WQTmwpbCsj1b6uB+R2zuiAhg6l6kFnpaFuDx+0sAOzC4UtfO9dX3OTfdN67U0sr0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110238706723.0135233108041; Mon, 19 Oct 2020 05:23:58 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-f2juGvgoP66Drf8WOPmB_g-1; Mon, 19 Oct 2020 08:23:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B46287950C; Mon, 19 Oct 2020 12:23:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2951B6E70B; Mon, 19 Oct 2020 12:23:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EBC8F18408C5; Mon, 19 Oct 2020 12:23:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNk45002245 for ; Mon, 19 Oct 2020 08:23:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6090F619C4; Mon, 19 Oct 2020 12:23:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6535E619B5 for ; Mon, 19 Oct 2020 12:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110236; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BXTVFsDxQu3p3tBvgzbk4bOKwKN3njHW7vVSkJF90bw=; b=bXzKaHDrA85DnFUskb3Yl0DFPtev5nPZXNHoRMZyWFF+ckIfs3LaxNpd587LLJZs87iEIh hbWHHodBM4/ivJUtKak3+PDC+KXZsp4DRfAvH6dd1mhf6/UI6iSc1U0rJLvRRBJ3Ubw4/4 W7R0uVKZliIUT18dQGAWn+OBWivgrPo= X-MC-Unique: f2juGvgoP66Drf8WOPmB_g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 15/18] tests: vmx: Add element for all domain XMLs Date: Mon, 19 Oct 2020 14:22:24 +0200 Message-Id: <6590bf9f3ba4ba0607cd4f747278e3ad28f9f094.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" is mandatory for a domain XML. Add 'displayName' for all the test cases which were missing them so that is parsed correctly. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik Reviewed-by: Pino Toscano --- tests/vmx2xmldata/vmx2xml-annotation.vmx | 1 + tests/vmx2xmldata/vmx2xml-annotation.xml | 1 + tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx | 1 + tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 1 + tests/vmx2xmldata/vmx2xml-datacenterpath.vmx | 1 + tests/vmx2xmldata/vmx2xml-datacenterpath.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-custom.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-generated.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-nat.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-other.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-other.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-static.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-static.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 1 + tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx | 1 + tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml | 1 + tests/vmx2xmldata/vmx2xml-firmware-efi.vmx | 1 + tests/vmx2xmldata/vmx2xml-firmware-efi.xml | 1 + tests/vmx2xmldata/vmx2xml-floppy-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-floppy-device.xml | 1 + tests/vmx2xmldata/vmx2xml-floppy-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-floppy-file.xml | 1 + tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx | 1 + tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 1 + tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 1 + tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 1 + tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx | 1 + tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 1 + tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx | 1 + tests/vmx2xmldata/vmx2xml-minimal-64bit.xml | 1 + tests/vmx2xmldata/vmx2xml-minimal.vmx | 1 + tests/vmx2xmldata/vmx2xml-minimal.xml | 1 + tests/vmx2xmldata/vmx2xml-parallel-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-parallel-device.xml | 1 + tests/vmx2xmldata/vmx2xml-parallel-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-parallel-file.xml | 1 + tests/vmx2xmldata/vmx2xml-scsi-driver.vmx | 1 + tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 1 + tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx | 1 + tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 1 + tests/vmx2xmldata/vmx2xml-serial-device.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-device.xml | 1 + tests/vmx2xmldata/vmx2xml-serial-file.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-file.xml | 1 + tests/vmx2xmldata/vmx2xml-serial-network-client.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-network-client.xml | 1 + tests/vmx2xmldata/vmx2xml-serial-network-server.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-network-server.xml | 1 + tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx | 1 + tests/vmx2xmldata/vmx2xml-serial-pipe.xml | 1 + tests/vmx2xmldata/vmx2xml-sharedfolder.vmx | 1 + tests/vmx2xmldata/vmx2xml-sharedfolder.xml | 1 + tests/vmx2xmldata/vmx2xml-smbios.vmx | 1 + tests/vmx2xmldata/vmx2xml-smbios.xml | 1 + tests/vmx2xmldata/vmx2xml-svga.vmx | 1 + tests/vmx2xmldata/vmx2xml-svga.xml | 1 + 93 files changed, 93 insertions(+) diff --git a/tests/vmx2xmldata/vmx2xml-annotation.vmx b/tests/vmx2xmldata/v= mx2xml-annotation.vmx index 405b73cbfa..35dbc1335e 100644 --- a/tests/vmx2xmldata/vmx2xml-annotation.vmx +++ b/tests/vmx2xmldata/vmx2xml-annotation.vmx @@ -1,3 +1,4 @@ config.version =3D "8" virtualHW.version =3D "4" annotation =3D "Some |7Ctext|7C to test the |22escaping|22: |7C|7C|22|22|7= C|7C|22|7C |45|73|63|61|70|65|64|21" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/v= mx2xml-annotation.xml index 9d99fd288b..3e7a0e129a 100644 --- a/tests/vmx2xmldata/vmx2xml-annotation.xml +++ b/tests/vmx2xmldata/vmx2xml-annotation.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 Some |text| to test the "escaping": ||""= ;||"| Escaped! 32768 diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx b/tests/vmx2x= mldata/vmx2xml-case-insensitive-1.vmx index 8641c5c01b..dd069b378d 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx @@ -49,3 +49,4 @@ UUID.LOCATION =3D "56 4D B5 06 A2 BD FB EB-AE 86 F7 D8 49= 27 D0 C4" SCHED.CPU.MAX =3D "UNLIMITED" SCHED.SWAP.DERIVEDNAME =3D "/VMFS/VOLUMES/498076B2-02796C1A-EF5B-000AE484A= 6A3/FEDORA11/FEDORA11-7DE040D8.VSWP" TOOLS.REMINDINSTALL =3D "TRUE" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx b/tests/vmx2x= mldata/vmx2xml-case-insensitive-2.vmx index a485d03cd9..e37e0b9369 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx @@ -49,3 +49,4 @@ uuid.location =3D "56 4d b5 06 a2 bd fb eb-ae 86 f7 d8 49= 27 d0 c4" sched.cpu.max =3D "unlimited" sched.swap.derivedname =3D "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a= 6a3/fedora11/fedora11-7de040d8.vswp" tools.remindinstall =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx b/tests/vmx2xml= data/vmx2xml-cdrom-ide-device.vmx index dc789d257e..3b60bd18f5 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx @@ -4,3 +4,4 @@ guestOS =3D "other" ide0:0.present =3D "true" ide0:0.deviceType =3D "atapi-cdrom" ide0:0.fileName =3D "/dev/scd0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xml= data/vmx2xml-cdrom-ide-device.xml index d8bba13385..e5a242d1f4 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx b/tests/vmx2xm= ldata/vmx2xml-cdrom-ide-empty-2.vmx index 36286cb20f..7ea8fb96de 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx @@ -2,3 +2,4 @@ config.version =3D "8" virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "atapi-cdrom" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml b/tests/vmx2xm= ldata/vmx2xml-cdrom-ide-empty-2.xml index af4a5ff9f6..6af0ee0704 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx b/tests/vmx2xmld= ata/vmx2xml-cdrom-ide-empty.vmx index 62fdb3d18d..c61b0eeb10 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "cdrom-image" ide0:0.fileName =3D "emptyBackingString" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmld= ata/vmx2xml-cdrom-ide-empty.xml index b11fe272b6..93670e7eb4 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx b/tests/vmx2xmlda= ta/vmx2xml-cdrom-ide-file.vmx index edd3999d0e..adc57f4374 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "cdrom-image" ide0:0.fileName =3D "cdrom.iso" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmlda= ta/vmx2xml-cdrom-ide-file.xml index 7ca8ff729a..98548e9da8 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx b/test= s/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx index b2c4caf20f..0e24927960 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "cdrom-raw" ide0:0.fileName =3D "auto detect" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml b/test= s/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml index 68ad26dc6f..392d580ffa 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx b/tests/vmx= 2xmldata/vmx2xml-cdrom-ide-raw-device.vmx index 164811140f..5ec66522c8 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "cdrom-raw" ide0:0.fileName =3D "/dev/scd0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml b/tests/vmx= 2xmldata/vmx2xml-cdrom-ide-raw-device.xml index 679cdb154b..c7cba73aa8 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx b/tests/vmx2xm= ldata/vmx2xml-cdrom-scsi-device.vmx index 721068aded..5991b71b16 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "atapi-cdrom" scsi0:0.fileName =3D "/dev/scd0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xm= ldata/vmx2xml-cdrom-scsi-device.xml index cf1275c829..9e5a985788 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx b/tests/vmx2xml= data/vmx2xml-cdrom-scsi-empty.vmx index 3c6036ab2b..c08f4cc8ff 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "cdrom-image" scsi0:0.fileName =3D "emptyBackingString" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xml= data/vmx2xml-cdrom-scsi-empty.xml index 20452522d8..3678ef38b0 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx b/tests/vmx2xmld= ata/vmx2xml-cdrom-scsi-file.vmx index 3422e0b6d9..91acf931aa 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "cdrom-image" scsi0:0.fileName =3D "cdrom.iso" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmld= ata/vmx2xml-cdrom-scsi-file.xml index 5765232bc1..e79927ada8 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx b/tests/vmx2= xmldata/vmx2xml-cdrom-scsi-passthru.vmx index fb7ea724ab..7898304fef 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "scsi-passthru" scsi0:0.fileName =3D "/vmfs/devices/cdrom/mpx.vmhba32:C0:T0:L0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml b/tests/vmx2= xmldata/vmx2xml-cdrom-scsi-passthru.xml index 46e27bce71..b851e73b3b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx b/tes= ts/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx index 0209b291e6..d92af1fd1d 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "cdrom-raw" scsi0:0.fileName =3D "auto detect" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml b/tes= ts/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml index 9d706b5d04..497066972d 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx b/tests/vm= x2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx index 773b7432ea..42817946fc 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "cdrom-raw" scsi0:0.fileName =3D "/dev/scd0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml b/tests/vm= x2xmldata/vmx2xml-cdrom-scsi-raw-device.xml index 9052327dcd..d7d881e4a6 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.vmx b/tests/vmx2xmlda= ta/vmx2xml-datacenterpath.vmx index a8e5db3746..bc17daa772 100644 --- a/tests/vmx2xmldata/vmx2xml-datacenterpath.vmx +++ b/tests/vmx2xmldata/vmx2xml-datacenterpath.vmx @@ -1,2 +1,3 @@ config.version =3D "8" virtualHW.version =3D "4" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml b/tests/vmx2xmlda= ta/vmx2xml-datacenterpath.xml index 7d458c5c8e..19920f81f7 100644 --- a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml +++ b/tests/vmx2xmldata/vmx2xml-datacenterpath.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx b/tests/vmx2xml= data/vmx2xml-ethernet-bridged.vmx index 8b7a5b3bf3..2c80db33b0 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx @@ -5,3 +5,4 @@ ethernet0.networkName =3D "VM Network" ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xml= data/vmx2xml-ethernet-bridged.xml index fac5cd7bd5..84dc0d2ba2 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx b/tests/vmx2xmld= ata/vmx2xml-ethernet-custom.vmx index bab8aa1784..9dca6bbf7f 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx @@ -6,3 +6,4 @@ ethernet0.connectionType =3D "custom" ethernet0.vnet =3D "vmnet7" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmld= ata/vmx2xml-ethernet-custom.xml index ce63c24127..a3c6f03f31 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx b/tests/vmx2xmlda= ta/vmx2xml-ethernet-e1000.vmx index eb7c4844db..e31dc2c674 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx @@ -6,3 +6,4 @@ ethernet0.networkName =3D "VM Network" ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmlda= ta/vmx2xml-ethernet-e1000.xml index 534d35e352..6ab739a0ba 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx b/tests/vmx2x= mldata/vmx2xml-ethernet-generated.vmx index f27e0a008f..15c374b001 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx @@ -6,3 +6,4 @@ ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "generated" ethernet0.generatedAddress =3D "00:0C:29:11:22:33" ethernet0.generatedAddressOffset =3D "0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2x= mldata/vmx2xml-ethernet-generated.xml index 3fbc013f21..2d7cf93b54 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx b/tests/vmx2xmldata= /vmx2xml-ethernet-nat.vmx index 701c3851fb..33aaf2b882 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx @@ -4,3 +4,4 @@ ethernet0.present =3D "true" ethernet0.connectionType =3D "nat" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata= /vmx2xml-ethernet-nat.xml index af721e3059..f9939223be 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx b/tests/vmx2xmlda= ta/vmx2xml-ethernet-other.vmx index da46a70d46..4d1bf8fe41 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx @@ -6,3 +6,4 @@ ethernet0.connectionType =3D "bridged" ethernet0.checkMACAddress =3D "false" ethernet0.addressType =3D "static" ethernet0.address =3D "00:12:34:56:78:90" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmlda= ta/vmx2xml-ethernet-other.xml index ef324405d7..9cecc262fb 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx b/tests/vmx2xmld= ata/vmx2xml-ethernet-static.vmx index 8b7a5b3bf3..2c80db33b0 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx @@ -5,3 +5,4 @@ ethernet0.networkName =3D "VM Network" ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmld= ata/vmx2xml-ethernet-static.xml index fac5cd7bd5..84dc0d2ba2 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx b/tests/vmx2xml= data/vmx2xml-ethernet-vmxnet2.vmx index 1c3f063365..3306925c07 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx @@ -7,3 +7,4 @@ ethernet0.networkName =3D "VM Network" ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "static" ethernet0.address =3D "00:50:56:11:22:33" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xml= data/vmx2xml-ethernet-vmxnet2.xml index 54c9283989..8ba8f3d465 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx b/tests/vmx2xmldata= /vmx2xml-ethernet-vpx.vmx index b4d9172764..6ffefe2f76 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx @@ -5,3 +5,4 @@ ethernet0.networkName =3D "VM Network" ethernet0.connectionType =3D "bridged" ethernet0.addressType =3D "vpx" ethernet0.generatedAddress =3D "00:50:56:87:65:43" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata= /vmx2xml-ethernet-vpx.xml index c75d52f5b2..3f10934359 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.vmx b/tests/vmx2xmldata= /vmx2xml-firmware-efi.vmx index dbb215a5db..93453b56f5 100644 --- a/tests/vmx2xmldata/vmx2xml-firmware-efi.vmx +++ b/tests/vmx2xmldata/vmx2xml-firmware-efi.vmx @@ -1,3 +1,4 @@ config.version =3D "8" virtualHW.version =3D "13" firmware =3D "efi" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml b/tests/vmx2xmldata= /vmx2xml-firmware-efi.xml index e21158cebf..fee707fe71 100644 --- a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml +++ b/tests/vmx2xmldata/vmx2xml-firmware-efi.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.vmx b/tests/vmx2xmldat= a/vmx2xml-floppy-device.vmx index 6c6358d468..323a399b4e 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" floppy0.present =3D "true" floppy0.fileType =3D "device" floppy0.fileName =3D "/dev/fd0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldat= a/vmx2xml-floppy-device.xml index 3b1317249d..a1264f98a8 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx b/tests/vmx2xmldata/= vmx2xml-floppy-file.vmx index ff50117d16..71b63a1b5d 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.vmx @@ -6,3 +6,4 @@ floppy0.fileName =3D "floppy.flp" floppy1.present =3D "true" floppy1.fileType =3D "file" floppy1.fileName =3D "floppy" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/= vmx2xml-floppy-file.xml index 6699f15602..6ae11e7f54 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx b/tests/vmx2xmldata= /vmx2xml-graphics-vnc.vmx index bd3e55f7ab..9cba21f4f1 100644 --- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx @@ -4,3 +4,4 @@ RemoteDisplay.vnc.enabled =3D "true" RemoteDisplay.vnc.port =3D "5903" RemoteDisplay.vnc.keymap =3D "de" RemoteDisplay.vnc.password =3D "password" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata= /vmx2xml-graphics-vnc.xml index 3c575798f4..15a9766403 100644 --- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx b/tests/vmx2xm= ldata/vmx2xml-harddisk-ide-file.vmx index a8c71f189b..480b5cd354 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" ide0:0.present =3D "true" ide0:0.deviceType =3D "ata-hardDisk" ide0:0.fileName =3D "harddisk.vmdk" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xm= ldata/vmx2xml-harddisk-ide-file.xml index d452e6ed99..9b2431baac 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx b/tests/vmx2x= mldata/vmx2xml-harddisk-scsi-file.vmx index 933707c984..b3f5a8c803 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx @@ -4,3 +4,4 @@ scsi0.present =3D "true" scsi0:0.present =3D "true" scsi0:0.deviceType =3D "scsi-hardDisk" scsi0:0.fileName =3D "harddisk.vmdk" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2x= mldata/vmx2xml-harddisk-scsi-file.xml index 64b89c6530..0750d4f8c8 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx b/tests/vmx2x= mldata/vmx2xml-harddisk-transient.vmx index 68ef3827f7..434a580f41 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx @@ -4,3 +4,4 @@ ide0:0.present =3D "true" ide0:0.deviceType =3D "ata-hardDisk" ide0:0.fileName =3D "harddisk.vmdk" ide0:0.mode =3D "independent-nonpersistent" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2x= mldata/vmx2xml-harddisk-transient.xml index f61fb21773..97c5653862 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx b/tests/vmx2xmldat= a/vmx2xml-minimal-64bit.vmx index 73d3972591..d83f2e2644 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx +++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx @@ -1,3 +1,4 @@ config.version =3D "8" virtualHW.version =3D "4" guestOS =3D "other-64" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldat= a/vmx2xml-minimal-64bit.xml index 42245d4ba0..d883116f27 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-minimal.vmx b/tests/vmx2xmldata/vmx2= xml-minimal.vmx index a8e5db3746..bc17daa772 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal.vmx +++ b/tests/vmx2xmldata/vmx2xml-minimal.vmx @@ -1,2 +1,3 @@ config.version =3D "8" virtualHW.version =3D "4" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/vmx2= xml-minimal.xml index 122d59cd77..3d47fa972e 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.vmx b/tests/vmx2xmld= ata/vmx2xml-parallel-device.vmx index ee2eb749b6..4b499abaf0 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-parallel-device.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" parallel0.present =3D "true" parallel0.fileType =3D "device" parallel0.fileName =3D "/dev/parallel0" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmld= ata/vmx2xml-parallel-device.xml index 3c69198b93..bdf9cfd9d0 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-device.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.vmx b/tests/vmx2xmldat= a/vmx2xml-parallel-file.vmx index e91906a9d7..6c34c6b454 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-parallel-file.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" parallel0.present =3D "true" parallel0.fileType =3D "file" parallel0.fileName =3D "parallel0.file" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldat= a/vmx2xml-parallel-file.xml index d7ec0cf1a2..7fda5877c6 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-file.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx b/tests/vmx2xmldata/= vmx2xml-scsi-driver.vmx index 64d7c99d3a..91a76d2dd1 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx @@ -20,3 +20,4 @@ scsi2:0.fileName =3D "harddisk3.vmdk" scsi3:0.present =3D "true" scsi3:0.deviceType =3D "scsi-hardDisk" scsi3:0.fileName =3D "harddisk4.vmdk" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/= vmx2xml-scsi-driver.xml index 1a057df428..e5b73420c3 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx b/tests/vmx2xm= ldata/vmx2xml-scsi-writethrough.vmx index 54ac49c914..a4a61b5fde 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx @@ -6,3 +6,4 @@ scsi0:0.present =3D "true" scsi0:0.deviceType =3D "scsi-hardDisk" scsi0:0.fileName =3D "harddisk.vmdk" scsi0:0.writeThrough =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xm= ldata/vmx2xml-scsi-writethrough.xml index 95accb104e..5f6869852a 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.vmx b/tests/vmx2xmldat= a/vmx2xml-serial-device.vmx index 927f408fbb..131c0de498 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-device.vmx @@ -5,3 +5,4 @@ serial0.fileType =3D "device" serial0.fileName =3D "/dev/ttyS0" serial1.present =3D "true" serial1.fileName =3D "/dev/ttyS1" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldat= a/vmx2xml-serial-device.xml index df25d66b98..165db89c8e 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.vmx b/tests/vmx2xmldata/= vmx2xml-serial-file.vmx index 2c3bc39628..e1ed2dd4db 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-file.vmx @@ -3,3 +3,4 @@ virtualHW.version =3D "4" serial0.present =3D "true" serial0.fileType =3D "file" serial0.fileName =3D "serial0.file" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/= vmx2xml-serial-file.xml index 84618c321c..40bf7ecddc 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-file.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.vmx b/tests/vm= x2xmldata/vmx2xml-serial-network-client.vmx index 18cfc57c61..fefc27a586 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-client.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.vmx @@ -4,3 +4,4 @@ serial0.present =3D "true" serial0.fileType =3D "network" serial0.fileName =3D "tcp://192.168.0.17:42001" serial0.network.endPoint =3D "client" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vm= x2xmldata/vmx2xml-serial-network-client.xml index 2e096434f5..19ec90a023 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.vmx b/tests/vm= x2xmldata/vmx2xml-serial-network-server.vmx index d4a9c41310..d7dd20f7f6 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-server.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.vmx @@ -4,3 +4,4 @@ serial0.present =3D "true" serial0.fileType =3D "network" serial0.fileName =3D "telnets://0.0.0.0:42001" serial0.network.endPoint =3D "server" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vm= x2xmldata/vmx2xml-serial-network-server.xml index 65950e8cea..229ca10fb2 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx b/tests/v= mx2xmldata/vmx2xml-serial-pipe-client-app.vmx index f104aab099..164502f08b 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx @@ -5,3 +5,4 @@ serial0.fileType =3D "pipe" serial0.fileName =3D "serial0.pipe" serial0.pipe.endPoint =3D "client" serial0.tryNoRxLoss =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx b/tests/vm= x2xmldata/vmx2xml-serial-pipe-client-vm.vmx index 3b487ee5e3..1aeb9152d5 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx @@ -4,3 +4,4 @@ serial0.present =3D "true" serial0.fileType =3D "pipe" serial0.fileName =3D "serial0.pipe" serial0.pipe.endPoint =3D "client" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx b/tests/v= mx2xmldata/vmx2xml-serial-pipe-server-app.vmx index 27ee3bc216..4a1bfe22a5 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx @@ -5,3 +5,4 @@ serial0.fileType =3D "pipe" serial0.fileName =3D "serial0.pipe" serial0.pipe.endPoint =3D "server" serial0.tryNoRxLoss =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx b/tests/vm= x2xmldata/vmx2xml-serial-pipe-server-vm.vmx index b99c627eb6..b8f57d7068 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx @@ -4,3 +4,4 @@ serial0.present =3D "true" serial0.fileType =3D "pipe" serial0.fileName =3D "serial0.pipe" serial0.pipe.endPoint =3D "server" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/= vmx2xml-serial-pipe.xml index bd425e603e..59a5b978c2 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.vmx b/tests/vmx2xmldata= /vmx2xml-sharedfolder.vmx index e60fcd493b..6053c9dd89 100644 --- a/tests/vmx2xmldata/vmx2xml-sharedfolder.vmx +++ b/tests/vmx2xmldata/vmx2xml-sharedfolder.vmx @@ -7,3 +7,4 @@ sharedFolder0.enabled =3D "true" sharedFolder0.hostPath =3D "/path/to/shared" sharedFolder0.guestName =3D "shared" sharedFolder0.writeAccess =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml b/tests/vmx2xmldata= /vmx2xml-sharedfolder.xml index 7fa3203161..f41ef71912 100644 --- a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml +++ b/tests/vmx2xmldata/vmx2xml-sharedfolder.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-smbios.vmx b/tests/vmx2xmldata/vmx2x= ml-smbios.vmx index 16258b0bea..8fa9d3e08e 100644 --- a/tests/vmx2xmldata/vmx2xml-smbios.vmx +++ b/tests/vmx2xmldata/vmx2xml-smbios.vmx @@ -1,3 +1,4 @@ config.version =3D "8" virtualHW.version =3D "4" smbios.reflecthost =3D "true" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/vmx2x= ml-smbios.xml index 6773502633..53b5fd01b8 100644 --- a/tests/vmx2xmldata/vmx2xml-smbios.xml +++ b/tests/vmx2xmldata/vmx2xml-smbios.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 diff --git a/tests/vmx2xmldata/vmx2xml-svga.vmx b/tests/vmx2xmldata/vmx2xml= -svga.vmx index 081d6cee0d..7ed953424c 100644 --- a/tests/vmx2xmldata/vmx2xml-svga.vmx +++ b/tests/vmx2xmldata/vmx2xml-svga.vmx @@ -1,3 +1,4 @@ config.version =3D "8" virtualHW.version =3D "4" svga.vramSize =3D "8388608" +displayName =3D "test" diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/vmx2xml= -svga.xml index da0f1a30e2..96dff16d37 100644 --- a/tests/vmx2xmldata/vmx2xml-svga.xml +++ b/tests/vmx2xmldata/vmx2xml-svga.xml @@ -1,4 +1,5 @@ + test 00000000-0000-0000-0000-000000000000 32768 32768 --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110308; cv=none; d=zohomail.com; s=zohoarc; b=TFXcTGVA42SKKBFmEk/eblwY90SB21kUVy4t2bpn+iyCCYDdm4WyCgFk9Fj3FU5S65XPUbSvk2uLbdF5I3CzL2HIfqzjE/apn1mJIrpy9lyvByIWM4NZZaDzbu5floJ1ytNAIMbbNNrYkAwYa7snTZcOzf3nSMxhRgasDbVsQk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110308; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/Z/foZ5H5hbAg7REu4pz2ahMWJ5bwsul2MYg2i4sGDs=; b=XMF2tCCRM9+VFKIIcnFomXC07Mfy3Amd66jvAiWQ+YV7LY/YYj/N4c5LPcYVtnmlZXemQS73yahPerWoJO+mMehlG17Z8SB2Cs/lYn700Y37KTCnplZ4dJZJTnD1t4KzlVMbMpaB141OSN4R3cW1Cg12Iv5UOgkaWvDLSPMDcJ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110308450681.7255230954592; Mon, 19 Oct 2020 05:25:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-4BI2LR_tNt6VrmEFC53xmg-1; Mon, 19 Oct 2020 08:23:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56765593B2; Mon, 19 Oct 2020 12:23:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 345DE55775; Mon, 19 Oct 2020 12:23:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F249E8C7AC; Mon, 19 Oct 2020 12:23:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNn4M002255 for ; Mon, 19 Oct 2020 08:23:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A7D56198B; Mon, 19 Oct 2020 12:23:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB67A60FC2 for ; Mon, 19 Oct 2020 12:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110307; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/Z/foZ5H5hbAg7REu4pz2ahMWJ5bwsul2MYg2i4sGDs=; b=Slk9jTaUGJcnyqjdrZaNBS3Tna025OZLqGKs+n1uDg++BX1gNloUKOdejV8nIo7WcGVevf S6jChiJpWxbUjO9OehuyWTUeQhc/nsdqtueqv4nfUqR2UwdVdViXJiq9OeQwFyF1qXo3sS 2Os4YeD8s4OAlrOerJLr0ilhGcJ+z8g= X-MC-Unique: 4BI2LR_tNt6VrmEFC53xmg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 16/18] virschematest: Add directories containing domain XMLs Date: Mon, 19 Oct 2020 14:22:25 +0200 Message-Id: <7400ace55d5ad661a19e9991be2c7dcadabc52bd.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Validate additional XML documents we use for internal testing. Specifically there's a lot of them belonging to the vmx and bhyve test suite which were not validated. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 0a1639bf44..50dcc5d9d7 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -231,6 +231,15 @@ static const struct testSchemaEntry schemaDomain[] =3D= { { .dir =3D "tests/qemuhotplugtestdomains" }, { .dir =3D "examples/xml/test/", .dirRegex =3D "testdom.*" }, + { .dir =3D "tests/qemuhotplugtestcpus" }, + { .dir =3D "tests/securityselinuxlabeldata" }, + { .dir =3D "tests/domainconfdata" }, + { .dir =3D "tests/lxcconf2xmldata" }, + { .dir =3D "tests/qemumemlockdata" }, + { .dir =3D "tests/vmx2xmldata" }, + { .dir =3D "tests/xml2vmxdata" }, + { .dir =3D "tests/bhyveargv2xmldata" }, + { .dir =3D "tests/qemuagentdata" }, }; static const struct testSchemaEntry schemaDomainCaps[] =3D { --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110243; cv=none; d=zohomail.com; s=zohoarc; b=ObKDPD49b3eyqkqkjJClnlacMR2gQypbuAxSQgzlsdmauSA557DVN47WLvQJb/jKzdXPp/Bhb8dE6WmMBSonbUXSuOgZbv67K+OSsmuN0wdDNek1ljanQrDLPJVk/ireHDA+d8Ooc8aylc9WO6IGgagUCTj96TlRuEaJ4wunSyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110243; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=60yE1w9yNuNzghxPBbvfBHi4H04TxTCnzoy8udB1fpM=; b=n1+aePc9ag/e8r5R0mMTttpVpY7gAAq4UlUngOc85Y9GuNXb/kzQFY07sLSMU2hUluERiX1ebqC/NfSAkrpJzoBCgbN0fzOJSKDYv3kPyGT4UUFvyCWiw+pqg7nKav/fKCIQhX0kOw1/JUkc6af6k33XYTdBgj1WL59Vhg7Qs+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603110243365320.8261417149388; Mon, 19 Oct 2020 05:24:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-7jO7E9EgNnC55YYaGdmHiw-1; Mon, 19 Oct 2020 08:23:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE7A1879514; Mon, 19 Oct 2020 12:23:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ADDCF5B4B2; Mon, 19 Oct 2020 12:23:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7AAA918408A1; Mon, 19 Oct 2020 12:23:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNqg7002280 for ; Mon, 19 Oct 2020 08:23:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0DAB619B5; Mon, 19 Oct 2020 12:23:52 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F5106198B for ; Mon, 19 Oct 2020 12:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110242; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=60yE1w9yNuNzghxPBbvfBHi4H04TxTCnzoy8udB1fpM=; b=d4+or4pXV0HEOqfwgRCFoWlVzpcSWGOSpiee3D39MQ9/HisizamlPkxbsmdc17nWXQ5+PP 1QaWEAd8ljpWTeUmAw8/NKZqd+ApAs2JgIkkNEYCX9iqp9bh1cVir+qd6xVa2AyozICOYx Ah6TMiu/Za4rlbvIDGcmMmuxP7fre6w= X-MC-Unique: 7jO7E9EgNnC55YYaGdmHiw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 17/18] virschematest: Validate more XMLs Date: Mon, 19 Oct 2020 14:22:26 +0200 Message-Id: <4d911a2646e86620e46a17e55c5eb8dfd6a25d30.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We weren't validating certain directories containing nwfilter, network and capability XML test files. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 50dcc5d9d7..6ce09d4737 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -213,6 +213,7 @@ testSchemaEntries(const char *schema, static const struct testSchemaEntry schemaCapability[] =3D { { .dir =3D "tests/capabilityschemadata" }, { .dir =3D "tests/vircaps2xmldata" }, + { .dir =3D "tests/qemucaps2xmloutdata" }, }; static const struct testSchemaEntry schemaDomain[] =3D { @@ -272,6 +273,8 @@ static const struct testSchemaEntry schemaNetwork[] =3D= { { .dir =3D "tests/networkxml2confdata" }, { .dir =3D "examples/xml/test/", .dirRegex =3D "testnet.*" }, + { .dir =3D "tests/networkxml2xmlupdateout" }, + { .dir =3D "tests/networkxml2firewalldata" }, }; static const struct testSchemaEntry schemaNetworkport[] =3D { @@ -286,6 +289,8 @@ static const struct testSchemaEntry schemaNodedev[] =3D= { static const struct testSchemaEntry schemaNwfilter[] =3D { { .dir =3D "tests/nwfilterxml2xmlout" }, { .dir =3D "src/nwfilter/xml" }, + { .dir =3D "tests/nwfilterxml2xmlin" }, + { .dir =3D "tests/nwfilterxml2firewalldata" }, }; static const struct testSchemaEntry schemaNwfilterbinding[] =3D { --=20 2.26.2 From nobody Sun May 5 18:42:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603110304; cv=none; d=zohomail.com; s=zohoarc; b=cJ9MVVOX4XVZt4X7FVpywiYAZ9lHMUtD8eWf0zpcoUpaBG15/z3iTkNIWKkmR53vq6ZAmynGWM+71xov6sHhkl9taKUeji6cKnp3gJ9Hakd4AMnWQ0k6T8X1klv2TcEKzA0jyVv2Nla9zu2dZtWI3d7P5Sh7KA9O+WFwWNwmVtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603110304; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bgc4M3SIQnkheI/zdS+ICi23lBcssWE0DEIsHBw4WHU=; b=edIjwf9JImmlDoV0oUnkiSsW+dw7Z84FqWKMxqyf2Nv6lZJB0pGg/F74FijlgA+jGQ9cUvfwEyOqKTTB7e2DgiGD0GkBqpZzYdWY6zv+6UsBmJ51TghPQelgcKkJjuzELCLKCq0Q3u7CQKJnzrQgllTxuZZ0SH80VUJhK0EDGLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603110304520991.3692496421555; Mon, 19 Oct 2020 05:25:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-AJozbsWcPZyl0sHw9wHu0A-1; Mon, 19 Oct 2020 08:24:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D5941084D62; Mon, 19 Oct 2020 12:23:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17BFB100760A; Mon, 19 Oct 2020 12:23:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DB5588C7B7; Mon, 19 Oct 2020 12:23:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09JCNuYN002294 for ; Mon, 19 Oct 2020 08:23:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A22B6716C; Mon, 19 Oct 2020 12:23:56 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B2106198B for ; Mon, 19 Oct 2020 12:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603110303; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Bgc4M3SIQnkheI/zdS+ICi23lBcssWE0DEIsHBw4WHU=; b=FLILr7N569aLUpesqHFzwYfYntwGZCTyr3ylvEMdXq9zEsNH03M8PwahjR0cevQaMMTir+ fc8YrIGNmNvjmIvg3HUplT6M5ntAjM6jX/VkSc/g7z97k4pwW9v++ZahTcHwX/zSy22eH7 sVvH5SrhYDt3WXFqEOTv+6pR9PHYNNc= X-MC-Unique: AJozbsWcPZyl0sHw9wHu0A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 18/18] virschematest: Validate schema in tests/cputestdata Date: Mon, 19 Oct 2020 14:22:27 +0200 Message-Id: <68f3cd4315500c26de52e199bf740128de22f0ad.1603109876.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We now have a schema file for the 'cpu' elements. Use it to validate files in 'tests/cputestdata' Unfortunately the files in the directory are too disorganised and not easy to split up to do something more straightforward. The -baseline- input files are tested by the test internally and the rest of the files are internal data feeding the tests so they don't need validation. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/virschematest.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 6ce09d4737..0e587c3ff0 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -323,6 +323,14 @@ static const struct testSchemaEntry schemaStorageVol[]= =3D { { .file =3D "examples/xml/test/testvol.xml" }, }; +static const struct testSchemaEntry schemaCpu[] =3D { + { . dir =3D "tests/cputestdata", + . dirRegex =3D "^[^-]+-cpuid-.*(-host|-guest|-json)\\.xml$" }, + { . dir =3D "tests/cputestdata", + . dirRegex =3D "^[^-]+-baseline-.*-result\\.xml$" }, + { . dir =3D "tests/cputestdata", + . dirRegex =3D "^[^-]+-(?!cpuid|baseline).*$" }, +}; static int mymain(void) @@ -349,6 +357,7 @@ mymain(void) DO_TEST("docs/schemas/storagepoolcaps.rng", schemaStoragepoolcaps); DO_TEST("docs/schemas/storagepool.rng", schemaStoragePool); DO_TEST("docs/schemas/storagevol.rng", schemaStorageVol); + DO_TEST("docs/schemas/cpu.rng", schemaCpu); return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.26.2