Revert "Change type of dns_list and ntp_list to text_list (fuel-qa part)"

Implements: blueprint dynamic-fields

This reverts commit 0da392644d.

Change-Id: Ib4d7abd15c97c6e143bcd53776094eab008cd59a

fuelweb_test/helpers/checkers.py

@@ -749,7 +749,7 @@ def check_kernel(kernel, expected_kernel):
 @logwrap
 def external_dns_check(remote_slave):
     logger.info("External dns check")
-    provided_dns = EXTERNAL_DNS
+    provided_dns = EXTERNAL_DNS.split(', ')
     logger.debug("provided to test dns is {}".format(provided_dns))
     cluster_dns = []
     for dns in provided_dns:
@@ -799,7 +799,7 @@ def verify_bootstrap_on_node(remote, os_type, uuid=None):
 @logwrap
 def external_ntp_check(remote_slave, vrouter_vip):
     logger.info("External ntp check")
-    provided_ntp = EXTERNAL_NTP
+    provided_ntp = EXTERNAL_NTP.split(', ')
     logger.debug("provided to test ntp is {}".format(provided_ntp))
     cluster_ntp = []
     for ntp in provided_ntp:

fuelweb_test/models/fuel_web_client.py

@@ -527,7 +527,7 @@ class FuelWebClient(object):
                     and checkers.is_ntpd_active(
                         remote, public_gw):
                 attributes['editable']['external_ntp']['ntp_list']['value'] =\
-                    [public_gw]
+                    public_gw
                 logger.info("Configuring cluster #{0}"
                             "to use NTP server {1}"
                             .format(cluster_id, public_gw))
@@ -535,7 +535,7 @@ class FuelWebClient(object):
 
             if help_data.FUEL_USE_LOCAL_DNS and ('dns_list' not in settings):
                 attributes['editable']['external_dns']['dns_list']['value'] =\
-                    [public_gw]
+                    public_gw
                 logger.info("Configuring cluster #{0} to use DNS server {1}"
                             .format(cluster_id, public_gw))
 

fuelweb_test/settings.py

@@ -451,14 +451,8 @@ BUILD_IMAGES = get_var_as_bool('BUILD_IMAGES', False)
 
 STORE_ASTUTE_YAML = get_var_as_bool('STORE_ASTUTE_YAML', False)
 
-EXTERNAL_DNS = map(
-    str.strip,
-    os.environ.get('EXTERNAL_DNS', '208.67.220.220').split(',')
-)
-EXTERNAL_NTP = map(
-    str.strip,
-    os.environ.get('EXTERNAL_NTP', 'ua.pool.ntp.org').split(',')
-)
+EXTERNAL_DNS = os.environ.get('EXTERNAL_DNS', '208.67.220.220')
+EXTERNAL_NTP = os.environ.get('EXTERNAL_NTP', 'ua.pool.ntp.org')
 DNS_SUFFIX = os.environ.get('DNS_SUFFIX', '.test.domain.local')
 FUEL_MASTER_HOSTNAME = os.environ.get('FUEL_MASTER_HOSTNAME', 'nailgun')
 

fuelweb_test/tests/tests_deployments/tests_neutron_tun/test_ha_tun_group_1.py

@@ -109,10 +109,10 @@ class HaTunGroup1(TestBasic):
         """
         self.env.revert_snapshot("ready_with_9_slaves")
 
-        if len(settings.EXTERNAL_DNS) < 2:
+        if len(settings.EXTERNAL_DNS.split(',')) < 2:
             logging.warning("Less than 2 DNS servers was configured!")
 
-        if len(settings.EXTERNAL_NTP) < 2:
+        if len(settings.EXTERNAL_NTP.split(',')) < 2:
             logging.warning("Less than 2 NTP servers was configured!")
 
         data = {

fuelweb_test/tests/tests_deployments/tests_neutron_tun/test_ha_tun_group_3.py

@@ -61,10 +61,10 @@ class HaTunGroup3(TestBasic):
         """
         self.env.revert_snapshot("ready_with_9_slaves")
 
-        if len(settings.EXTERNAL_DNS) < 2:
+        if len(settings.EXTERNAL_DNS.split(',')) < 2:
             logging.warning("Less than 2 DNS servers was configured!")
 
-        if len(settings.EXTERNAL_NTP) < 2:
+        if len(settings.EXTERNAL_NTP.split(',')) < 2:
             logging.warning("Less than 2 NTP servers was configured!")
 
         data = {

fuelweb_test/tests/tests_strength/test_master_node_failover.py

@@ -156,7 +156,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
         external_dns = settings.EXTERNAL_DNS
         if settings.FUEL_USE_LOCAL_DNS:
             public_gw = self.env.d_env.router(router_name="public")
-            external_dns += [public_gw]
+            external_dns += ',' + public_gw
 
         net_provider_data = {
             'ntp_list': settings.EXTERNAL_NTP,