From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 7 Dec 2020 08:00:02 +0000 (+0100)
Subject: Update NovaServers.boot_server_associate_and_dissociate_floating_ip
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F71639%2F1;p=functest.git

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>
---

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: