etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6316: fixes for bvt failures

This commit is contained in:
SrikanteswaraRao Talluri 2014-04-10 21:21:28 +05:30
parent ef9471692d
commit 94fc4bf6bd
14 changed files with 47 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/integration/component/test_ip_reservation.py
View File

@ -84,7 +84,7 @@ class TestIpReservation(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -532,7 +532,7 @@ class TestRestartNetwork(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -657,7 +657,7 @@ class TestUpdateIPReservation(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -807,7 +807,7 @@ class TestRouterOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -977,7 +977,7 @@ class TestFailureScnarios(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)

6
test/integration/component/test_multiple_ips_per_nic.py
View File

@ -123,7 +123,7 @@ class TestBasicOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -474,7 +474,7 @@ class TestNetworkRules(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -849,7 +849,7 @@ class TestVmNetworkOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)

8
test/integration/component/test_persistent_networks.py
View File

@ -926,7 +926,7 @@ class TestAssignVirtualMachine(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -1082,7 +1082,7 @@ class TestProjectAccountOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -1239,7 +1239,7 @@ class TestRestartPersistentNetwork(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -1497,7 +1497,7 @@ class TestVPCNetworkOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)

18
test/integration/component/test_portable_ip.py
View File

@ -195,7 +195,7 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
# 1. Create new portable ip range with root admin api
# 2. Portable ip range should be created successfully
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
self.debug(portable_ip_range_services)
@ -239,7 +239,7 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
DomainName=self.account.domain
)
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -261,7 +261,7 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
# 1. Try to create new portable ip range with invalid region id
# 2. Portable ip range creation should fail
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -315,7 +315,7 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -490,7 +490,7 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
#create new portable ip range
self.portable_ip_range_services = get_portable_ip_range_services(self.services)
self.portable_ip_range_services = self.services["portableIpRange"]
if self.portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -653,7 +653,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
self.cleanup = []
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["PortableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -997,7 +997,7 @@ class TestDisassociatePublicIp(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -1219,7 +1219,7 @@ class TestDeleteAccount(cloudstackTestCase):
)
self.cleanup = []
portable_ip_range_services = get_portable_ip_range_services(self.services)
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@ -1496,7 +1496,7 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
#create new portable ip range
self.portable_ip_range_services = get_portable_ip_range_services(self.services)
self.portable_ip_range_services = self.services["portableIpRange"]
if self.portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')

4
test/integration/component/test_region_vpc.py
View File

@ -169,12 +169,12 @@ class TestRegionVpcOffering(cloudstackTestCase):
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.template = get_template(
cls.apiclient,
cls.zone.id,
cls.services["ostype"]
)
if template == FAILED:
if cls.template == FAILED:
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]

1
test/integration/component/test_tags.py
View File

@ -182,6 +182,7 @@ class TestResourceTags(cloudstackTestCase):
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.domain = get_domain(cls.api_client)
cls.template = get_template(
cls.api_client,
cls.zone.id,

4
test/integration/component/test_vpc_distributed_routing_offering.py
View File

@ -163,12 +163,12 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.template = get_template(
cls.apiclient,
cls.zone.id,
cls.services["ostype"]
)
if template == FAILED:
if cls.template == FAILED:
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id

3
test/integration/smoke/test_deploy_vgpu_enabled_vm.py
View File

@ -123,7 +123,8 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services["mode"] = self.zone.networktype
# Before running this test, register a windows template with ostype as 'Windows 7 (32-bit)'
self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"], templatetype='USER')
self.services["ostype"] = 'Windows 7 (32-bit)'
self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"])
if self.template == FAILED:
assert False, "get_template() failed to return template with description %s" % self.services["ostype"]

19
test/integration/smoke/test_over_provisioning.py
View File

@ -67,6 +67,10 @@ class TestUpdateOverProvision(cloudstackTestCase):
self.poolId = pool.id
""" list overprovisioning factor for storage pool """
failed = 0
if pool.overprovisionfactor is None:
failed = 1
self.assertNotEqual(failed,1,"pool.overprovisionfactor is none")
factorOld = float(str(pool.overprovisionfactor))
factorNew = str(factorOld + 1.0)
@ -85,6 +89,10 @@ class TestUpdateOverProvision(cloudstackTestCase):
id = self.poolId
)
pool = storage_pools[0]
failed = 0
if pool.overprovisionfactor is None:
failed = 1
self.assertNotEqual(failed,1,"pool.overprovisionfactor is none")
factorNew = float(str(pool.overprovisionfactor))
self.assertNotEqual(int(factorNew), int(factorOld)," Check if overprovision factor of storage pool has changed")
self.assertEqual(int(factorNew), int(factorOld + 1.0)," Check if overprovision factor of storage pool has increased by 1")
@ -100,8 +108,11 @@ class TestUpdateOverProvision(cloudstackTestCase):
pool = storage_pools[0]
updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
updateConfigurationCmd.name = "storage.overprovisioning.factor"
factorOld = float(str(pool.overprovisionfactor))
factorOld = 0
if pool.overprovisionfactor is not None:
factorOld = float(str(pool.overprovisionfactor))
factorNew = str(factorOld - 1.0)
updateConfigurationCmd.value = factorNew
updateConfigurationCmd.storageid = pool.id
updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)
if factorNew > 0:
updateConfigurationCmd.value = factorNew
updateConfigurationCmd.storageid = pool.id
updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)

2
test/integration/smoke/test_primary_storage.py
View File

@ -199,7 +199,7 @@ class TestPrimaryStorageServices(cloudstackTestCase):
self.assertEqual(
storage.type,
'NetworkFilesystem',
'IscsiLUN',
"Check storage pool type "
)

1
test/integration/smoke/test_public_ip_range.py
View File

@ -37,6 +37,7 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.services["zoneid"] = cls.zone.id
cls.pod = get_pod(cls.apiclient, cls.zone.id)
# Create Account
cls.account = Account.create(
cls.apiclient,

2
test/integration/smoke/test_vm_iam.py
View File

@ -193,7 +193,7 @@ class TestVMIam(cloudstackTestCase):
self.services["service_offering"]["small"]
)
self.zone = get_zone(self.apiclient, self.services)
self.zone = get_zone(self.apiclient, testClient.getZoneForTests())
self.services['mode'] = self.zone.networktype
self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"])

1
tools/marvin/marvin/config/test_data.py
View File

@ -382,6 +382,7 @@ test_data = {
},
"securitygroupenabled": "true"
},
"vlan": "10",
"portableiprange_vlan": {
"part": ["4090-4091", "4092-4095"],
"full": "4090-4095"

35
tools/marvin/marvin/lib/common.py
View File

@ -798,41 +798,6 @@ def get_resource_type(resource_id):
return lookup[resource_id]
def get_portable_ip_range_services(config):
""" Reads config values related to portable ip and fills up
services accordingly"""
services = {}
attributeError = False
if config.portableIpRange.startip:
services["startip"] = config.portableIpRange.startip
else:
attributeError = True
if config.portableIpRange.endip:
services["endip"] = config.portableIpRange.endip
else:
attributeError = True
if config.portableIpRange.netmask:
services["netmask"] = config.portableIpRange.netmask
else:
attributeError = True
if config.portableIpRange.gateway:
services["gateway"] = config.portableIpRange.gateway
else:
attributeError = True
if config.portableIpRange.vlan:
services["vlan"] = config.portableIpRange.vlan
if attributeError:
services = None
return services
def get_free_vlan(apiclient, zoneid):
"""