1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH v2 0/2] Removing backend support when net interface is user/direct/hostdev.
  4. View patch

[libvirt] [PATCH v2 1/2] tests: changing network interface types when backend tag is defined.

Julio Faracco posted 2 patches 7 years, 5 months ago
[libvirt] [PATCH v2 1/2] tests: changing network interface types when backend tag is defined.
Posted by Julio Faracco 7 years, 5 months ago 
Some test cases have the backend tag inside wrong interfaces. The backend xml
tag does not support <interface type='user|direct|hostdev'>. So this commit
changes some network types inside the interfaces that have backend defined.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
---
 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml     | 6 ++++--
 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml               | 3 ++-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 6 ++++--
 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml           | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
index a1532cb..4e1d67e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
@@ -22,14 +22,16 @@
     </controller>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
+      <source network='default'/>
       <model type='e1000'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
     </interface>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
+      <source network='default'/>
       <model type='virtio'/>
       <driver name='vhost' queues='1'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
index c2303b7..6d7ffb0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
@@ -35,8 +35,9 @@
     </controller>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
+      <source network='default'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
index 3a95b60..a6be754 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
@@ -26,14 +26,16 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
+      <source network='default'/>
       <model type='e1000'/>
       <backend tap='/dev/null'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
+      <source network='default'/>
       <model type='virtio'/>
       <driver name='vhost'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
index 759b844..7787bef 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
@@ -39,8 +39,9 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
+    <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
+      <source network='default'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] tests: changing network interface types when backend tag is defined.
Posted by Ján Tomko 7 years, 5 months ago 
On Fri, Nov 17, 2017 at 07:27:40PM -0200, Julio Faracco wrote:
>Some test cases have the backend tag inside wrong interfaces. The backend xml
>tag does not support <interface type='user|direct|hostdev'>. So this commit
>changes some network types inside the interfaces that have backend defined.
>
>Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
>---
> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml     | 6 ++++--
> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml               | 3 ++-
> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 6 ++++--
> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml           | 3 ++-
> 4 files changed, 12 insertions(+), 6 deletions(-)
>

ACK and pushed.

Jan
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] tests: changing network interface types when backend tag is defined.
Posted by Julio Faracco 7 years, 5 months ago 
Hi Jan and guys,

I was facing a weird issue when I was rewriting this.
If I start with the <source/> tag, the test fails.
I need to start with <mac address/> tag to work properly.

Test fails:
...
    <interface type='network'>
      <source network='default'/>
      <mac address='52:54:00:e5:48:58'/>
...

Test returns ok:
...
    <interface type='network'>
      <mac address='52:54:00:e5:48:58'/>
      <source network='default'/>
...

In my point of view, both structure means the same thing.
It is happening because virDomainNetDefFormat() generates <mac address/>
right
after <interface/> tag.

Em 23 de nov de 2017 2:48 PM, "Ján Tomko" <jtomko@redhat.com> escreveu:

> On Fri, Nov 17, 2017 at 07:27:40PM -0200, Julio Faracco wrote:
>
>> Some test cases have the backend tag inside wrong interfaces. The backend
>> xml
>> tag does not support <interface type='user|direct|hostdev'>. So this
>> commit
>> changes some network types inside the interfaces that have backend
>> defined.
>>
>> Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
>> ---
>> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml     | 6
>> ++++--
>> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml               | 3 ++-
>> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 6
>> ++++--
>> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml           | 3 ++-
>> 4 files changed, 12 insertions(+), 6 deletions(-)
>>
>>
> ACK and pushed.
>
> Jan
>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-8c64711

© 2016 - 2025 Red Hat, Inc.