Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable tempest offline by use_custom_images=True"
[functest.git]
/
functest
/
opnfv_tests
/
openstack
/
vping
/
vping_base.py
diff --git
a/functest/opnfv_tests/openstack/vping/vping_base.py
b/functest/opnfv_tests/openstack/vping/vping_base.py
index
4390a99
..
856d5f2
100644
(file)
--- a/
functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/
functest/opnfv_tests/openstack/vping/vping_base.py
@@
-13,7
+13,7
@@
import os
import time
import uuid
import time
import uuid
-from functest.core
.testcase import TestC
ase
+from functest.core
import testc
ase
from functest.utils import functest_utils
from functest.utils.constants import CONST
from functest.utils import functest_utils
from functest.utils.constants import CONST
@@
-24,7
+24,7
@@
from snaps.openstack.tests import openstack_tests
from snaps.openstack.utils import deploy_utils, nova_utils
from snaps.openstack.utils import deploy_utils, nova_utils
-class VPingBase(TestCase):
+class VPingBase(
testcase.OSGC
TestCase):
"""
Base class for vPing tests that check connectivity between two VMs shared
"""
Base class for vPing tests that check connectivity between two VMs shared
@@
-79,7
+79,7
@@
class VPingBase(TestCase):
scenario = functest_utils.get_scenario()
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
if 'ovs' in scenario or 'fdio' in scenario:
self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
@@
-152,12
+152,12
@@
class VPingBase(TestCase):
else:
raise Exception('VMs never became active')
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 = 100
self.stop_time = time.time()
self.result = 100
- return TestCase.EX_OK
+ return
testcase.
TestCase.EX_OK
def _cleanup(self):
"""
def _cleanup(self):
"""