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

CLOUDSTACK-6316: Fixed bvt failures

This commit is contained in:
SrikanteswaraRao Talluri 2014-04-08 15:02:37 +05:30
parent bacfd109e2
commit 08b87c0409
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,15 +1180,15 @@ class TestNOWithOnlySourceNAT(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.testClient = super(TestNOWithOnlySourceNAT, cls).getClsTestClient()
cls.apiClient = cls.testClient.getApiClient()
cls.apiclient = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiClient)
cls.zone = get_zone(cls.apiClient, cls.testClient.getZoneForTests())
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.apiClient,
cls.apiclient,
cls.zone.id,
cls.services["ostype"]
)
@ -1197,7 +1197,7 @@ class TestNOWithOnlySourceNAT(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.apiClient,
cls.apiclient,
cls.services["service_offering"]
)

2
tools/marvin/marvin/cloudstackTestClient.py
View File

@ -416,7 +416,7 @@ class CSTestClient(object):
@Desc : FixME, httplib has issue if more than one thread submitted
'''
if self.__asyncJobMgr is None:
self.__asyncJobMgr = asyncJobMgr.asyncJobMgr(self.__apiClient,
self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
self.__dbConnection)
return self.__asyncJobMgr.submitCmdsAndWait(cmds, workers)