[libvirt] [PATCH 02/18] tests: Add test for new Secret vTPM usage type

Stefan Berger posted 18 patches 6 years, 7 months ago
There is a newer version of this series
[libvirt] [PATCH 02/18] tests: Add test for new Secret vTPM usage type
Posted by Stefan Berger 6 years, 7 months ago
Extend the schema for the Secret to support the vTPM usage type
and add a test case for parsing the Secret with usage type vTPM.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 docs/schemas/secret.rng              | 10 ++++++++++
 tests/secretxml2xmlin/usage-vtpm.xml |  7 +++++++
 tests/secretxml2xmltest.c            |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml

diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
index 1e94d66e48..e0add8a5e9 100644
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -37,6 +37,7 @@
               <ref name='usageceph'/>
               <ref name='usageiscsi'/>
               <ref name='usagetls'/>
+              <ref name='usagevtpm'/>
               <!-- More choices later -->
             </choice>
           </element>
@@ -81,4 +82,13 @@
     </element>
   </define>
 
+  <define name='usagevtpm'>
+    <attribute name='type'>
+      <value>vtpm</value>
+    </attribute>
+    <element name='name'>
+      <ref name='genericName'/>
+    </element>
+  </define>
+
 </grammar>
diff --git a/tests/secretxml2xmlin/usage-vtpm.xml b/tests/secretxml2xmlin/usage-vtpm.xml
new file mode 100644
index 0000000000..5baff3034d
--- /dev/null
+++ b/tests/secretxml2xmlin/usage-vtpm.xml
@@ -0,0 +1,7 @@
+<secret ephemeral='no' private='yes'>
+  <uuid>aa6c7af2-45a7-477c-85a2-fe86d9f2514e</uuid>
+  <description>vTPM secret</description>
+  <usage type='vtpm'>
+    <name>vTPMvTPMvTPM</name>
+  </usage>
+</secret>
diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
index fd93703424..595583346a 100644
--- a/tests/secretxml2xmltest.c
+++ b/tests/secretxml2xmltest.c
@@ -80,6 +80,7 @@ mymain(void)
     DO_TEST("usage-ceph");
     DO_TEST("usage-iscsi");
     DO_TEST("usage-tls");
+    DO_TEST("usage-vtpm");
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 02/18] tests: Add test for new Secret vTPM usage type
Posted by Marc-André Lureau 6 years, 7 months ago
On Tue, Jul 9, 2019 at 9:24 PM Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
>
> Extend the schema for the Secret to support the vTPM usage type
> and add a test case for parsing the Secret with usage type vTPM.
>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
>  docs/schemas/secret.rng              | 10 ++++++++++
>  tests/secretxml2xmlin/usage-vtpm.xml |  7 +++++++
>  tests/secretxml2xmltest.c            |  1 +
>  3 files changed, 18 insertions(+)
>  create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml
>
> diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
> index 1e94d66e48..e0add8a5e9 100644
> --- a/docs/schemas/secret.rng
> +++ b/docs/schemas/secret.rng
> @@ -37,6 +37,7 @@
>                <ref name='usageceph'/>
>                <ref name='usageiscsi'/>
>                <ref name='usagetls'/>
> +              <ref name='usagevtpm'/>
>                <!-- More choices later -->
>              </choice>
>            </element>
> @@ -81,4 +82,13 @@
>      </element>
>    </define>
>
> +  <define name='usagevtpm'>
> +    <attribute name='type'>
> +      <value>vtpm</value>
> +    </attribute>
> +    <element name='name'>
> +      <ref name='genericName'/>
> +    </element>
> +  </define>
> +
>  </grammar>

should be in previous patch

> diff --git a/tests/secretxml2xmlin/usage-vtpm.xml b/tests/secretxml2xmlin/usage-vtpm.xml
> new file mode 100644
> index 0000000000..5baff3034d
> --- /dev/null
> +++ b/tests/secretxml2xmlin/usage-vtpm.xml
> @@ -0,0 +1,7 @@
> +<secret ephemeral='no' private='yes'>
> +  <uuid>aa6c7af2-45a7-477c-85a2-fe86d9f2514e</uuid>
> +  <description>vTPM secret</description>
> +  <usage type='vtpm'>
> +    <name>vTPMvTPMvTPM</name>
> +  </usage>
> +</secret>
> diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
> index fd93703424..595583346a 100644
> --- a/tests/secretxml2xmltest.c
> +++ b/tests/secretxml2xmltest.c
> @@ -80,6 +80,7 @@ mymain(void)
>      DO_TEST("usage-ceph");
>      DO_TEST("usage-iscsi");
>      DO_TEST("usage-tls");
> +    DO_TEST("usage-vtpm");
>
>      return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
>  }
> --
> 2.20.1
>

other than that,
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list