fixed tox files

Signed-off-by: Baha Mesleh <baha.mesleh@nokia.com>
Change-Id: I8fc68449bf614d4f52c92d99f6cca6ba83b7548a

diff --git a/cmdatahandlers/tox.ini b/cmdatahandlers/tox.ini
index 488964d..dcf5621 100644 (file)
--- a/cmdatahandlers/tox.ini
+++ b/cmdatahandlers/tox.ini
@@ -11,7 +11,7 @@ setenv =
 
 passenv = COVERAGE_FILE
 
-commands = /bin/cp -R {toxinidir}/tests/mocked_dependencies/cmdatahandlers {toxworkdir}/py27-pytest/lib/python2.7/site-packages/
+commands = /bin/cp -R {toxinidir}/tests/mocked_dependencies/serviceprofiles {toxworkdir}/py27-pytest/lib/python2.7/site-packages/
            pytest -vv \
            --basetemp={envtmpdir} \
            --pep8 \
@@ -52,7 +52,7 @@ pep8ignore = src/setup.py ALL
              tests/* ALL
 
 [testenv:pylint]
-commands = /bin/cp -R {toxinidir}/tests/mocked_dependencies/cmdatahandlers {toxworkdir}/pylint/lib/python2.7/site-packages/
+commands = /bin/cp -R {toxinidir}/tests/mocked_dependencies/serviceprofiles {toxworkdir}/pylint/lib/python2.7/site-packages/
            -pylint --rcfile={toxinidir}/pylintrc {posargs:cmdatahandlers.performance_profiles}
 
 deps=

diff --git a/cmframework/src/cmframework/utils/cmansibleplaybooks.py b/cmframework/src/cmframework/utils/cmansibleplaybooks.py
index 6d26dc5..5a91a1b 100644 (file)
--- a/cmframework/src/cmframework/utils/cmansibleplaybooks.py
+++ b/cmframework/src/cmframework/utils/cmansibleplaybooks.py
@@ -35,20 +35,29 @@ class AnsiblePlaybooks(object):
         postconfig_lists, postconfig_size = self._get_playbook_lists(self.postconfig_path)
         finalize_lists, finalize_size = self._get_playbook_lists(self.finalize_path)
 
-        number_of_playbooks = bootstrapping_size \
-                              + provisioning_size \
-                              + postconfig_size \
-                              + finalize_size
+        number_of_playbooks = bootstrapping_size+provisioning_size+postconfig_size+finalize_size
 
         playbook_percentage_value = 99.0 / number_of_playbooks
 
-        self._generate_playbook(bootstrapping_lists, self.bootstrapping_playbook, 0, playbook_percentage_value)
+        self._generate_playbook(bootstrapping_lists,
+                                self.bootstrapping_playbook,
+                                0,
+                                playbook_percentage_value)
+
         progress_start = bootstrapping_size*playbook_percentage_value
-        self._generate_playbook(provisioning_lists, self.provisioning_playbook, progress_start, playbook_percentage_value)
+        self._generate_playbook(provisioning_lists,
+                                self.provisioning_playbook,
+                                progress_start,
+                                playbook_percentage_value)
         progress_start = (bootstrapping_size+provisioning_size)*playbook_percentage_value
-        self._generate_playbook(postconfig_lists, self.postconfig_playbook, progress_start, playbook_percentage_value)
-        progress_start = (bootstrapping_size+provisioning_size+postconfig_size)*playbook_percentage_value
-        self._generate_playbook(finalize_lists, self.finalize_playbook, progress_start, playbook_percentage_value)
+        self._generate_playbook(postconfig_lists, self.postconfig_playbook,
+                                progress_start, playbook_percentage_value)
+        progress_start = (bootstrapping_size +
+                          provisioning_size+postconfig_size)*playbook_percentage_value
+        self._generate_playbook(finalize_lists,
+                                self.finalize_playbook,
+                                progress_start,
+                                playbook_percentage_value)
 
     def _get_playbook_lists(self, directory):
         graph = self._get_dependency_graph(directory)