You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/11 08:52:11 UTC
[1/2] git commit: updated refs/heads/resize-root to d4d3382
Repository: cloudstack
Updated Branches:
refs/heads/resize-root 33f9aeda3 -> d4d338217
rootresize: fix hypervisor specific tests to pull hypervisor from config
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fc2aca4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fc2aca4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fc2aca4
Branch: refs/heads/resize-root
Commit: 5fc2aca44e304283719850e7308c86e667a97954
Parents: 33f9aed
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Feb 10 16:27:01 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Feb 10 16:27:01 2014 -0700
----------------------------------------------------------------------
.../smoke/test_deploy_vm_root_resize.py | 284 ++++++++-----------
.../devcloud-kvm-advanced-fusion.cfg | 3 +-
tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 3 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 3 +-
4 files changed, 132 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fc2aca4/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index 680ab7a..9201fc4 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -76,9 +76,9 @@ class TestDeployVM(cloudstackTestCase):
self.domain = get_domain(self.apiclient, self.testdata)
self.zone = get_zone(self.apiclient, self.testdata)
self.testdata["mode"] = self.zone.networktype
- self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
+# self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
# for testing with specific template
-# self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
+ self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
#create a user account
@@ -98,7 +98,6 @@ class TestDeployVM(cloudstackTestCase):
self.account
]
- @attr(hypervisor = ['kvm'])
@attr(tags = ['advanced', 'simulator', 'basic', 'sg'])
def test_00_deploy_vm_root_resize(self):
"""Test deploy virtual machine with root resize
@@ -108,82 +107,8 @@ class TestDeployVM(cloudstackTestCase):
# 2. root disk has new size per listVolumes
# 3. Rejects non-supported hypervisor types
"""
- self.apiclient.hypervisor = 'KVM'
- newrootsize = (self.template.size >> 30) + 2
- self.virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.testdata["virtual_machine"],
- accountid=self.account.name,
- zoneid=self.zone.id,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- templateid=self.template.id,
- rootdisksize=newrootsize
- )
-
- list_vms = VirtualMachine.list(self.apiclient, id=self.virtual_machine.id)
-
- self.debug(
- "Verify listVirtualMachines response for virtual machine: %s"\
- % self.virtual_machine.id
- )
-
- self.assertEqual(
- isinstance(list_vms, list),
- True,
- "List VM response was not a valid list"
- )
- self.assertNotEqual(
- len(list_vms),
- 0,
- "List VM response was empty"
- )
-
- vm = list_vms[0]
- self.assertEqual(
- vm.id,
- self.virtual_machine.id,
- "Virtual Machine ids do not match"
- )
- self.assertEqual(
- vm.name,
- self.virtual_machine.name,
- "Virtual Machine names do not match"
- )
- self.assertEqual(
- vm.state,
- "Running",
- msg="VM is not in Running state"
- )
-
- # get root vol from created vm, verify it is correct size
- list_volume_response = list_volumes(
- self.apiclient,
- virtualmachineid=self.virtual_machine.id,
- type='ROOT',
- listall=True
- )
-
- rootvolume = list_volume_response[0]
- success = False
- if rootvolume is not None and rootvolume.size == (newrootsize << 30):
- success = True
-
- self.assertEqual(
- success,
- True,
- "Check if the root volume resized appropriately"
- )
-
- @attr(hypervisor = 'kvm')
- @attr(tags = ['advanced', 'simulator', 'basic', 'sg'])
- def test_01_deploy_vm_root_resize(self):
- """Test proper failure to deploy virtual machine with rootdisksize of 0
- """
- newrootsize = 0
- success = False
- self.apiclient.hypervisor = 'KVM'
- try:
+ if(self.apiclient.hypervisor == 'kvm'):
+ newrootsize = (self.template.size >> 30) + 2
self.virtual_machine = VirtualMachine.create(
self.apiclient,
self.testdata["virtual_machine"],
@@ -194,99 +119,142 @@ class TestDeployVM(cloudstackTestCase):
templateid=self.template.id,
rootdisksize=newrootsize
)
- except Exception as ex:
- if "rootdisk size should be a non zero number" in str(ex):
- success = True
- else:
- self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
- self.assertEqual(success, True, "Check if passing 0 as rootdisksize fails appropriately")
+ list_vms = VirtualMachine.list(self.apiclient, id=self.virtual_machine.id)
- @attr(hypervisor = 'kvm')
- @attr(tags = ['advanced', 'simulator', 'basic', 'sg'])
- def test_02_deploy_vm_root_resize(self):
- """Test proper failure to deploy virtual machine with rootdisksize less than template size
- """
- self.apiclient.hypervisor = 'KVM'
- newrootsize = (self.template.size >> 30) - 1
-
- self.assertEqual(newrootsize > 0, True, "Provided template is less than 1G in size, cannot run test")
+ self.debug(
+ "Verify listVirtualMachines response for virtual machine: %s"\
+ % self.virtual_machine.id
+ )
- success = False
- try:
- self.virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.testdata["virtual_machine"],
- accountid=self.account.name,
- zoneid=self.zone.id,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- templateid=self.template.id,
- rootdisksize=newrootsize
+ self.assertEqual(
+ isinstance(list_vms, list),
+ True,
+ "List VM response was not a valid list"
)
- except Exception as ex:
- if "rootdisksize override is smaller than template size" in str(ex):
+ self.assertNotEqual(
+ len(list_vms),
+ 0,
+ "List VM response was empty"
+ )
+
+ vm = list_vms[0]
+ self.assertEqual(
+ vm.id,
+ self.virtual_machine.id,
+ "Virtual Machine ids do not match"
+ )
+ self.assertEqual(
+ vm.name,
+ self.virtual_machine.name,
+ "Virtual Machine names do not match"
+ )
+ self.assertEqual(
+ vm.state,
+ "Running",
+ msg="VM is not in Running state"
+ )
+
+ # get root vol from created vm, verify it is correct size
+ list_volume_response = list_volumes(
+ self.apiclient,
+ virtualmachineid=self.virtual_machine.id,
+ type='ROOT',
+ listall=True
+ )
+
+ rootvolume = list_volume_response[0]
+ success = False
+ if rootvolume is not None and rootvolume.size == (newrootsize << 30):
success = True
- else:
- self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
- self.assertEqual(success, True, "Check if passing rootdisksize < templatesize fails appropriately")
+ self.assertEqual(
+ success,
+ True,
+ "Check if the root volume resized appropriately"
+ )
+ else:
+ self.debug("hypervisor %s unsupported for test 00, verifying it errors properly" % self.apiclient.hypervisor)
+
+ newrootsize = (self.template.size >> 30) + 2
+ success = False
+ try:
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.testdata["virtual_machine"],
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ rootdisksize=newrootsize
+ )
+ except Exception as ex:
+ if "Hypervisor XenServer does not support rootdisksize override" in str(ex):
+ success = True
+ else:
+ self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
+
+ self.assertEqual(success, True, "Check if unsupported hypervisor %s fails appropriately" % self.apiclient.hypervisor)
- @attr(hypervisor = ['xenserver','kvm','vmware'])
@attr(tags = ['advanced', 'simulator', 'basic', 'sg'])
- def test_03_deploy_vm_root_resize(self):
- """Test proper failure to deploy virtual machine with XenServer hypervisor
- # remove this test completely if/when XenServer supports rootdisksize parameter, tests 00 01 02 will then need to test it.
+ def test_01_deploy_vm_root_resize(self):
+ """Test proper failure to deploy virtual machine with rootdisksize of 0
"""
- self.apiclient.hypervisor = 'XenServer'
- newrootsize = (self.template.size >> 30) + 2
- success = False
- try:
- self.virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.testdata["virtual_machine"],
- accountid=self.account.name,
- zoneid=self.zone.id,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- templateid=self.template.id,
- rootdisksize=newrootsize
- )
- except Exception as ex:
- if "Hypervisor XenServer does not support rootdisksize override" in str(ex):
- success = True
- else:
- self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
+ if (self.apiclient.hypervisor == 'kvm'):
+ newrootsize = 0
+ success = False
+ try:
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.testdata["virtual_machine"],
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ rootdisksize=newrootsize
+ )
+ except Exception as ex:
+ if "rootdisk size should be a non zero number" in str(ex):
+ success = True
+ else:
+ self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
- self.assertEqual(success, True, "Check if unsupported hypervisor XenServer fails appropriately")
+ self.assertEqual(success, True, "Check if passing 0 as rootdisksize fails appropriately")
+ else:
+ self.debug("test 01 does not support hypervisor type " + self.apiclient.hypervisor);
- @attr(hypervisor = ['xenserver','kvm','vmware'])
@attr(tags = ['advanced', 'simulator', 'basic', 'sg'])
- def test_04_deploy_vm_root_resize(self):
- """Test proper failure to deploy virtual machine with VMware hypervisor
- # remove this test completely if/when VMware supports rootdisksize parameter, tests 00 01 02 will then need to test it.
+ def test_02_deploy_vm_root_resize(self):
+ """Test proper failure to deploy virtual machine with rootdisksize less than template size
"""
- self.apiclient.hypervisor = 'VMware'
- newrootsize = (self.template.size >> 30) + 2
- success = False
- try:
- self.virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.testdata["virtual_machine"],
- accountid=self.account.name,
- zoneid=self.zone.id,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- templateid=self.template.id,
- rootdisksize=newrootsize
- )
- except Exception as ex:
- if "Hypervisor VMware does not support rootdisksize override" in str(ex):
- success = True
- else:
- self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
+ if (self.apiclient.hypervisor == 'kvm'):
+ newrootsize = (self.template.size >> 30) - 1
+
+ self.assertEqual(newrootsize > 0, True, "Provided template is less than 1G in size, cannot run test")
+
+ success = False
+ try:
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.testdata["virtual_machine"],
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ rootdisksize=newrootsize
+ )
+ except Exception as ex:
+ if "rootdisksize override is smaller than template size" in str(ex):
+ success = True
+ else:
+ self.debug("virtual machine create did not fail appropriately. Error was actually : " + str(ex));
- self.assertEqual(success, True, "Check if unsupported hypervisor VMware fails appropriately")
+ self.assertEqual(success, True, "Check if passing rootdisksize < templatesize fails appropriately")
+ else:
+ self.debug("test 01 does not support hypervisor type " + self.apiclient.hypervisor);
def tearDown(self):
try:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fc2aca4/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg b/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg
index d2e8c7b..2084417 100644
--- a/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg
+++ b/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg
@@ -126,7 +126,8 @@
"mgtSvr": [
{
"mgtSvrIp": "172.17.10.10",
- "port": 8096
+ "port": 8096,
+ "hypervisor": "kvm"
}
]
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fc2aca4/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
index 53e1a44..74c36b7 100644
--- a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
+++ b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
@@ -133,7 +133,8 @@
"mgtSvr": [
{
"mgtSvrIp": "172.17.10.10",
- "port": 8096
+ "port": 8096,
+ "hypervisor": "kvm"
}
]
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fc2aca4/tools/devcloud-kvm/devcloud-kvm.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/devcloud-kvm.cfg b/tools/devcloud-kvm/devcloud-kvm.cfg
index 3122e5a..ab7f9a5 100644
--- a/tools/devcloud-kvm/devcloud-kvm.cfg
+++ b/tools/devcloud-kvm/devcloud-kvm.cfg
@@ -104,7 +104,8 @@
"mgtSvr": [
{
"mgtSvrIp": "127.0.0.1",
- "port": 8096
+ "port": 8096,
+ "hypervisor": "kvm"
}
],
"dbSvr":
[2/2] git commit: updated refs/heads/resize-root to d4d3382
Posted by ml...@apache.org.
rootresize: set proper template search
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d4d33821
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d4d33821
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d4d33821
Branch: refs/heads/resize-root
Commit: d4d338217042d6e2cb6903192a4a31cae67a1bf3
Parents: 5fc2aca
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Feb 10 16:28:03 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Feb 10 16:28:03 2014 -0700
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm_root_resize.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4d33821/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index 9201fc4..e17d2df 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -76,9 +76,9 @@ class TestDeployVM(cloudstackTestCase):
self.domain = get_domain(self.apiclient, self.testdata)
self.zone = get_zone(self.apiclient, self.testdata)
self.testdata["mode"] = self.zone.networktype
-# self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
+ self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
# for testing with specific template
- self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
+# self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
#create a user account