aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-05-30 12:18:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-30 12:18:07 +0000
commit8628e8f2bb97f4528767710ec8fdec5ea3643738 (patch)
tree41f1adafd2ed409481f97fe544e6697c1e334685
parent8c71f206875bab312072feeede1b9999efd76698 (diff)
parent38c38b9aff1d30e91ee2bd8368029b2975db82f2 (diff)
Merge "vping&snaps_xxx support not_hugepage_supported pod"
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_test_runner.py2
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 2b98a202..5e39946d 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -33,7 +33,7 @@ class SnapsTestRunner(unit.Suite):
self.use_keystone = CONST.__getattribute__('snaps_use_keystone')
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
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 4390a99f..7f568821 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -79,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