Return string from validate port

Validate port was returning an int, which was causing casting problems.
Change to return a string

Testing: unit tests, update product test, manual verification

Author: rschlussel-zz

prestoadmin/util/validators.py

@@ -31,18 +31,18 @@ def validate_username(username):
 
 
 def validate_port(port):
+    if not isinstance(port, basestring):
+        raise ConfigurationError('Port must be of type string, but found %s.' %
+                                 str(type(port)))
     try:
         port_int = int(port)
-    except TypeError:
-        raise ConfigurationError('Port must be of type string, but '
-                                 'found ' + str(type(port)) + '.')
     except ValueError:
         raise ConfigurationError('Invalid value ' + port + ': '
                                  'port must be a number between 1 and 65535.')
     if not port_int > 0 or not port_int < 65535:
         raise ConfigurationError('Invalid port number ' + port +
                                  ': port must be between 1 and 65535')
-    return port_int
+    return port
 
 
 def validate_host(host):

tests/product/test_server_install.py

@@ -351,6 +351,10 @@ def test_install_interactive_with_hostnames(self):
             self.assert_has_default_connector(container)
             self.assert_has_jmx_connector(container)
 
+        # make sure that we don't get an error when using the written out
+        # configs
+        self.run_prestoadmin('server start')
+
     def test_install_interactive_with_ips(self):
         ips = self.cluster.get_ip_address_dict()
         rpm_name = self.installer.copy_presto_rpm_to_master()

tests/unit/util/test_validators.py

@@ -52,16 +52,18 @@ def test_invalid_host_type(self):
                                 (["my", "list"]))
 
     def test_valid_port(self):
-        port = 1234
+        port = '1234'
         self.assertEqual(validators.validate_port(port), port)
 
+    def test_invalid_port_type(self):
+        self.assertRaisesRegexp(ConfigurationError,
+                                "Port must be of type string, "
+                                "but found <type 'int'>.",
+                                validators.validate_port, 1234)
+
     def test_invalid_port(self):
         self.assertRaisesRegexp(ConfigurationError,
                                 "Invalid port number 99999999: port must be "
                                 "between 1 and 65535",
                                 validators.validate_port,
                                 ("99999999"))
-
-    def test_invalid_port_type(self):
-        self.assertRaises(ConfigurationError,
-                          validators.validate_port, (["123"]))