From 8191cd38b2030a9d8816bcc21bd0cbc0119a7d91 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Wed, 24 Aug 2011 14:42:30 +0200
Subject: Thou shalt not use underscores in hostnames

---
 nova/compute/api.py        | 6 +++---
 nova/tests/test_compute.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 69f76bf40..88ba81018 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -55,15 +55,15 @@ def generate_default_hostname(instance):
     """Default function to generate a hostname given an instance reference."""
     display_name = instance['display_name']
     if display_name is None:
-        return 'server_%d' % (instance['id'],)
+        return 'server-%d' % (instance['id'],)
     table = ''
     deletions = ''
     for i in xrange(256):
         c = chr(i)
         if ('a' <= c <= 'z') or ('0' <= c <= '9') or (c == '-'):
             table += c
-        elif c == ' ':
-            table += '_'
+        elif (c == ' ') or (c == '_'):
+            table += '-'
         elif ('A' <= c <= 'Z'):
             table += c.lower()
         else:
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 0523d73b6..6659b81eb 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -175,8 +175,9 @@ class ComputeTestCase(test.TestCase):
             db.instance_destroy(self.context, instance_id)
 
     def test_default_hostname_generator(self):
-        cases = [(None, 'server_1'), ('Hello, Server!', 'hello_server'),
-                 ('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello')]
+        cases = [(None, 'server-1'), ('Hello, Server!', 'hello-server'),
+                 ('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello'),
+                 ('hello_server', 'hello-server')]
         for display_name, hostname in cases:
             ref = self.compute_api.create(self.context,
                 instance_types.get_default_instance_type(), None,
-- 
cgit 


From 326268b9bf5d958263b70c64ca2ed21deac1a14e Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Wed, 24 Aug 2011 18:01:29 +0200
Subject: Let's be more elegant

---
 nova/compute/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 88ba81018..be1dbdd51 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -62,7 +62,7 @@ def generate_default_hostname(instance):
         c = chr(i)
         if ('a' <= c <= 'z') or ('0' <= c <= '9') or (c == '-'):
             table += c
-        elif (c == ' ') or (c == '_'):
+        elif c in " _":
             table += '-'
         elif ('A' <= c <= 'Z'):
             table += c.lower()
-- 
cgit