From 6e69ce0329437fcc5a4181eb4d70e44a6c2dbaa5 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 14 Nov 2018 04:42:11 -0500 Subject: Integrate k8s test casses In order to integrate k8s test cases, Dovetail framework should do some refactor and make it more general for k8s test cases as well as ONAP ones. Integrate 2 k8s test cases. JIRA: DOVETAIL-748 Change-Id: Ibd87754ffb5fb29f6b4ce79232af860c2ed2da9c Signed-off-by: xudan --- dovetail/report.py | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'dovetail/report.py') diff --git a/dovetail/report.py b/dovetail/report.py index 5f925c2e..26cd6c52 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -28,7 +28,7 @@ from testcase import Testcase class Report(object): - results = {'functest': {}, 'yardstick': {}, + results = {'functest': {}, 'yardstick': {}, 'functest-k8s': {}, 'bottlenecks': {}, 'shell': {}, 'vnftest': {}} logger = None @@ -294,6 +294,20 @@ class FunctestCrawler(Crawler): return json_results +class FunctestK8sCrawler(FunctestCrawler): + + logger = None + + def __init__(self): + self.type = 'functest-k8s' + self.logger.debug('Create crawler: {}'.format(self.type)) + + @classmethod + def create_log(cls): + cls.logger = \ + dt_logger.Logger(__name__ + '.FunctestK8sCrawler').getLogger() + + class YardstickCrawler(Crawler): logger = None @@ -430,7 +444,8 @@ class CrawlerFactory(object): 'yardstick': YardstickCrawler, 'bottlenecks': BottlenecksCrawler, 'vnftest': VnftestCrawler, - 'shell': ShellCrawler} + 'shell': ShellCrawler, + 'functest-k8s': FunctestK8sCrawler} @classmethod def create(cls, type): @@ -510,6 +525,16 @@ class FunctestChecker(object): testcase.passed(testcase_passed) +class FunctestK8sChecker(FunctestChecker): + + logger = None + + @classmethod + def create_log(cls): + cls.logger = \ + dt_logger.Logger(__name__ + '.FunctestK8sChecker').getLogger() + + class YardstickChecker(object): logger = None @@ -580,7 +605,8 @@ class CheckerFactory(object): 'yardstick': YardstickChecker, 'bottlenecks': BottlenecksChecker, 'shell': ShellChecker, - 'vnftest': VnftestChecker} + 'vnftest': VnftestChecker, + 'functest-k8s': FunctestK8sChecker} @classmethod def create(cls, type): -- cgit 1.2.3-korg