Code Review
/
functest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
632f49a
)
Stop setting floating_ips in tempest_conf.yaml
24/71624/1
author
Cédric Ollivier
<cedric.ollivier@orange.com>
Fri, 4 Dec 2020 12:01:32 +0000
(13:01 +0100)
committer
Cédric Ollivier
<cedric.ollivier@orange.com>
Fri, 4 Dec 2020 12:08:19 +0000
(13:08 +0100)
It's now handled by tempest.py
Change-Id: Iaeefd70f95a3c64c7ca41b984e934c4aeadea8ab
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit
47e7b7c59998dfaa76ac8e4c48b47a75538ac90a
)
docker/smoke-cntt/tempest_conf.yaml
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/tempest.py
patch
|
blob
|
history
diff --git
a/docker/smoke-cntt/tempest_conf.yaml
b/docker/smoke-cntt/tempest_conf.yaml
index
d039a59
..
20ca43e
100644
(file)
--- a/
docker/smoke-cntt/tempest_conf.yaml
+++ b/
docker/smoke-cntt/tempest_conf.yaml
@@
-53,7
+53,6
@@
image-feature-enabled:
network-feature-enabled:
port_admin_state_change: true
port_security: true
- floating_ips: true
placement:
max_microversion: "1.10"
validation:
diff --git
a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index
2b8a60f
..
7585473
100644
(file)
--- a/
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@
-53,7
+53,6
@@
image-feature-enabled:
network-feature-enabled:
port_admin_state_change: true
port_security: true
- floating_ips: true
placement:
max_microversion: "1.30"
validation:
diff --git
a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index
3fde888
..
37aa281
100644
(file)
--- a/
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@
-53,7
+53,6
@@
image-feature-enabled:
network-feature-enabled:
port_admin_state_change: true
port_security: true
- floating_ips: true
placement:
max_microversion: "1.30"
validation:
diff --git
a/functest/opnfv_tests/openstack/tempest/tempest.py
b/functest/opnfv_tests/openstack/tempest/tempest.py
index
a87e3af
..
55ec8fa
100644
(file)
--- a/
functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/
functest/opnfv_tests/openstack/tempest/tempest.py
@@
-515,6
+515,7
@@
class TempestCommon(singlevm.VmReady2):
rconfig.add_section('network')
rconfig.set('network', 'public_network_id', self.ext_net.id)
rconfig.set('network', 'floating_network_name', self.ext_net.name)
+ rconfig.set('network-feature-enabled', 'floating_ips', True)
else:
if not rconfig.has_section('network-feature-enabled'):
rconfig.add_section('network-feature-enabled')