From e49099a4a9ea70ce0c48dc5b8eb322da97d910fc Mon Sep 17 00:00:00 2001
From: Alexander Schreiber <als@google.com>
Date: Wed, 8 Oct 2008 17:31:17 +0000
Subject: [PATCH] Update scripts and qa config for changed hypervisor names.
Reviewed-by: ultrotter
---
lib/rapi/rlib1.py | 2 +-
qa/qa-sample.json | 2 +-
scripts/gnt-cluster | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/rapi/rlib1.py b/lib/rapi/rlib1.py
index 53dbfb3e0..7ca13b28f 100644
--- a/lib/rapi/rlib1.py
+++ b/lib/rapi/rlib1.py
@@ -97,7 +97,7 @@ class R_info(baserlib.R_Generic):
"64bit",
"x86_64"
],
- "hypervisor_type": "xen-3.0",
+ "hypervisor_type": "xen-pvm",
"protocol_version": 12
}
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 1761b79b3..9b323cd67 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -1,7 +1,7 @@
{
"name": "xen-test",
"rename": "xen-test-rename",
- "hypervisor-type": "xen-3.0",
+ "hypervisor-type": "xen-pvm",
"os": "debian-etch",
"os-size": "10G",
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 02019c074..fbc8cbf5f 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -360,12 +360,12 @@ commands = {
metavar="ADDRESS", default=None),
make_option("-t", "--hypervisor-type", dest="hypervisor_type",
help="Specify the hypervisor type "
- "(xen-3.0, kvm, fake, xen-hvm-3.1)",
- metavar="TYPE", choices=["xen-3.0",
+ "(xen-pvm, kvm, fake, xen-hvm)",
+ metavar="TYPE", choices=["xen-pvm",
"kvm",
"fake",
- "xen-hvm-3.1"],
- default="xen-3.0",),
+ "xen-hvm"],
+ default="xen-pvm",),
make_option("-m", "--mac-prefix", dest="mac_prefix",
help="Specify the mac prefix for the instance IP"
" addresses, in the format XX:XX:XX",
--
GitLab