From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Jim Fehlig <jfehlig@suse.com>, Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH] libxl: update check-xl-disk-parse
Date: Tue, 8 Dec 2015 20:02:11 +0000 [thread overview]
Message-ID: <1449604931-1477-1-git-send-email-wei.liu2@citrix.com> (raw)
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.
The "discard=" variant is never not supported, so 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>
---
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
next reply other threads:[~2015-12-08 20:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 20:02 Wei Liu [this message]
2015-12-09 10:06 ` [PATCH] libxl: update check-xl-disk-parse Ian Campbell
2015-12-09 10:15 ` Wei Liu
2015-12-09 10:24 ` Wei Liu
2015-12-09 10:32 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449604931-1477-1-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jfehlig@suse.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.