From nobody Sat May 4 16:33:31 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=1602143766; cv=none; d=zohomail.com; s=zohoarc; b=MShimQ+jxuAf0IkEl/9VhGEFxevioYiZ5omKv1aOn4yrh6XtAPyFYwzaq2/o3OkmPNuWh4PtaLMq+inBvHaJgIQ9hy+25gCT5HgOO5MrVwBET1PqgzeD9RM02uUkBfMTbFrtSbTM70jcuJZrYYRrnbzi74mzvESZGAPJLO+SXhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143766; 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=B+Gog4tmwftqUd2yup0s+q162Jojg4SNtxdbXT+n6Ug=; b=SvWk/boroce7m1OB1zM6ay6GTOJb+PQBRsrCg59LNUS7DH4u05A8Khsa6oTF+xJHCwFSfkOwq8Rg89TpBtBooXUmwkIQJDSAgYnFnsycywIPqM3g1Npw+gGVmj57NyHJJqt5c9lgXhjr7HmnombP0870WppBvy6MBGXU4jgnjrU= 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 1602143766162267.34636249398636; Thu, 8 Oct 2020 00:56:06 -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-302-XTcp3BffNMSzgXC7a0v-TA-1; Thu, 08 Oct 2020 03:56:03 -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 4F3C38030A8; Thu, 8 Oct 2020 07:55:57 +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 2C93A55785; Thu, 8 Oct 2020 07:55:57 +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 E8AD88C7B7; Thu, 8 Oct 2020 07:55:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987tmOn003594 for ; Thu, 8 Oct 2020 03:55:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79F855D9F3; Thu, 8 Oct 2020 07:55:48 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3BEA5D9F1 for ; Thu, 8 Oct 2020 07:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143764; 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=B+Gog4tmwftqUd2yup0s+q162Jojg4SNtxdbXT+n6Ug=; b=HbFlkSwqDzHBvB6aDLyY8zafHCAryJ0O2K74cq2sS0QD1iXOfiC71Sv6eFvVFcihyc5N/F 51Si1w+Ojn+/dXQPm97TlxM2WkwWXD9d7PBiZ3FklTDCuFAaDAr2QCnmxcwjyhiHpNoCUP xiBY4CLT/UFDSC62KMEhYBEcb1OvA1c= X-MC-Unique: XTcp3BffNMSzgXC7a0v-TA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/21] util: xml: Add autoptr cleanup for virXMLValidator Date: Thu, 8 Oct 2020 09:55:15 +0200 Message-Id: <2a96faa41ae6407205beba45af4bd0d654a68aa7.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virxml.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virxml.h b/src/util/virxml.h index fd0d30fcec..b73591c3df 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -220,6 +220,7 @@ virXMLValidateNodeAgainstSchema(const char *schemafile, void virXMLValidatorFree(virXMLValidatorPtr validator); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virXMLValidator, virXMLValidatorFree); void virXMLFormatElement(virBufferPtr buf, --=20 2.26.2 From nobody Sat May 4 16:33:31 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=1602143769; cv=none; d=zohomail.com; s=zohoarc; b=d6vCDL7SKE9mOlArtxFPh0eksSMCFuycOjTl2NBizncHKBBfaoW+e4qJLmqfjLEPR1x/5CEdRrEsQ/nqvya5+9LCu7q7XQ45H9m1YmE/uFGOJOv9FvBs+S2bQadXjYaULncxpIcYfOXefNJmEdbGo7977+O5xCjz4BCsySVPzVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143769; 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=IJTdNG49BcrGxnqbnxbcJ9VGwyhHqUqyQZMusD3mikFoLWxTLCINfZOUzqd5x7AQ3mETH7amaLQ6R5aJ2OhI/DaT2rtBsLFJ1NH2r4KqUkpdbZ+27KNXtvIjn5Gn8U0qJNzPeraUtKu9bG3X4nq6YIt+gP/UJYbcZHq73JwtzE0= 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 1602143769811618.9121395433542; Thu, 8 Oct 2020 00:56:09 -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-388-sMuPWZmbN9uAhCZOFaeaaA-1; Thu, 08 Oct 2020 03:56:06 -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 17BB587951D; Thu, 8 Oct 2020 07:56:00 +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 E65C019930; Thu, 8 Oct 2020 07:55:59 +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 B1E29181A06C; Thu, 8 Oct 2020 07:55:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987tnoS003603 for ; Thu, 8 Oct 2020 03:55:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id D935F5D9F3; Thu, 8 Oct 2020 07:55:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 159065D9DD for ; Thu, 8 Oct 2020 07:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143768; 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=UZjj1yCJ4osd4DND1pkzKakYj+50u/CQ79qb5HfvVX1AqsQ8WTx7kvpBeXbpds0RPdQX8S DSbYghqwdEnFcc/WHgGShP9WGr5mhP9xXI6AOC2R8QvKEtDcXXIf96BsrXjJrpE/ugDJJi ZNWoSJqrz3SlTRvbmxu9LU/+C3rUKKU= X-MC-Unique: sMuPWZmbN9uAhCZOFaeaaA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/21] virschematest: Rewrite internals to allow increasing XML test coverage Date: Thu, 8 Oct 2020 09:55:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- 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 Sat May 4 16:33:31 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=1602143761; cv=none; d=zohomail.com; s=zohoarc; b=eOPl6RzMOYqaEcrf4c0dTQZTl1XyZl5uNk/9cYHiDHdwlXQyw5+j1oDBLCcuk6D91KUrFw8kuemLdX3WjeFZ9PpxjjsSqrnjQrGwywU4xzjy1L5+9Dp/+D5XQZ8IQfuMp9D80g6q3iZDBNAUhkXMEO/YAFG9WJxAPCFmgx40M8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143761; 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=N8b8V0g441tzpjgX3Tqj84fxjwHn/ArHQYUTq+GUSOo9UMZJ2cWGJTWQ2x3ItY+skDwWb70oVxnKBvo6E53lA2EbfGfjRfCtRAT9p3jcH0vICCr0YoAdGUgNDYhpvyW3LXIXIgDpM0XGlqK2/3u8Iia0sFSSDm9cLUNJJehzW9s= 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 1602143761550440.3052682000632; Thu, 8 Oct 2020 00:56:01 -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-152-o3DrAC96ORGkUozBJ59LRQ-1; Thu, 08 Oct 2020 03:55:57 -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 BB4D41015ECB; Thu, 8 Oct 2020 07:55:52 +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 881A01992D; Thu, 8 Oct 2020 07:55:52 +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 3FEF779FF4; Thu, 8 Oct 2020 07:55:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987tpts003614 for ; Thu, 8 Oct 2020 03:55:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FF4E5D9F1; Thu, 8 Oct 2020 07:55:51 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E1275D9DD for ; Thu, 8 Oct 2020 07:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143760; 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=IZRWBX0eARrHGxDMdp3suAcEQubsRDdoYoJ0Fn2UMj5QiB1f3mHOBmey2XfQIt2mWYfkOC O6HK11rTy5IfDl9xvEZ4jCYaVu/hF2NIn/bbJmMnpAWV2K+ILLrtvWXsGxfwK1HsoM+eyt WUvif4nHBVQCgci9KG85Amdcbjw9LCE= X-MC-Unique: o3DrAC96ORGkUozBJ59LRQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/21] virschematest: Add regex filtering for directory contents Date: Thu, 8 Oct 2020 09:55:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- 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 Sat May 4 16:33:31 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=1602143765; cv=none; d=zohomail.com; s=zohoarc; b=lFKDZLBMkpbe8w7yCtX0jiJDPpVLJ2HscZmVRorW8GZC78ayTqqZBIPlbkvanmB04ILYFw+L8/NbVPeWcDd+x/C+CAA10K8HNyPqP4zIDrzyOtBOsjOQaZakcrWDxKIGnKCxq/afuajx0NJl4nTd0J7eOFTQP+6+rRDQHzMkUjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143765; 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=GGUacDKx1BtdyuqzGQQXYN7xIA7cznQZ2WT5wh9lnB/hT3sAcaDXLkMhg+1COsVX325/D7r+vlKGXo2wiueiES+Span3IwUpbfILnV+Vtbr7O2eLAmzerPMkAcixuFghmRXd0SDBeMkkEVUMsXnDjxZ1j2MOXN5gik9rd5DcZQo= 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 1602143765100912.5679034018652; Thu, 8 Oct 2020 00:56: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-211-IgW1IXyaO0KQ_ylDmttfpA-1; Thu, 08 Oct 2020 03:56:00 -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 1B27C1084D64; Thu, 8 Oct 2020 07:55:54 +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 F0A7F614F5; Thu, 8 Oct 2020 07:55: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 B7A5518199F8; Thu, 8 Oct 2020 07:55:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987tqb0003624 for ; Thu, 8 Oct 2020 03:55:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 427BA5D9D5; Thu, 8 Oct 2020 07:55:52 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B9575D9DD for ; Thu, 8 Oct 2020 07:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143763; 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=Ku6GLWcL4lspj/LeZ5NOvi8/0g9GrH7nBPMDXcGU4ZPLR2Wnjk5zSeR3TgsoYUVv/zkfJP DYOfyPqCG//7B1Q/WaXM+EYod/2eF3gEZLGOPztTQBP6SPTCcxoj1BEceVrjy7mXs3TNvF E2Izc+TtYZ2WhWf+m+Z1CPM5uevJQHU= X-MC-Unique: IgW1IXyaO0KQ_ylDmttfpA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/21] examples: xml: Fix 'pool-netfs.xml' example Date: Thu, 8 Oct 2020 09:55:18 +0200 Message-Id: <548afab0b3bdbb82c30b485ac4cd733b3e5b5193.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" Schema mandates a '' element, not ''. Signed-off-by: Peter Krempa --- 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 Sat May 4 16:33:31 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=1602143770; cv=none; d=zohomail.com; s=zohoarc; b=gJ8I6JkEAVdouLitq3arBX56nqFZ9yPVLXisXU5Lc8kJQBkW7vauIGHZveb0cjmEDIhGYSfqABDuWDTLNW7NuScsHmuD7nxwjffopv6JyFxqdkyIkAYAk4SsOQhgmddijcXdXBJYxYIBCFPuLLNL906+Hgf0PEz4oPHKPJ6Q8dA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143770; 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=gRSpINosQiPLnBZCIcQaNGlNiWbdnzVSk8nUf9Ma84HVrW6hZDGvOgGABctzVMX3oq8x9T607ViCxH7ny99P9X+JYlDNae7N88qrc+VHr/y/zEop5y6B1a6K22YJsHI7ytOFSIzULLhv6tJ3b2WM5PywSbvW1cUFNKrh1e42Qwo= 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 1602143770714150.8327186862192; Thu, 8 Oct 2020 00:56:10 -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-406--ojNeXfXPYq8LkOrDhqM5w-1; Thu, 08 Oct 2020 03:56:07 -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 4F2471084D7A; Thu, 8 Oct 2020 07:56:00 +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 292BB19931; Thu, 8 Oct 2020 07:56:00 +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 E82518C7B8; Thu, 8 Oct 2020 07:55:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987trwt003639 for ; Thu, 8 Oct 2020 03:55:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 516325D9DD; Thu, 8 Oct 2020 07:55:53 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id A99B55D9D5 for ; Thu, 8 Oct 2020 07:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143769; 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=SJk9P032DWUtt81J1OIklWP+8glRhs7UgfnnTzOeq6P8khcRgeyrnelqDS99sQclx6mgCR RaZ9IOt/RUtk4UNI8HuAhQSZAlYbSiqLg3Cc2RX8oWq+SJ2+BxgiLdAkQErwrXGDe60Cbc QGvkHgJQf1tyANVvrMHFRMzZDgUTklU= X-MC-Unique: -ojNeXfXPYq8LkOrDhqM5w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/21] examples: xml: Fix 'vol-raw.xml' and 'vol-sparse.xml' Date: Thu, 8 Oct 2020 09:55:19 +0200 Message-Id: <18de616aaa19cdef9730aaeb70f3d1c31ca54fb4.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 --- 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 Sat May 4 16:33:31 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=1602143773; cv=none; d=zohomail.com; s=zohoarc; b=FFx5TSrmuROrjPawN5mogWlC7AxpfMctcAYYf3IaUe55FQlxsgu26e1NTuziTy2CUSs1WA4+6TvjSpQRNet9kfuiBuFFiJxEcLEqUUe+kpjHg/yWU2eHJu46mRKDXFs4J+1d+USoDcBwb0BVhSptOPrZ/i/5mkoZxT3MFw+/UrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143773; 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=ETPYI+tTeZtZRnQBaDDahdtKVKsMtuH98wi38tUUJ092IOjioGKZ3Hb4eztSrCRPB901yWsSmTLznyKkVOW0LQ+h1aBYsxKGAwNhk8iSc6UOiIiPka3y1pi6FOJ0r6PeEBoybpINME83mngqq4OwPktXMO29grVDBU3JyUd8MyY= 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 1602143773198945.3209012061432; Thu, 8 Oct 2020 00:56: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-417-LevDxyHHP-6ZjtgPatgPHQ-1; Thu, 08 Oct 2020 03:56:08 -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 ABF601084D72; Thu, 8 Oct 2020 07:56:02 +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 8A6976CE50; Thu, 8 Oct 2020 07:56:02 +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 55EC1181A07C; Thu, 8 Oct 2020 07:56:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987txoq003678 for ; Thu, 8 Oct 2020 03:55:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 50C695D9F3; Thu, 8 Oct 2020 07:55:59 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 969ED5D9F1 for ; Thu, 8 Oct 2020 07:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143772; 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=iruT0Vkeqx9C079g8++tqH28Juc4QLi8nBg+OqZfuONVHitVKsuwvFC+Zij2dUVpfy/1Hh a8ARydXzIyPeiqxYLTRPpZVvjE10oVqJ9Ak244Jgfwl7Js6VDIwq3JJNQDiKggkYuvqIsW NoTShS4vxdHZzMmXBivyqq1GU3oeUh4= X-MC-Unique: LevDxyHHP-6ZjtgPatgPHQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/21] virschematest: Add coverage for 'examples/xml/storage' Date: Thu, 8 Oct 2020 09:55:20 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" Match the correct subsets of the files via the 'dirRegex' property. Signed-off-by: Peter Krempa --- 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 Sat May 4 16:33:31 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=1602143775; cv=none; d=zohomail.com; s=zohoarc; b=B78Rn9+3JhLjdNtUYacl92TIscxFKTuODQCusO0irhF6+4N6ByFrnZkMyhKcd0s1L8Atr/jXnJSmpeBmvtO5DNfj2f0CGEPnBU3mj506mmqWaTgiXuaos3ZT3l4hJJfyr779+WBPvLRMpGbKI6VRwQDK4ikwtcyL+zGr59KiBLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143775; 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=Hw5PKi5F2S9tyfb4rma+0cAnHoEwPKqD5Nt8jsuAw/cYI3XYBnnFGyrPEwXRWMuDZuBUqm6p6FiyP1QPpcOlv2Q6UpT/hCfVRDmHXGJfGc4wny7PPpvWVN7wbu5kTHnEanMkEbKW7+A7qVxJ6XFvKQZUdQB+dWdNir2DzOSm1Fk= 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 1602143775723145.32290333659387; Thu, 8 Oct 2020 00:56: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-23-pGZqz0ApOsG_nxFEV7VpUw-1; Thu, 08 Oct 2020 03:56:12 -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 CD3E9879514; Thu, 8 Oct 2020 07:56:05 +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 AB67155799; Thu, 8 Oct 2020 07:56:05 +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 7B00D8C7BB; Thu, 8 Oct 2020 07:56:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987u3aX003699 for ; Thu, 8 Oct 2020 03:56:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id A7C265D9D5; Thu, 8 Oct 2020 07:56:03 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1F425D9F3 for ; Thu, 8 Oct 2020 07:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143774; 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=BOc0tljdvJVv8EMfTAYWXU4cgJr2/xGJy0SIePiRVzoPRWBBik/wPhp8S4UY+U69UgsoS2 z7p+S3OODTKqXGYx48iKfEJD2hmmKvNKBhOTOJdxdDnmwAxkDU1KU57wJ7nO4yrf9LmJ1K ihmogJJVRScyZRv2GptghVrgm1snGG4= X-MC-Unique: pGZqz0ApOsG_nxFEV7VpUw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/21] virschematest: Add coverage for 'examples/xml/test' Date: Thu, 8 Oct 2020 09:55:21 +0200 Message-Id: <10c4122987ebcdddd467ec5c2a4e50a313363397.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- 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 Sat May 4 16:33:31 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=1602143779; cv=none; d=zohomail.com; s=zohoarc; b=WTf67GIC5DifA903T00lJ20zh+iEmiQo31scG77dPJjCUYW4Vma3QRSybKPEsRhODxfVK2dY5Bp04d3mpyy75g1vAr8ICYfDszt0CYF0bffIZQoRtuxNSOLZ8RXHsOYNMqvA8Av+xjXTUpCqOz6gPZLT+IBF54EoVVsqq95R1Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143779; 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=YjjNGYQMX0zKxtqIJCo4RmRsZiHiOnUeNJCdx9FhXTy/cBShrvfKX59Iiw3VpKre5uiOfSjG2466PFtkfHDbYRvvE8jCJ+AD0p5WFwM3fLWYQL+vADrimY5DpKdprnxTo03MDh4fUy4XKZgWM0s2Vp+p044WuGC63NGdk+8qOY8= 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 1602143779047110.37116207250438; Thu, 8 Oct 2020 00:56:19 -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-119-upbLVHsYOpC5xFN4toKzJg-1; Thu, 08 Oct 2020 03:56:15 -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 4A1CD87951C; Thu, 8 Oct 2020 07:56:08 +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 288D255799; Thu, 8 Oct 2020 07:56:08 +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 E30298C7BD; Thu, 8 Oct 2020 07:56:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987u7Gj003715 for ; Thu, 8 Oct 2020 03:56:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 08EF85D9F1; Thu, 8 Oct 2020 07:56:07 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5891E5D9D5 for ; Thu, 8 Oct 2020 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143777; 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=ShpY9zNykkmo+Mw9f0uvxsQsQTCOJsAASphxOPZDwfh7kc7+9w2EDl/1TbLJbgrE7ETreu 8tHWw3h3JGTbPDftbY5T05TcxZIxBLNfTcaPOkomY3jKW7WDMTp/vVV/uCJvqjwELXDhDU uMgzBnAZunM+5puzBylgTjt8MeN7y9Y= X-MC-Unique: upbLVHsYOpC5xFN4toKzJg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/21] virschematest: Fix testing of 'nwfilter' xmls Date: Thu, 8 Oct 2020 09:55:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" The files are under 'src/nwfilter/xml' Signed-off-by: Peter Krempa --- 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 Sat May 4 16:33:31 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=1602143779; cv=none; d=zohomail.com; s=zohoarc; b=NP8bGmy+YzQzO8OrPZNy8SC/LT19N2D4QhTm2FJjSrB4z+z7lI1r3eqRDU3Z8peKHNk8iueD802gqp5Kx5I1aSFYo/uM8rTcTBIOoLUgkzHlGb9dGaEAeXKZ6qRjpDiQSqdwouqiThHLfMd9iLI9w3x5q5vA+1r5ohXMaC7j6Dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143779; 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=cfpIZ+85LGYt7BWyg4RxAUgCUd70s1h1tHA3KABMF5b3ibGiHe2PK03nFxCOTHWkPBOx4wkrR1mI6CQ0OSMvuc92qJ7XmAFHwE/k5T/pQQ6YDGLWqjCMNRuEMQQG5lzrGagFPuxSBuABLUpG9DLgWlDvZ1xgndPqlry6UaWRBuw= 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 1602143779574352.3557341249069; Thu, 8 Oct 2020 00:56:19 -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-514-7oXCvjGgNFSfdezN-U3_fQ-1; Thu, 08 Oct 2020 03:56:16 -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 0F40C18829D4; Thu, 8 Oct 2020 07:56:11 +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 E20065C1BD; Thu, 8 Oct 2020 07:56:10 +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 AFFF3181A07E; Thu, 8 Oct 2020 07:56:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987u8MP003723 for ; Thu, 8 Oct 2020 03:56:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 279755D9F7; Thu, 8 Oct 2020 07:56:08 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66CB25D9D5 for ; Thu, 8 Oct 2020 07:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143778; 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=fM8zHRKZE1Mesu8ZJAUWqNl7dEVYnzvJra7cUJW9H2XZJUuDHt9wobv+AKRKt2YSgqaCib s+IAzFU0RhmJ2Duv0xDA/qtZtkZ4KANUfkIcIvQcNAi0Y839CMM9Khh8k9sUrnL7Mzd8P/ ++3lEIp9D0oNCcgrE1AI+5qd+ziprIE= X-MC-Unique: 7oXCvjGgNFSfdezN-U3_fQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/21] domainconfdata/getfilesystem.xml: Remove element Date: Thu, 8 Oct 2020 09:55:23 +0200 Message-Id: <32b945466cd88213e71743b2bf2286ad796cef6b.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 --- 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 Sat May 4 16:33:31 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=1602143823; cv=none; d=zohomail.com; s=zohoarc; b=l2BVVlD/cCzIShMMlZLejtQX1FZK3gpvs0dHlAsXajLyNH0zResZGMxpWN79fjx0vnsjqWZhu2XbLo/mfPY2DGPo6eAcIPP4BUI0WPgjn3BeMKH9uPeWUm6/2rrcRGBa1MuI/VagiIVAQoOE88NdmdVW+5MTEz6+hk0eGCEKwfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143823; 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=flKunV/0idypPfIRgnJQwVqgc+/KYNbvXuzkNhO7cq0=; b=Trmy+t2aNnwb2aKXEBgh1NA5Mbl+dljDB9E7liKrSfSmRqmkfSCdEl6343W2TTcMD43U0DkOq4goIBhm5fumsERGvfwu5PAqFgIl9t/SmbTQQR9i9+u/z2Q70WVUy8h+7zZzL0GaraKvEkj9/7EsJnSyekjni+/Qb36T61a6UGg= 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 1602143823770229.8243242890817; Thu, 8 Oct 2020 00:57: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-287-s30yLYkKPTicQUqZgt5eBA-1; Thu, 08 Oct 2020 03:56:16 -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 A5F7A1084D6D; Thu, 8 Oct 2020 07:56:10 +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 804F419936; Thu, 8 Oct 2020 07:56:10 +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 429AE8C7C1; Thu, 8 Oct 2020 07:56:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987u9bw003735 for ; Thu, 8 Oct 2020 03:56:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 555AE5D9F1; Thu, 8 Oct 2020 07:56:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96EA35D9D5 for ; Thu, 8 Oct 2020 07:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143822; 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=flKunV/0idypPfIRgnJQwVqgc+/KYNbvXuzkNhO7cq0=; b=iTvB7AYIFAMlZVIBJ0qoolUVhp7NBbcNFIueWJC1YGKTbGuobwVrax0W+O97O0zhOwY4vs TmcQmZtjPOmSSB6FodNKEbu1XhHtntNGb4gzfsdG8FCMHF5/8Oprk4PVuAVDZ5HdaCwRq1 bgLe5nMlV98JfwLa1Z0XHDHhHcMGo0w= X-MC-Unique: s30yLYkKPTicQUqZgt5eBA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/21] bhyveargv2xmldata: Remove XML files for console2/3/4 test case Date: Thu, 8 Oct 2020 09:55:24 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" The test case is invoked using DO_TEST_FAIL so the XML files are actually unexpected, unused and actually don't even conform to the RNG schema for . Signed-off-by: Peter Krempa Reviewed-by: Roman Bogorodskiy --- .../bhyveargv2xml-console2.xml | 15 ----------- .../bhyveargv2xml-console3.xml | 27 ------------------- .../bhyveargv2xml-console4.xml | 15 ----------- 3 files changed, 57 deletions(-) delete mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console2.xml delete mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console3.xml delete mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console4.xml diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-console2.xml b/tests/bhy= veargv2xmldata/bhyveargv2xml-console2.xml deleted file mode 100644 index 12467e968b..0000000000 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-console2.xml +++ /dev/null @@ -1,15 +0,0 @@ - - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - destroy - destroy - destroy - - - diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-console3.xml b/tests/bhy= veargv2xmldata/bhyveargv2xml-console3.xml deleted file mode 100644 index 2aea6c46d0..0000000000 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-console3.xml +++ /dev/null @@ -1,27 +0,0 @@ - - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - destroy - destroy - destroy - - - - - - - - - - - - - - - diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-console4.xml b/tests/bhy= veargv2xmldata/bhyveargv2xml-console4.xml deleted file mode 100644 index 12467e968b..0000000000 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-console4.xml +++ /dev/null @@ -1,15 +0,0 @@ - - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - destroy - destroy - destroy - - - --=20 2.26.2 From nobody Sat May 4 16:33:31 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=1602143830; cv=none; d=zohomail.com; s=zohoarc; b=jHL6rdisE94E51t8zlJIgAofclC7b8sK/SAFvWcoutU7KNajzcBRsNyG9v+YSjIH9/pQrm3HI8jzwfKyHGcdKt6+chwVMCi0rlHSSZX9uV9z/gqIRz/Iv8l4yg6PEsPUk6QEqkHbIOnEgY2rUPAYR6tyMmEw/PA9v9Qq4YFaiKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143830; 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=gCYbmZIOoX3G+xZBKq2UxWAw7zivlobbYeXUsAzcODY=; b=ITgsgd0PQRZ/28N3ZhQuIN5vRNbcFU+UF1lQJ8XDWntLkXzTvYrWvsvy8UC9VMOpyj6uqTTHVqL5JKFNGvv/4Ldm843pgUim9LmL9+HZT81GIyfGBXexFkR+CGWUsRivcFSiGlu1Ng/B46j7Fshu7fkXlYvv7qwQy+B9x7PNVH4= 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 1602143830284888.3243432651924; Thu, 8 Oct 2020 00:57:10 -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-548-6lJp5u3kNEekRFMj_yOXaQ-1; Thu, 08 Oct 2020 03:56:18 -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 F40C61084D70; Thu, 8 Oct 2020 07:56:12 +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 CDFF95D9D5; Thu, 8 Oct 2020 07:56:12 +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 98C1B181A271; Thu, 8 Oct 2020 07:56:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uA1Z003754 for ; Thu, 8 Oct 2020 03:56:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8CFF65D9F7; Thu, 8 Oct 2020 07:56:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C03F95D9D5 for ; Thu, 8 Oct 2020 07:56:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143829; 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=gCYbmZIOoX3G+xZBKq2UxWAw7zivlobbYeXUsAzcODY=; b=KLG59CcpKv0LKDaOvvep8cS3J5G5AzWikx0waZONZOp/aqA6HjctNcikgMlqAWqvW1CuFp TGWzA6V4qZjy4TEykpCQ4ZgD3wo61KT9H9zyU6KsfHUL91xdjXolUHCWzFlUutHjoiZbvT CmYn9ck/e0iMrHjE5/y3AQX+CBB/Oa0= X-MC-Unique: 6lJp5u3kNEekRFMj_yOXaQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/21] bhyve: parse: Set video device model when parsing bhyve commandline Date: Thu, 8 Oct 2020 09:55:25 +0200 Message-Id: <4f3d67b59a59c839c7004f86463bcef839e02c49.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" Add the proper video device type when parsing bhyve's commandline into a XML. Signed-off-by: Peter Krempa Reviewed-by: Roman Bogorodskiy --- src/bhyve/bhyve_parse_command.c | 2 ++ tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml | 2 +- tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 969e782b27..4f1d384da1 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -573,6 +573,8 @@ bhyveParsePCIFbuf(virDomainDefPtr def, if (!(video =3D virDomainVideoDefNew(xmlopt))) goto cleanup; + video->type =3D VIR_DOMAIN_VIDEO_TYPE_GOP; + if (!(graphics =3D virDomainGraphicsDefNew(xmlopt))) goto cleanup; diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml b/tests/b= hyveargv2xmldata/bhyveargv2xml-vnc-listen.xml index 4ab17aef81..616f8e180e 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml @@ -16,7 +16,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml b/tests= /bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml index 456a1ee9e3..be15a20d91 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml @@ -16,7 +16,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml b/tes= ts/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml index f8fa0ed1ce..662961ba0d 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml @@ -16,7 +16,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml b/tests/b= hyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml index 1e2f3d6938..4ead57217a 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml @@ -16,7 +16,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml b/tests/= bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml index 3c9c76e5aa..0623938b65 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml @@ -17,7 +17,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml b/tests/b= hyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml index b83772c47a..01aa559cb4 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml @@ -17,7 +17,7 @@ diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml b/tests/bhyvearg= v2xmldata/bhyveargv2xml-vnc.xml index 1e2f3d6938..4ead57217a 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml @@ -16,7 +16,7 @@ --=20 2.26.2 From nobody Sat May 4 16:33:31 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=1602143833; cv=none; d=zohomail.com; s=zohoarc; b=XCAP6a/FOEeScw/Eixx24mJSIISyIC5jw6BhK3psy+WzTeT504uQY8xBhqXYQQMooq0hx5z0C3i5xRCtjzJSJ/LEChS3J5Y0dn1lLku3/bulF5wC5Y8V+d3eLkODS33UTRVHoSLq0zwzvWkDFOQ1ag8Km/eURXo4zQbMwVmazRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143833; 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=CO/vhYmCfV0lku8sw1Zey8+uEsiS11zSuizddBHVV9OE84F2KcFZ1iVn3otURXd1AVveZgXSkHQVbDXTZ9+h7QYpYz9DQvvyUxAnZPyX3/aNndixufLVs0ik4FqzYzYBusgSt8pNhurou/wjQR8ezIcez7RXM/7HKvNVUvvVBnA= 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 1602143833658888.4025447466005; Thu, 8 Oct 2020 00:57: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-595-0hxr3aSAMP6UVAXuch0g1A-1; Thu, 08 Oct 2020 03:56:19 -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 9D565425DC; Thu, 8 Oct 2020 07:56:13 +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 7B48719930; Thu, 8 Oct 2020 07:56:13 +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 46094181A3EC; Thu, 8 Oct 2020 07:56:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uBjA003779 for ; Thu, 8 Oct 2020 03:56:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id B79D75D9F1; Thu, 8 Oct 2020 07:56:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 099035D9D5 for ; Thu, 8 Oct 2020 07:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143832; 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=I2r4k/2H3bCpSlIkyDoZZc5tOdPB0Ny8rlJVxSF6+LRIoyjJCJFsEbzSi6270/mIGfB4Ny hokT9wXSfdw/aeJkAgwY3Wbf7vhtoTR5FSTrY4f4EjzUMLdP1Z9YHA93l2ZrDxRVXwFMMb VhTUsNIR9sq1Qck4iP23fhbqkIm8Vlg= X-MC-Unique: 0hxr3aSAMP6UVAXuch0g1A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/21] schema: nwfilter: Allow all accepted values for 'ipsetflags' Date: Thu, 8 Oct 2020 09:55:26 +0200 Message-Id: <262e62a8030d3990e25ead811809b7145fac5b8c.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- 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 Sat May 4 16:33:31 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=1602143788; cv=none; d=zohomail.com; s=zohoarc; b=Sij5cTKbJD2cSXejstvo41Sh4f25DgJh7hgBWvabhCxQaWCnPCvdQgmDJ3o2ZfSnDwK110u8FUyJglO8EtVavTNap0AJwHf8fZWlXc/7GDiivTDsZ7dC3x7Omgs8g5kUc5SUwaAsKFaKinOqhtQJJa8dIL/rUyl/1pEpUXOYzlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143788; 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=dHno0nsZGqapGblokABvE7O80BxscQrNjoO8CSnJ9vAk30K8pKeYki+zddchQvz5g0JCoUutRRV+Wvmmuo102+vFHId1/jPOGeYCe1zeakue9H66U+7GNPa6/OkP43zxx5wKrUB9qfyBtZwsjzB3y1pYcU6eq/IyIGRaYyijxnk= 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 1602143788316968.9583575621257; Thu, 8 Oct 2020 00:56:28 -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-135-h4Qr56UQM5KLc-6-6P_Jdg-1; Thu, 08 Oct 2020 03:56:23 -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 5C2EA425EB; Thu, 8 Oct 2020 07:56:17 +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 39C9A68432; Thu, 8 Oct 2020 07:56:17 +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 067478C7B6; Thu, 8 Oct 2020 07:56:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uCiU003788 for ; Thu, 8 Oct 2020 03:56:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1D4C5D9FC; Thu, 8 Oct 2020 07:56:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 297965D9D5 for ; Thu, 8 Oct 2020 07:56:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143786; 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=UUA0u542JPLpPLvFXydEMyffOq6S9LJnhH7TmL9fAPgo4d38DyyMNyPRq6xUkvUiTcBhYe YULgoMyFUnihoHqVA1JBbneUG4Acivgx3kuuqxbpCtTnuTpQ7O8KGC/qFtRuVW7q4gmm53 1CwbdzFNEXm+s3b05J0g9j2StzrjZyc= X-MC-Unique: h4Qr56UQM5KLc-6-6P_Jdg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/21] schema: nwfiter: Allow leading/trailing whitespace in 'variable-name-type' Date: Thu, 8 Oct 2020 09:55:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 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 --- 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 Sat May 4 16:33:31 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=1602143785; cv=none; d=zohomail.com; s=zohoarc; b=Fu3PrKCVVXI2fiETFxpE1F0BYJvSsAvBmRf+z1USOS08pety44jIiz2IU2d8RMj3PyvRTstF4QoTTZhyBKqueSBVt1uOtAniZ6H8ArhA8iA4vUQT03G7jOF54thvwwxOSGWwPYXkYh/gO9E0VWlGfv/md2oO7e1nTxpPpEfjDzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143785; 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=AtXCDnbqM3e7tRxRMuhvQpYctpPObivMq7PFZEQw+Uq87noaHeav2zAcBSHG9J6zGNikPaPjXbMZVin0Yt/sz53zqI71YWCZ4kpb2Srcyl8o/OVh9iJ9x5CONrBKV1Sm4mdlx3SaVi2+Y1ZrCVANl8Nt1TrvZKwATHVQ8+yRI/Q= 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 1602143785837500.36307538187725; Thu, 8 Oct 2020 00:56:25 -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-576-qTfWYMVUMNq7e-tndsL7yg-1; Thu, 08 Oct 2020 03:56:21 -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 5EC678030C6; Thu, 8 Oct 2020 07:56:16 +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 113535D9F7; Thu, 8 Oct 2020 07:56:16 +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 C7814181A71F; Thu, 8 Oct 2020 07:56:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uDU6003817 for ; Thu, 8 Oct 2020 03:56:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id E31925D9F1; Thu, 8 Oct 2020 07:56:13 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33B705D9F3 for ; Thu, 8 Oct 2020 07:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143784; 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=cRo5N9QC3sr9if0YFg+nMIDdGYGooMQAHvHJntMz/NtYdX/1VIYPeSRoCXjqm2TZ9mj30v wiOpk7jQwqUkdkM2FBAtIYvwttNM2EPxSCmkZMV4O5JyGUl9yT5fvoMDamubtYuquwIONw /GS7Q+7Jt9L50zg6YfosFIx+zjStk/E= X-MC-Unique: qTfWYMVUMNq7e-tndsL7yg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/21] nwfilterxml2firewall: Fix schema compilance of 'tcp' test case Date: Thu, 8 Oct 2020 09:55:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 --- 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 Sat May 4 16:33:31 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=1602144014; cv=none; d=zohomail.com; s=zohoarc; b=ftDEyR3YA+Wj1WCZEI8g9mlaqPwxbHiImdZGCrSxYZdEAs7MDcKVcAZtu7ABHEkmYMSSacTa6UdcOjyfHQ6Dq7etamZW4btS4yQi3XBs16PS3Ja2khk+N4CDPJ4J8fy4Eue3GczfkCqeb3LBmB2RFcwPAGmZBwc4L/sQHOfw2mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602144014; 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=UXyZ8AR7R9cCjeZq5KzaPf54db1GLVgRKESB22C564qGo6nIpUKWVkVlP9uTOwx91XUaRTZgf7QYFK1UuyPmsUhVvxX8zMbit2GIDfINGgcPDPmdtNSxTB3MXU+camV90QkL1mMYiyaB3chdodO3mGEG0kovFNAddFV0uEoxX3A= 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 160214401433425.001817557443587; Thu, 8 Oct 2020 01:00:14 -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-196-z42EcregMsOcWOD6NLuVwA-1; Thu, 08 Oct 2020 03:56:25 -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 116978030A3; Thu, 8 Oct 2020 07:56:20 +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 DF84B5C1BD; Thu, 8 Oct 2020 07:56:19 +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 AB335181A869; Thu, 8 Oct 2020 07:56:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uIgn003856 for ; Thu, 8 Oct 2020 03:56:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A80F5D9F3; Thu, 8 Oct 2020 07:56:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D9985D9F1 for ; Thu, 8 Oct 2020 07:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602144012; 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=VVocliwcnDFKnZFq+krS6CIw4rcRVw9pKXnFKQE9vDXeLw7kOx2LrPj8kdEH3F55SVYsS1 om6RBpy1KtkjlxP/qfbTlG5i9GRWgK85oUD83Y9s8ExHx/Lr4nynQlu6XvGgOMy984YvAX wdaa/pZ0xaEl/HHqqaoF92/bUHO7ZKY= X-MC-Unique: z42EcregMsOcWOD6NLuVwA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/21] nwfilterxml2xmltest: Rename cases with XMLs not conforming to schema Date: Thu, 8 Oct 2020 09:55:29 +0200 Message-Id: <0052da8a11b2b95efa0c295a172398c65bc102a9.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- ...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 Sat May 4 16:33:31 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=1602143793; cv=none; d=zohomail.com; s=zohoarc; b=LqxxFFDqBKWlvHZYrSrnhM/sDbHjhoIGyXCZWAtDV13E/1i0/4kOz/gC5eikS0D37BVRhwHla94UPb5/E3obZxNZNidB+BEMFcrC/mrHt0J33j4bgX2/NRu822Te3qJEmX5YoCONicY6/jFOleznbymTAnLx2kO/W/CvH/nNwDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143793; 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=XTdUNofULkP8BtmZu+8lBcU1OO45ihZzhQE6dfYik5s=; b=YiZv7SGSO8kyTs6ll0xjsj50jj6iE4WvnjEDjQlbslvwBPQbqhQIBywNBydvxoldljRt+YwDB/9BLLm5MvatEMgvkINMhn1fFfdP1cvBwi24cqNOOEMlusT051Ctj+qAplygnkUfenvmynEzmkWSrTV2YGIHbsuX1i3YxpnsNQw= 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 1602143792569392.445897503762; Thu, 8 Oct 2020 00:56: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-198-mAOadtyKMACpfMGLfUsCMQ-1; Thu, 08 Oct 2020 03:56:28 -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 326E81018F83; Thu, 8 Oct 2020 07:56:23 +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 0DAD15C1BD; Thu, 8 Oct 2020 07:56: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 CB0148C7C8; Thu, 8 Oct 2020 07:56:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uJDF003864 for ; Thu, 8 Oct 2020 03:56:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5C6B05D9F3; Thu, 8 Oct 2020 07:56:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id A85255D9F1 for ; Thu, 8 Oct 2020 07:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143790; 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=XTdUNofULkP8BtmZu+8lBcU1OO45ihZzhQE6dfYik5s=; b=RkBoIx6w3fIYNPqgNuLi9joy6txNg+VzaBArsBaJ32zFWT97sYPVOJsYssj/pPOztLIwa7 dqQ2crhG8qdkM4uXWTUdxkF/BzPuemL4FyzPSOQb4arw6mtoxij8UQEZSPO8bu5qEEG18N s1T+Ghp8k2Xn88pP+RZ3uS7mbCNxFiM= X-MC-Unique: mAOadtyKMACpfMGLfUsCMQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/21] schema: domain: Add definition for the 'vmware' private namespace Date: Thu, 8 Oct 2020 09:55:30 +0200 Message-Id: <7f9b0e71cf8ecc4e10cf11c670481091452c9a87.1602143655.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 'vmware' private namespace wasn't present in our schema definition making all XMLs having the element invalid. Signed-off-by: Peter Krempa --- docs/schemas/domaincommon.rng | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7d4b105981..3ebffd9db3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -90,6 +90,9 @@ + + + @@ -6823,6 +6826,16 @@ + + + + + + + --=20 2.26.2 From nobody Sat May 4 16:33:31 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=1602143952; cv=none; d=zohomail.com; s=zohoarc; b=b6deVuCmkzz9DOsqDTff7zmN1TsA8hhc4LZ6LRLckEtL4uoPtNVT3k6ifgfayBQFEF4akomCUafzL+YTpMC/oRK86j5pFZxYDcUHFYzOvKOgn8oX0o3ZKH3IEuqfF+YYmXE1gFeqzmgjqhpMQJsC1dtOgTuAgwZd4olX7Ny3Pz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143952; 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=qhpurQ700qEiiDokG7NwP5xMpIkCwGsY+7B8kbe3JTQ=; b=Rs9jt8bNIrlc+RjyB1oNIzKe8gRzb7Uv3Ka+sm2SGCATqAPnaenOvIUE3jPKfcjOrXSZffRqQujmiN5ONeOSpvnl0WdTynE7Q5CN2CiyntVWARdsM63twyH98EZvt1qDNOR6zVthB8Ib76TOCG7e/E/EaE/bMhoB1uZb7wxZFXI= 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 1602143952372948.6894937507674; Thu, 8 Oct 2020 00:59:12 -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-531-5TTeFJ0qNb-_F2DdBAgThA-1; Thu, 08 Oct 2020 03:56:29 -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 3F00D1018F89; Thu, 8 Oct 2020 07:56:23 +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 21CFD68430; Thu, 8 Oct 2020 07:56: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 E083D8C7C7; Thu, 8 Oct 2020 07:56:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uKoF003882 for ; Thu, 8 Oct 2020 03:56:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id E964E5D9F1; Thu, 8 Oct 2020 07:56:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEB0B5D9F3 for ; Thu, 8 Oct 2020 07:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143951; 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=qhpurQ700qEiiDokG7NwP5xMpIkCwGsY+7B8kbe3JTQ=; b=KiChpMdMCtUD+SBiQXD6sKaN57ts9neoVFanl/2y6Ctk6k/s+6N9i2X0Ef9rPgSESe8GZh PZ9tYMsU51jiwqUXhwhNcrlJZT45qnb3wA+gy42Vj/e6BHyy18yz0kZWVkBXSJsIGtgMAq 8FQh5KbgF0jIDvRJ3OLXDr68rwKfkxY= X-MC-Unique: 5TTeFJ0qNb-_F2DdBAgThA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/21] schema: domain: Allow space in XML schema for bridge source Date: Thu, 8 Oct 2020 09:55:31 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 --- 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 3ebffd9db3..41c256b653 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2879,7 +2879,9 @@ - + + [a-zA-Z0-9_\.\-\\:/ ]* + --=20 2.26.2 From nobody Sat May 4 16:33:31 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=1602143795; cv=none; d=zohomail.com; s=zohoarc; b=JsWypisB9JNZCPaqdVX9kciV1NUvcx/Ia+NBupEbNMuYnoIx5daGk5ev5eelny+7K7PJ8MOy7UvxIxFoMuvNTMqY4R566hPS0jH/HaW7gtXBxIXl9HP+MhNPy5EWTXF4EgH04NEZJLPJlDNpS1Ta2jBzfUHeypg2cV07KkKVxYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602143795; 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=PBaHYuuHR6SvvxpC1/zBp71C+GiFty3170RI/9roBK8=; b=aI9IFmTm1rsZ+5lSDK5f6yVvPWEp8fgB8jH9nM63HdOOfzmhq4m9svp3/bfii2XK/cP2ET/5KzGGZPp1KYKmkG3+WsUDXPTWwsDpXMvCQSTfYJDtGTXdIwy+0Ri05jWX96XOGXcxzDXC+7K51PZAX4Xx22wYavJufVsHrzcWBuM= 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 1602143795628265.57590064686804; Thu, 8 Oct 2020 00:56:35 -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-571-jtCWb9OmO1e6MxqrMW9rxg-1; Thu, 08 Oct 2020 03:56:31 -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 AD612425DB; Thu, 8 Oct 2020 07:56:25 +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 8958E10013C1; Thu, 8 Oct 2020 07:56:25 +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 54272181A88C; Thu, 8 Oct 2020 07:56:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0987uM1K003891 for ; Thu, 8 Oct 2020 03:56:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5CDA75D9FC; Thu, 8 Oct 2020 07:56:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A8735D9F1 for ; Thu, 8 Oct 2020 07:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602143794; 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=PBaHYuuHR6SvvxpC1/zBp71C+GiFty3170RI/9roBK8=; b=BJ+hnzMqoHPyrv9xl072O39RtIjgTqob2h8B2gC3Nb7zcaURa2ktZr4nqH8GnjVDSVinUT FVwmmUdHWiVB7bRamI5n3gMoh1KUQbQgP7L5bcdpGSkiSMimUJqPZ/gygws529bP9uQZXS ujNaXay2Crx8WghUdGJ431YeUncTLYU= X-MC-Unique: jtCWb9OmO1e6MxqrMW9rxg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/21] tests: vmx: Make paths in test files conform with the XML schema Date: Thu, 8 Oct 2020 09:55:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" The vmx tests use fake paths for files which in some cases didn't start with a /. Since libvirt's schema mandates full paths and the representation used in the tests is only internal to the tests we'll add a leading / to the paths to conform to the schema. Signed-off-by: Peter Krempa --- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 6 +++--- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 6 +++--- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 8 ++++---- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 4 ++-- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 6 +++--- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml | 2 +- tests/vmx2xmldata/vmx2xml-floppy-file.xml | 4 ++-- tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 2 +- tests/vmx2xmldata/vmx2xml-parallel-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 8 ++++---- tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-file.xml | 4 ++-- tests/vmx2xmltest.c | 4 ++-- tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml | 6 +++--- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml | 6 +++--- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml | 8 ++++---- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml | 4 ++-- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.xml | 2 +- tests/xml2vmxdata/xml2vmx-floppy-file.xml | 4 ++-- tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml | 2 +- tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-parallel-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-scsi-driver.xml | 8 ++++---- tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml | 2 +- tests/xml2vmxdata/xml2vmx-serial-file.xml | 2 +- tests/xml2vmxtest.c | 4 ++-- 50 files changed, 79 insertions(+), 79 deletions(-) diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2x= mldata/vmx2xml-case-insensitive-1.xml index 7cb6413941..97fa300c18 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -16,7 +16,7 @@ destroy - +
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2x= mldata/vmx2xml-case-insensitive-2.xml index 188c3f3cd5..499eb1ec38 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -16,7 +16,7 @@ destroy - +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmlda= ta/vmx2xml-cdrom-ide-file.xml index 7ca8ff729a..a85cb42dce 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -12,7 +12,7 @@ destroy - +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmld= ata/vmx2xml-cdrom-scsi-file.xml index 5765232bc1..29111fb7b6 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -12,7 +12,7 @@ destroy - +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-1.xml index c15275ccb9..9970cb6e8a 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -16,7 +16,7 @@ destroy - +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-2.xml index b079808363..0422c401f8 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -14,12 +14,12 @@ - +
- +
@@ -34,7 +34,7 @@
- +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-3.xml index d05318c7d8..881d0c2970 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -13,17 +13,17 @@ destroy - +
- +
- +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-4.xml index a8a2ac6f97..0a67ba9ed1 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -16,7 +16,7 @@ destroy - +
@@ -30,15 +30,15 @@ - + - + - +