aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-12-07 09:00:02 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-12-07 09:02:10 +0100
commit345db3f35651b92161993e6de2e3ee3058fb43a1 (patch)
tree1a7e440e5f8b0c229d579842f96eb9e1564b565c
parentaccb117f37296975c0ab4ac7f59e556b24b74ebc (diff)
Update NovaServers.boot_server_associate_and_dissociate_floating_ip
It conforms with "Fix nova scenarios for assiciating fips" [1] http://artifacts.opnfv.org/functest/2B3GHZXZMEIC/functest-opnfv-functest-smoke-leguer-rally_sanity-run-16/rally_sanity/rally_sanity.html [1] https://github.com/openstack/rally-openstack/commit/ab03bfeafda0a29def4c792a174ec1af836b68be#diff-e40d163061529de4f93597cc2597505325ededfaa93855d59b2f3c717f6fa460 Change-Id: Iaed6d2f8527f62629fb7a761860f789fa1e8df72 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 5b74f9ce0303202c942f9013a0e09db1014e6ac6)
-rw-r--r--functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml6
-rw-r--r--functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml3
-rw-r--r--upper-constraints.txt2
3 files changed, 4 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
index 71a159963..80ee5335f 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
@@ -395,8 +395,7 @@
-
args:
{{ vm_params(image_name, flavor_name) }}
- create_floating_ip_args:
- floating_network: {{ floating_network }}
+ floating_network: {{ floating_network }}
nics:
- net-id: {{ netid }}
context:
@@ -412,8 +411,7 @@
-
args:
{{ vm_params(image_name, flavor_name) }}
- create_floating_ip_args:
- floating_network: {{ floating_network }}
+ floating_network: {{ floating_network }}
nics:
- net-id: {{ netid }}
context:
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
index 2d5051486..ffbc5f278 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
@@ -143,8 +143,7 @@
-
args:
{{ vm_params(image_name, flavor_name) }}
- create_floating_ip_args:
- floating_network: {{ floating_network }}
+ floating_network: {{ floating_network }}
nics:
- net-id: {{ netid }}
context:
diff --git a/upper-constraints.txt b/upper-constraints.txt
index e7e78cd8c..13f085f15 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -11,7 +11,7 @@ bandit===1.1.0
ruamel.yaml.jinja2==0.2.2
-e git+https://opendev.org/openstack/tempest@cfddd400ce403bc6fb3740c0722eebd021f8b11c#egg=tempest
-e git+https://opendev.org/openstack/rally.git@3.1.0#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git@2.0.0#egg=rally-openstack
+git+https://opendev.org/openstack/rally-openstack.git@2.1.0#egg=rally-openstack
git+https://github.com/xrally/xrally-kubernetes.git@e4c605fa0ae0cae63ce5ac19ce8516f0bdd5e868#egg=xrally-kubernetes
pylint===1.9.5;python_version=='2.7'
pylint===2.4.4;python_version=='3.8'