Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add python ipmi library to iso" into stable/colorado
[apex.git]
/
tests
/
test_apex_deploy_env.py
diff --git
a/tests/test_apex_deploy_env.py
b/tests/test_apex_deploy_env.py
index
0cd144e
..
563bfd8
100644
(file)
--- a/
tests/test_apex_deploy_env.py
+++ b/
tests/test_apex_deploy_env.py
@@
-27,26
+27,27
@@
deploy_files = ('deploy_settings.yaml',
'os-nosdn-performance-ha.yaml',
'os-odl_l2-nofeature-ha.yaml',
'os-odl_l2-sfc-noha.yaml',
'os-nosdn-performance-ha.yaml',
'os-odl_l2-nofeature-ha.yaml',
'os-odl_l2-sfc-noha.yaml',
- 'os-onos-nofeature-ha.yaml')
+ 'os-onos-nofeature-ha.yaml',
+ 'os-onos-sfc-ha.yaml')
test_deploy_content = (
test_deploy_content = (
-'global_params:',
-'deploy_options: string',
-"""deploy_options: string
+
'global_params:',
+
'deploy_options: string',
+
"""deploy_options: string
global_params:""",
global_params:""",
-"""global_params:
+
"""global_params:
deploy_options:
error: error
""",
deploy_options:
error: error
""",
-"""global_params:
+
"""global_params:
deploy_options:
performance: string
""",
deploy_options:
performance: string
""",
-"""global_params:
+
"""global_params:
deploy_options:
dataplane: invalid
""",
deploy_options:
dataplane: invalid
""",
-"""global_params:
+
"""global_params:
deploy_options:
performance:
Controller:
deploy_options:
performance:
Controller:
@@
-78,7
+79,8
@@
class TestIpUtils(object):
f = open('/tmp/apex_deploy_test_file', 'w')
f.write(c)
f.close()
f = open('/tmp/apex_deploy_test_file', 'w')
f.write(c)
f.close()
- assert_raises(DeploySettingsException, DeploySettings, '/tmp/apex_deploy_test_file')
+ assert_raises(DeploySettingsException,
+ DeploySettings, '/tmp/apex_deploy_test_file')
def test_dump_bash(self):
# the performance file has the most use of the function
def test_dump_bash(self):
# the performance file has the most use of the function