Merge pull request #23 from gnuoy/feature/zaza-in-model-name

Add zaza to generated model name

unit_tests/test_zaza_charm_lifecycle_func_test_runner.py

@@ -6,6 +6,10 @@ 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'))
+
     def test_parser(self):
         # Test defaults
         args = lc_func_test_runner.parse_args([])

zaza/charm_lifecycle/func_test_runner.py

@@ -15,7 +15,7 @@ import zaza.charm_lifecycle.test as test
 
 def generate_model_name(charm_name, bundle_name):
     timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
-    return '{}{}{}'.format(charm_name, bundle_name, timestamp)
+    return 'zaza-{}{}{}'.format(charm_name, bundle_name, timestamp)
 
 
 def func_test_runner(keep_model=False, smoke=False):