Merge "Support to specify the valid external network name"

1 files changed, 9 insertions, 1 deletions

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index c3cd6245..284e88b5 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -5,17 +5,25 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+from functest.utils.constants import CONST
+
 from snaps.openstack.utils import neutron_utils, nova_utils
 
 
 def get_ext_net_name(os_creds):
     """
-    Returns the first external network name
+    Returns the configured external network name or
+    the first retrieved external network name
     :param: os_creds: an instance of snaps OSCreds object
     :return:
     """
     neutron = neutron_utils.neutron_client(os_creds)
     ext_nets = neutron_utils.get_external_networks(neutron)
+    if (hasattr(CONST, 'EXTERNAL_NETWORK')):
+        extnet_config = CONST.__getattribute__('EXTERNAL_NETWORK')
+        for ext_net in ext_nets:
+            if ext_net.name == extnet_config:
+                return extnet_config
     return ext_nets[0].name if ext_nets else ""