Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix userdata issue for vping and orchestra
[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
f3e0cfe
..
c93d2f2
100644
(file)
--- a/
functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/
functest/opnfv_tests/openstack/vping/vping_base.py
@@
-13,7
+13,6
@@
import time
import uuid
from functest.core import testcase
import uuid
from functest.core import testcase
-from functest.utils import functest_utils
from functest.utils.constants import CONST
from snaps.openstack import create_flavor
from functest.utils.constants import CONST
from snaps.openstack import create_flavor
@@
-43,8
+42,14
@@
class VPingBase(testcase.TestCase):
if 'os_creds' in kwargs:
self.os_creds = kwargs['os_creds']
else:
if 'os_creds' in kwargs:
self.os_creds = kwargs['os_creds']
else:
+ creds_override = None
+ if hasattr(CONST, 'snaps_os_creds_override'):
+ creds_override = CONST.__getattribute__(
+ 'snaps_os_creds_override')
+
self.os_creds = openstack_tests.get_credentials(
self.os_creds = openstack_tests.get_credentials(
- os_env_file=CONST.__getattribute__('openstack_creds'))
+ os_env_file=CONST.__getattribute__('openstack_creds'),
+ overrides=creds_override)
self.creators = list()
self.image_creator = None
self.creators = list()
self.image_creator = None
@@
-107,13
+112,13
@@
class VPingBase(testcase.TestCase):
vping_physical_network = None
vping_segmentation_id = None
vping_physical_network = None
vping_segmentation_id = None
- if (hasattr(CONST, 'network_type')):
+ if (hasattr(CONST, '
vping_
network_type')):
vping_network_type = CONST.__getattribute__(
'vping_network_type')
vping_network_type = CONST.__getattribute__(
'vping_network_type')
- if (hasattr(CONST, 'physical_network')):
+ if (hasattr(CONST, '
vping_
physical_network')):
vping_physical_network = CONST.__getattribute__(
'vping_physical_network')
vping_physical_network = CONST.__getattribute__(
'vping_physical_network')
- if (hasattr(CONST, 'segmentation_id')):
+ if (hasattr(CONST, '
vping_
segmentation_id')):
vping_segmentation_id = CONST.__getattribute__(
'vping_segmentation_id')
vping_segmentation_id = CONST.__getattribute__(
'vping_segmentation_id')
@@
-133,7
+138,7
@@
class VPingBase(testcase.TestCase):
self.logger.info(
"Creating flavor with name: '%s'" % self.flavor_name)
self.logger.info(
"Creating flavor with name: '%s'" % self.flavor_name)
- scenario =
functest_utils.get_scenario(
)
+ scenario =
CONST.__getattribute__('DEPLOY_SCENARIO'
)
flavor_metadata = None
if 'ovs' in scenario or 'fdio' in scenario:
flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
flavor_metadata = None
if 'ovs' in scenario or 'fdio' in scenario:
flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE