Merge pull request #1691 from grycap/devel

Improve additional_dns_names code

Author: micafer

IM/connectors/CloudConnector.py

@@ -635,13 +635,19 @@ def get_dns_entries(self, vm):
             additional_dns_names = system.getValue('net_interface.%d.additional_dns_names' % num_conn)
             if additional_dns_names:
                 for dns_name in additional_dns_names:
-                    dns_parts = dns_name.split("@")
-                    if len(dns_parts) != 2:
-                        self.log_error("Invalid format for additional name: %s." % dns_name)
-                        self.error_messages = "Invalid format for additional name: %s." % dns_name
-                        break
-                    hostname = dns_parts[0]
-                    domain = dns_parts[1]
+                    if "@" in dns_name:
+                        dns_parts = dns_name.split("@")
+                        if len(dns_parts) != 2:
+                            self.log_error("Invalid format for additional name: %s." % dns_name)
+                            self.error_messages = "Invalid format for additional name: %s." % dns_name
+                            break
+                        hostname = dns_parts[0]
+                        domain = dns_parts[1]
+                    else:
+                        dns_parts = dns_name.split(".")
+                        hostname = dns_parts[0]
+                        domain = ".".join(dns_parts[1:])
+
                     if not domain.endswith("."):
                         domain += "."
                     if domain != "localdomain." and ip and hostname:

test/unit/connectors/Linode.py

@@ -184,7 +184,7 @@ def test_30_updateVMInfo(self, get_dns_driver, get_driver):
             memory.size=512m and
             net_interface.0.connection = 'net' and
             net_interface.0.dns_name = 'test.domain.com' and
-            net_interface.0.additional_dns_names = ['some.test@domain.com'] and
+            net_interface.0.additional_dns_names = ['other-test.domain.com'] and
             disk.0.os.name = 'linux' and
             disk.0.image.url = 'lin://linode/ubuntu' and
             disk.0.os.credentials.username = 'user' and
@@ -246,7 +246,7 @@ def test_30_updateVMInfo(self, get_dns_driver, get_driver):
         self.assertEqual(dns_driver.create_record.call_args_list[0][0][0], 'test')
         self.assertEqual(dns_driver.create_record.call_args_list[0][0][2], 'A')
         self.assertEqual(dns_driver.create_record.call_args_list[0][0][3], '8.8.8.8')
-        self.assertEqual(dns_driver.create_record.call_args_list[1][0][0], 'some.test')
+        self.assertEqual(dns_driver.create_record.call_args_list[1][0][0], 'other-test')
 
         self.assertNotIn("ERROR", self.log.getvalue(), msg="ERROR found in log: %s" % self.log.getvalue())