tests: Fix vmx/xml filenames

Commit 70768cda9740 added a functionality that was previously (in an unsubmitted
version of the commit) represented differently in the XML, but the filenames
kept the old name.  Fix the name so they are not misleading.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/vmx2xmldata/ethernet-dummy.vmx b/tests/vmx2xmldata/ethernet-dummy.vmx
new file mode 100644 (file)
index 0000000..6e08536
--- /dev/null
+++ b/tests/vmx2xmldata/ethernet-dummy.vmx
@@ -0,0 +1,7 @@
+config.version = "8"
+virtualHW.version = "4"
+ethernet0.present = "true"
+ethernet0.virtualDev = "e1000e"
+ethernet0.addressType = "vpx"
+ethernet0.generatedAddress = "00:50:56:87:65:43"
+displayName = "test"

diff --git a/tests/vmx2xmldata/ethernet-dummy.xml b/tests/vmx2xmldata/ethernet-dummy.xml
new file mode 100644 (file)
index 0000000..a312430
--- /dev/null
+++ b/tests/vmx2xmldata/ethernet-dummy.xml
@@ -0,0 +1,23 @@
+<domain type='vmware'>
+  <name>test</name>
+  <uuid>00000000-0000-0000-0000-000000000000</uuid>
+  <memory unit='KiB'>32768</memory>
+  <currentMemory unit='KiB'>32768</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686'>hvm</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <interface type='dummy'>
+      <mac address='00:50:56:87:65:43' type='generated'/>
+      <model type='e1000e'/>
+    </interface>
+    <video>
+      <model type='vmvga' vram='4096' primary='yes'/>
+    </video>
+  </devices>
+</domain>

diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx b/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx
deleted file mode 100644 (file)
index 6e08536..0000000
--- a/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx
+++ /dev/null
@@ -1,7 +0,0 @@
-config.version = "8"
-virtualHW.version = "4"
-ethernet0.present = "true"
-ethernet0.virtualDev = "e1000e"
-ethernet0.addressType = "vpx"
-ethernet0.generatedAddress = "00:50:56:87:65:43"
-displayName = "test"

diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml b/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml
deleted file mode 100644 (file)
index a312430..0000000
--- a/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='vmware'>
-  <name>test</name>
-  <uuid>00000000-0000-0000-0000-000000000000</uuid>
-  <memory unit='KiB'>32768</memory>
-  <currentMemory unit='KiB'>32768</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='i686'>hvm</type>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <interface type='dummy'>
-      <mac address='00:50:56:87:65:43' type='generated'/>
-      <model type='e1000e'/>
-    </interface>
-    <video>
-      <model type='vmvga' vram='4096' primary='yes'/>
-    </video>
-  </devices>
-</domain>

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index e08079512b531c7aeb36062a1f13deba5ff7da6f..3ab39148e0a40fc7e2138a48258a343fd957ec30 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -236,7 +236,7 @@ mymain(void)
     DO_TEST("ethernet-static");
     DO_TEST("ethernet-vpx");
     DO_TEST("ethernet-other");
-    DO_TEST("ethernet-unmanaged-nodev");
+    DO_TEST("ethernet-dummy");
 
     DO_TEST("serial-file");
     DO_TEST("serial-device");

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx
new file mode 100644 (file)
index 0000000..41ba296
--- /dev/null
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx
@@ -0,0 +1,13 @@
+.encoding = "UTF-8"
+config.version = "8"
+virtualHW.version = "4"
+guestOS = "other"
+uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
+displayName = "ethernet-vpx"
+memsize = "4"
+numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
+ethernet0.present = "true"
+ethernet0.addressType = "vpx"
+ethernet0.generatedAddress = "00:50:56:87:65:43"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml b/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml
new file mode 100644 (file)
index 0000000..a071b2f
--- /dev/null
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml
@@ -0,0 +1,13 @@
+<domain type='vmware'>
+  <name>ethernet-vpx</name>
+  <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
+  <memory unit='KiB'>4096</memory>
+  <os>
+    <type>hvm</type>
+  </os>
+  <devices>
+    <interface type='dummy'>
+      <mac address='00:50:56:87:65:43'/>
+    </interface>
+  </devices>
+</domain>

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx
deleted file mode 100644 (file)
index 41ba296..0000000
--- a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx
+++ /dev/null
@@ -1,13 +0,0 @@
-.encoding = "UTF-8"
-config.version = "8"
-virtualHW.version = "4"
-guestOS = "other"
-uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
-displayName = "ethernet-vpx"
-memsize = "4"
-numvcpus = "1"
-floppy0.present = "false"
-floppy1.present = "false"
-ethernet0.present = "true"
-ethernet0.addressType = "vpx"
-ethernet0.generatedAddress = "00:50:56:87:65:43"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml b/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml
deleted file mode 100644 (file)
index a071b2f..0000000
--- a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<domain type='vmware'>
-  <name>ethernet-vpx</name>
-  <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
-  <memory unit='KiB'>4096</memory>
-  <os>
-    <type>hvm</type>
-  </os>
-  <devices>
-    <interface type='dummy'>
-      <mac address='00:50:56:87:65:43'/>
-    </interface>
-  </devices>
-</domain>

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 0ea213d5d5cd80073e6b95ddaaf83edd8f30795d..7723c1efabdd525400cea295824f4e9516e32358 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -225,7 +225,7 @@ mymain(void)
     DO_TEST("ethernet-other", "ethernet-other", 4);
     DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4);
 
-    DO_TEST("ethernet-unmanaged-nodev", "ethernet-unmanaged-nodev", 4);
+    DO_TEST("ethernet-dummy", "ethernet-dummy", 4);
 
     DO_TEST("serial-file", "serial-file", 4);
     DO_TEST("serial-device", "serial-device", 4);