Merge pull request CentOS-PaaS-SIG#372 from herlo/develop

Move to v1.0.4

linchpin/api/__init__.py

@@ -49,6 +49,8 @@ def __init__(self, ctx):
             self.workspace = os.path.realpath(os.path.curdir)
 
 
+
+
     def get_cfg(self, section=None, key=None, default=None):
         """
         Get cfgs value(s) by section and/or key, or the whole cfgs object
@@ -208,7 +210,7 @@ def set_magic_vars(self):
         self.set_evar('topology_name', topology_name)
 
 
-    def run_playbook(self, pinfile, targets='all', playbook='up'):
+    def run_playbook(self, pinfile, targets=[], playbook='up'):
         """
         This function takes a list of targets, and executes the given
         playbook (provison, destroy, etc.) for each provided target.
@@ -271,6 +273,10 @@ def run_playbook(self, pinfile, targets='all', playbook='up'):
         else:
             raise LinchpinError("One or more invalid targets found")
 
+        # create localhost file in workspace for user if it doesn't exist
+        if not os.path.exists('{0}/localhost'.format(self.workspace)):
+            with open('{0}/localhost'.format(self.workspace), 'w') as f:
+                f.write('localhost\n')
 
         for target in targets:
             self.set_evar('topology', self.find_topology(
@@ -297,6 +303,7 @@ def run_playbook(self, pinfile, targets='all', playbook='up'):
             if 'pre' in self.pb_hooks:
                 self.hook_state = '{0}{1}'.format('pre', playbook)
 
+
             # invoke the appropriate playbook
             return_code, results[target] = (
                 self._invoke_playbook(playbook=playbook,

linchpin/tests/api/test_init_pass.py

@@ -205,22 +205,27 @@ def test_get_evar_item():
 #    lpc.load_config()
 #    lpa = LinchpinAPI(lpc)
 
+
 @with_setup(setup_lp_api)
 def test_run_playbook():
 
     pf_w_path = '{0}/{1}'.format(lpc.workspace, pinfile)
     return_code, results = lpa.run_playbook(pf_w_path, targets=[provider])
 
-    for res in results[provider]:
-        name = res._task.get_name()
-        failed = False
-        if res.is_failed():
-            failed = True
+    failed = False
+    if return_code:
+        failed = True
+        for res in results[provider]:
+            name = res._task.get_name()
+            if res.is_failed():
+                print('name: {}'.format(name))
 
     assert not failed
 
+
 @with_setup(setup_lp_fetch_env)
 def test_fetch_local():
+
     src_path = os.path.join(mockpath, 'fetch/ws1')
     src_uri = 'file://{0}'.format(src_path)
     lpa.lp_fetch(src_uri, 'workspace', None)
@@ -233,8 +238,10 @@ def test_fetch_local():
     shutil.rmtree(os.path.join(os.path.expanduser('~'), '.cache/linchpin/'))
     assert_list_equal(src_list, dest_list)
 
+
 @with_setup(setup_lp_fetch_env)
 def test_fetch_git():
+
     src_url = 'https://github.com/agharibi/SampleLinchpinDirectory.git'
     lpa.lp_fetch(src_url, 'topologies', 'ws1')
 
@@ -246,8 +253,10 @@ def test_fetch_git():
 
     assert_list_equal(src_list, dest_list)
 
+
 @with_setup(setup_lp_fetch_env)
 def test_fetch_cache():
+
     src_url = 'https://github.com/agharibi/SampleLinchpinDirectory.git'
     lpa.lp_fetch(src_url, 'topologies', 'ws1')
     lpa.lp_fetch(src_url, 'topologies', 'ws1')

linchpin/tests/mockdata/contextdata.py

@@ -80,8 +80,10 @@ def load_config_data(self, provider='dummy'):
         self.cfg_data['logger']['file'] = self.logfile
 
         self.evars = self.cfg_data.get('evars', {})
-
+
+
     def load_new_config(self, provider='dummy'):
+
         self.cfg_data = {}
 
         expanded_path = None
@@ -100,7 +102,7 @@ def load_new_config(self, provider='dummy'):
                 existing_paths.append(expanded_path)
 
         if len(existing_paths) == 0:
-            raise Linchpinerror('Configuration file not foud in'
+            raise LinchpinError('Configuration file not foud in'
                                 ' path: {0}'.format(CONFIG_PATH))
         try:
             for path in existing_paths:
@@ -122,7 +124,7 @@ def load_new_config(self, provider='dummy'):
         except ConfigParser.InterpolationSyntaxError as e:
             raise LinchpinError('Unable to parse configuration file properly:'
                             '{0}'.format(e))
-    
+
         # override logger file
         self.cfg_data['logger']['file'] = self.logfile
 

linchpin/tests/mockdata/dummy/fetch/ws1/localhost

@@ -0,0 +1 @@
+localhost

linchpin/tests/mockdata/dummy/fetch/ws2/localhost

@@ -0,0 +1 @@
+localhost

linchpin/tests/mockdata/dummy/localhost

@@ -0,0 +1 @@
+localhost

linchpin/version.py

@@ -1,2 +1,2 @@
-__short_version__ = '1.0.3'
-__version__ = '1.0.3'
+__short_version__ = '1.0.4'
+__version__ = '1.0.4'