SNAPS via functest with flavor metadata configurable

The required data for the SNAPS flavors are sent through
the config_functest yaml file in order for the SNAPS scenarios to be
configured accordingly.
If the config_functest yaml file includes empty flavor_extra_specs
or there is not included this parameter, the SNAPS scenarios will be
executed using the hardcoded value.

Change-Id: I4ef46d1fe93497d658414170a72c4520d8f37808
Signed-off-by: Panagiotis Karalis <pkaralis@intracom-telecom.com>
(cherry picked from commit 5a94beb62293151ef6f4e94ed500579de1f3673e)

1 files changed, 15 insertions, 12 deletions

diff --git a/functest/tests/unit/openstack/snaps/test_snaps.py b/functest/tests/unit/openstack/snaps/test_snaps.py
index 8bbf70f4a..9da4f2ac8 100644
--- a/functest/tests/unit/openstack/snaps/test_snaps.py
+++ b/functest/tests/unit/openstack/snaps/test_snaps.py
@@ -176,7 +176,7 @@ class HealthCheckTesting(unittest.TestCase):
             testcase.TestCase.EX_OK, self.health_check.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
+            mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY,
             image_metadata=mock.ANY, netconf_override=None,
             os_creds=self.os_creds, use_keystone=True)
 
@@ -194,7 +194,7 @@ class HealthCheckTesting(unittest.TestCase):
             self.health_check.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
+            mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY,
             image_metadata=mock.ANY, netconf_override=None,
             os_creds=self.os_creds, use_keystone=True)
 
@@ -212,7 +212,7 @@ class HealthCheckTesting(unittest.TestCase):
             testcase.TestCase.EX_OK, self.health_check.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
+            mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY,
             image_metadata=mock.ANY, netconf_override=None,
             os_creds=self.os_creds, use_keystone=True)
 
@@ -243,9 +243,10 @@ class SmokeTesting(unittest.TestCase):
         self.assertEquals(testcase.TestCase.EX_OK, self.smoke.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=None, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
+            ext_net_name='foo', flavor_metadata=mock.ANY,
+            image_metadata=mock.ANY, netconf_override=None,
+            os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True,
+            use_keystone=True)
 
     @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
                 'add_openstack_integration_tests')
@@ -260,9 +261,10 @@ class SmokeTesting(unittest.TestCase):
             testcase.TestCase.EX_TESTCASE_FAILED, self.smoke.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=mock.ANY, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
+            ext_net_name='foo', flavor_metadata=mock.ANY,
+            image_metadata=mock.ANY, netconf_override=mock.ANY,
+            os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True,
+            use_keystone=True)
 
     @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
                 'add_openstack_integration_tests')
@@ -278,9 +280,10 @@ class SmokeTesting(unittest.TestCase):
             testcase.TestCase.EX_OK, self.smoke.is_successful())
         args[0].assert_called_with(mock.ANY)
         args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=None, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
+            ext_net_name='foo', flavor_metadata=mock.ANY,
+            image_metadata=mock.ANY, netconf_override=None,
+            os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True,
+            use_keystone=True)
 
 
 if __name__ == "__main__":