* [PATCH v2] libxl: update check-xl-disk-parse
@ 2015-12-09 10:43 Wei Liu
2015-12-09 20:12 ` Jim Fehlig
0 siblings, 1 reply; 3+ messages in thread
From: Wei Liu @ 2015-12-09 10:43 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Jim Fehlig, Wei Liu, Ian Campbell
The block-attach command now returns 1 when fails. Update first test
case to expect return value 1 instead of 255.
The parser now doesn't generate output for default values. Remove them
from expected output.
According to 417e6b70 ("libxl: add option for discard support to xl disk
configuration"), the "discard=" variant is never supported, delete two
test cases with that variant.
Reported-by: Jim Fehlig <jfehlig@suse.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Jim Fehlig <jfehlig@suse.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
v2: update commit messge
---
tools/libxl/check-xl-disk-parse | 100 ++++------------------------------------
1 file changed, 8 insertions(+), 92 deletions(-)
diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse
index 1bec4ca..03572e4 100755
--- a/tools/libxl/check-xl-disk-parse
+++ b/tools/libxl/check-xl-disk-parse
@@ -40,7 +40,7 @@ complete () {
fi
}
-e=255
+e=1
#---------- test data ----------
@@ -52,18 +52,10 @@ one $e foo
expected <<END
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "/dev/vg/guest-volume",
"vdev": "hda",
- "backend": "unknown",
"format": "raw",
- "script": null,
- "removable": 0,
- "readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
- "discard_enable": "True"
+ "readwrite": 1
}
END
@@ -75,18 +67,11 @@ one 0 raw:/dev/vg/guest-volume,hda,w
expected <<END
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "/root/image.iso",
"vdev": "hdc",
- "backend": "unknown",
"format": "raw",
- "script": null,
"removable": 1,
- "readwrite": 0,
- "is_cdrom": 1,
- "direct_io_safe": false,
- "discard_enable": "False"
+ "is_cdrom": 1
}
END
@@ -99,18 +84,11 @@ one 0 raw:/root/image.iso,hdc:cdrom,ro
expected <<EOF
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "/dev/vg/guest-volume",
"vdev": "xvdb",
"backend": "phy",
"format": "raw",
- "script": null,
- "removable": 0,
- "readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
- "discard_enable": "True"
+ "readwrite": 1
}
EOF
@@ -118,18 +96,11 @@ one 0 backendtype=phy,vdev=xvdb,access=w,target=/dev/vg/guest-volume
expected <<EOF
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "",
"vdev": "hdc",
- "backend": "unknown",
"format": "empty",
- "script": null,
"removable": 1,
- "readwrite": 0,
- "is_cdrom": 1,
- "direct_io_safe": false,
- "discard_enable": "False"
+ "is_cdrom": 1
}
EOF
@@ -141,18 +112,10 @@ one 0 ,empty,hdc:cdrom,r
expected <<EOF
disk: {
- "backend_domid": 0,
- "backend_domname": null,
- "pdev_path": null,
"vdev": "hdc",
- "backend": "unknown",
"format": "empty",
- "script": null,
"removable": 1,
- "readwrite": 0,
- "is_cdrom": 1,
- "direct_io_safe": false,
- "discard_enable": "False"
+ "is_cdrom": 1
}
EOF
@@ -161,18 +124,11 @@ one 0 vdev=hdc,access=r,devtype=cdrom
expected <<EOF
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "iqn.2001-05.com.equallogic:0-8a0906-23fe93404-c82797962054a96d-examplehost",
"vdev": "xvda",
- "backend": "unknown",
"format": "raw",
"script": "block-iscsi",
- "removable": 0,
- "readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
- "discard_enable": "True"
+ "readwrite": 1
}
EOF
@@ -183,18 +139,11 @@ one 0 vdev=xvda,access=w,script=block-iscsi,target=iqn.2001-05.com.equallogic:0-
expected <<EOF
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "app01",
"vdev": "hda",
- "backend": "unknown",
"format": "raw",
"script": "block-drbd",
- "removable": 0,
- "readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
- "discard_enable": "True"
+ "readwrite": 1
}
EOF
@@ -205,57 +154,24 @@ one 0 drbd:app01,hda,w
expected <<END
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "/some/disk/image.raw",
"vdev": "hda",
- "backend": "unknown",
"format": "raw",
- "script": null,
- "removable": 0,
"readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
"discard_enable": "True"
}
END
-one 0 discard=on vdev=hda target=/some/disk/image.raw
-one 0 discard=1 vdev=hda target=/some/disk/image.raw
-
-expected <<END
-disk: {
- "backend_domid": 0,
- "backend_domname": null,
- "pdev_path": "/some/disk/image.raw",
- "vdev": "hda",
- "backend": "unknown",
- "format": "raw",
- "script": null,
- "removable": 0,
- "readwrite": 1,
- "is_cdrom": 0,
- "direct_io_safe": false,
- "discard_enable": "False"
-}
-
-END
one 0 discard vdev=hda target=/some/disk/image.raw
one 0 discard vdev=hda target=/some/disk/image.raw
expected <<END
disk: {
- "backend_domid": 0,
- "backend_domname": null,
"pdev_path": "/some/disk/image.iso",
"vdev": "hda",
- "backend": "unknown",
"format": "raw",
- "script": null,
"removable": 1,
- "readwrite": 0,
"is_cdrom": 1,
- "direct_io_safe": false,
"discard_enable": "False"
}
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] libxl: update check-xl-disk-parse
2015-12-09 10:43 [PATCH v2] libxl: update check-xl-disk-parse Wei Liu
@ 2015-12-09 20:12 ` Jim Fehlig
2015-12-10 12:38 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Jim Fehlig @ 2015-12-09 20:12 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: Ian Jackson, Ian Campbell
On 12/09/2015 03:43 AM, Wei Liu wrote:
> The block-attach command now returns 1 when fails. Update first test
> case to expect return value 1 instead of 255.
>
> The parser now doesn't generate output for default values. Remove them
> from expected output.
I made the same changes yesterday to get the tests to pass.
> According to 417e6b70 ("libxl: add option for discard support to xl disk
> configuration"), the "discard=" variant is never supported, delete two
> test cases with that variant.
Heh, I didn't realize "discard=" wasn't supported and instead added support for
parsing it in libxlu_disk_l.l :-)
Looks good to me.
Tested-by: Jim Fehlig <jfehlig@suse.com>
Regards,
Jim
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] libxl: update check-xl-disk-parse
2015-12-09 20:12 ` Jim Fehlig
@ 2015-12-10 12:38 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2015-12-10 12:38 UTC (permalink / raw)
To: Jim Fehlig, Wei Liu, Xen-devel; +Cc: Ian Jackson
On Wed, 2015-12-09 at 13:12 -0700, Jim Fehlig wrote:
> On 12/09/2015 03:43 AM, Wei Liu wrote:
> > The block-attach command now returns 1 when fails. Update first test
> > case to expect return value 1 instead of 255.
> >
> > The parser now doesn't generate output for default values. Remove them
> > from expected output.
>
> I made the same changes yesterday to get the tests to pass.
>
> > According to 417e6b70 ("libxl: add option for discard support to xl
> > disk
> > configuration"), the "discard=" variant is never supported, delete two
> > test cases with that variant.
>
> Heh, I didn't realize "discard=" wasn't supported and instead added
> support for
> parsing it in libxlu_disk_l.l :-)
>
> Looks good to me.
>
> Tested-by: Jim Fehlig <jfehlig@suse.com>
Acked + applied.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-10 12:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 10:43 [PATCH v2] libxl: update check-xl-disk-parse Wei Liu
2015-12-09 20:12 ` Jim Fehlig
2015-12-10 12:38 ` Ian Campbell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.