X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fvping%2Fvping_base.py;h=856d5f22093301e9210d14cece89edfde506e4d6;hb=ec97f28675daea3b3221c196764c58c3c9bd65d4;hp=8eb41beefb6a93107412e332cba7580a5f7d5997;hpb=0821c4204c7ca470818cfe1c83060fcd2f94e3d6;p=functest.git diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 8eb41beef..856d5f220 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials @@ -13,7 +13,7 @@ import os import time import uuid -from functest.core.testcase import TestCase +from functest.core import testcase from functest.utils import functest_utils from functest.utils.constants import CONST @@ -24,13 +24,14 @@ from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import deploy_utils, nova_utils -class VPingBase(TestCase): +class VPingBase(testcase.OSGCTestCase): """ Base class for vPing tests that check connectivity between two VMs shared internal network. This class is responsible for creating the image, internal network. """ + def __init__(self, **kwargs): super(VPingBase, self).__init__(**kwargs) @@ -78,7 +79,7 @@ class VPingBase(TestCase): scenario = functest_utils.get_scenario() - self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY + self.flavor_metadata = None if 'ovs' in scenario or 'fdio' in scenario: self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE @@ -151,12 +152,12 @@ class VPingBase(TestCase): else: raise Exception('VMs never became active') - if result == TestCase.EX_RUN_ERROR: - return TestCase.EX_RUN_ERROR + if result == testcase.TestCase.EX_RUN_ERROR: + return testcase.TestCase.EX_RUN_ERROR self.stop_time = time.time() - self.result = 'PASS' - return TestCase.EX_OK + self.result = 100 + return testcase.TestCase.EX_OK def _cleanup(self): """ @@ -193,6 +194,7 @@ class VPingBase(TestCase): class VPingMain(object): + def __init__(self, vping_cls): self.vping = vping_cls()