From 54a4b2bad79321f241e97d19ce861dc0196ec946 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Mon, 23 Feb 2015 02:48:16 -0800 Subject: [PATCH] CLOUDSTACK-8278: Usage test path - Correct code flow in case the usage job configuration is not to be set through test case Signed-off-by: Rohit Yadav --- test/integration/testpaths/testpath_usage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py index 17d56ccfb04..e45221c01af 100644 --- a/test/integration/testpaths/testpath_usage.py +++ b/test/integration/testpaths/testpath_usage.py @@ -91,6 +91,10 @@ class TestUsage(cloudstackTestCase): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.hypervisor = testClient.getHypervisorInfo() @@ -2966,6 +2970,10 @@ class TestUsageDirectMeteringBasicZone(cloudstackTestCase): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.template = get_template( cls.apiclient,