From 8464efab7e811a32dcb18c8187478276cdce164b Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 19 Apr 2018 15:45:16 -0700
Subject: [PATCH] Use short model names

Issue #34 Long model names cause OpenStack DNS to break. We gain fairly
little by stacking information in the model name.

This change uses zaza-$TIMESTAMP as model names.

Closes Issue: #34
---
 unit_tests/test_zaza_charm_lifecycle_func_test_runner.py | 4 ++--
 zaza/charm_lifecycle/func_test_runner.py                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py b/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py
index 35081ef..1b1c028 100644
--- a/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py
+++ b/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py
@@ -7,8 +7,8 @@ import unit_tests.utils as ut_utils
 class TestCharmLifecycleFuncTestRunner(ut_utils.BaseTestCase):
 
     def test_generate_model_name(self):
-        mname = lc_func_test_runner.generate_model_name('mycharm', 'bundle')
-        self.assertTrue(mname.startswith('zaza-mycharmbundle'))
+        mname = lc_func_test_runner.generate_model_name()
+        self.assertTrue(mname.startswith('zaza-'))
 
     def test_parser(self):
         # Test defaults
diff --git a/zaza/charm_lifecycle/func_test_runner.py b/zaza/charm_lifecycle/func_test_runner.py
index 811c315..84de395 100644
--- a/zaza/charm_lifecycle/func_test_runner.py
+++ b/zaza/charm_lifecycle/func_test_runner.py
@@ -13,9 +13,9 @@ import zaza.charm_lifecycle.deploy as deploy
 import zaza.charm_lifecycle.test as test
 
 
-def generate_model_name(charm_name, bundle_name):
+def generate_model_name():
     timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
-    return 'zaza-{}{}{}'.format(charm_name, bundle_name, timestamp)
+    return 'zaza-{}'.format(timestamp)
 
 
 def func_test_runner(keep_model=False, smoke=False):
@@ -34,7 +34,7 @@ def func_test_runner(keep_model=False, smoke=False):
     bundles = test_config[bundle_key]
     last_test = bundles[-1]
     for t in bundles:
-        model_name = generate_model_name(test_config['charm_name'], t)
+        model_name = generate_model_name()
         # Prepare
         prepare.prepare(model_name)
         # Deploy