apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

affinity group tests moved into the test folder

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-04-05 15:17:20 +05:30 committed by Prachi Damle
parent d38bf8a10c
commit e52bf52238
2 changed files with 16 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/marvin/marvin/sandbox/demo/live/testDeployVMWithAffinityGroup.py → test/integration/smoke/test_affinity_groups.py
View File

@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,13 +20,13 @@
import marvin
from marvin.cloudstackTestCase import *
from marvin.remoteSSHClient import remoteSSHClient
from marvin.remoteSSHClient import remoteSSHClient
import hashlib
import random
class TestDeployVmWithAffinityGroup(cloudstackTestCase):
"""
This test deploys a virtual machine into a user account
This test deploys a virtual machine into a user account
using the small service offering and builtin template
"""
def setUp(self):
@ -57,7 +57,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
%s"%(self.acctResponse.account.account, \
self.acctResponse.account.username, \
self.acctResponse.account.id))
self.zone = listZones.listZonesCmd()
self.zone.uuid = self.apiClient.listZones(self.zone)[0].id
@ -68,7 +68,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
self.template = listTemplates.listTemplatesCmd()
self.template.templatefilter = 'featured'
self.template.name = 'CentOS'
self.template.uuid = self.apiClient.listTemplates(self.template)[0].id
self.template.uuid = self.apiClient.listTemplates(self.template)[0].id
def test_DeployVm(self):
"""
@ -76,8 +76,8 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
deploying on CloudStack. We will be assuming a single zone is available
and is configured and all templates are Ready
The hardcoded values are used only for brevity.
The hardcoded values are used only for brevity.
First create the host anti-affinity group for this account
"""
createAGCmd = createAffinityGroup.createAffinityGroupCmd()
@ -85,11 +85,11 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
createAGCmd.type = 'host anti-affinity'
createAGCmd.account = self.acct.account
createAGCmd.domainid = self.acct.domainid
createAGResponse = self.apiClient.createAffinityGroup(createAGCmd)
self.debug("AffinityGroup %s was created in the job %s"%(createAGResponse.id, createAGResponse.jobid))
deployVmCmd = deployVirtualMachine.deployVirtualMachineCmd()
deployVmCmd.zoneid = self.zone.uuid
deployVmCmd.templateid = self.template.uuid #CentOS 5.6 builtin
@ -128,7 +128,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
deployVm2Response = self.apiClient.deployVirtualMachine(deployVm2Cmd)
self.debug("VM2 %s was deployed in the job %s"%(deployVm2Response.id, deployVm2Response.jobid))
# At this point our VM is expected to be Running. Let's find out what
# listVirtualMachines tells us about VMs in this account
@ -143,11 +143,11 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
self.assertEqual(vm2.state, "Running", "Check if VM has reached Running state in CS")
VM2hostid = vm2.hostid
self.assertNotEqual(VM1hostid, VM2hostid, "The hosts of the 2 VM's in the host anti-affinity group are not different, test failed")
self.assertNotEqual(VM1hostid, VM2hostid, "The hosts of the 2 VM's in the host anti-affinity group are not different, test failed")
def tearDown(self):
"""
"""
And finally let us cleanup the resources we created by deleting the
account. All good unittests are atomic and rerunnable this way
"""

45
tools/marvin/marvin/sandbox/demo/live/testaffinitygroup.cfg
View File

@ -1,45 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
# This config is designed to run as an advanced network, with management server in devcloud
# It also requires an 'apt-get install dnsmasq' to run a resolver in devcloud for internal dns
{
"dbSvr": {
"dbSvr": "127.0.0.1",
"passwd": "cloud",
"db": "cloud",
"port": 3306,
"user": "cloud"
},
"logger": [
{
"name": "TestClient",
"file": "C:\\var\\log\\testclient.log"
},
{
"name": "TestCase",
"file": "C:\\var\\log\\testcase.log"
}
],
"mgtSvr": [
{
"mgtSvrIp": "127.0.0.1",
"port": 8096
}
]
}