Now performing actions for runtime

vlead · Feb 18, 2014 · d9b7c39 · d9b7c39
1 parent e78caed
commit d9b7c39
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/VMManager/LabActionRunner.py b/src/VMManager/LabActionRunner.py
@@ -14,7 +14,7 @@ class LabActionRunner:
     This object is driven by the lab-requirements specification.
 
     """
-    def __init__(self, actions, path_prefix):
+    def __init__(self, actions, path_prefix=""):
         self._actions = actions
         self._path_prefix = path_prefix
 

diff --git a/src/VMManager/VMManager.py b/src/VMManager/VMManager.py
@@ -81,11 +81,17 @@ def test_lab(lab_src_url, version=None):
         # instantiate the object
 
     def get_build_steps_spec(lab_spec):
-        return {"build_steps": lab_spec['lab'][u'build_requirements']['platform']['build_steps']}
+        return {"build_steps": lab_spec['lab']['build_requirements']['platform']['build_steps']}
 
-    def get_installer_steps_spec(lab_spec):
+    def get_build_installer_steps_spec(lab_spec):
         return {"installer": lab_spec['lab']['build_requirements']['platform']['installer']}
 
+    def get_runtime_installer_steps(lab_spec):
+        return {"installer": lab_spec['lab']['runtime_requirements']['platform']['installer']}
+
+    def get_runtime_actions_steps(lab_spec):
+        return lab_spec['lab']['runtime_requirements']['platform']['lab_actions']
+
     def construct_repo_name():
         repo = lab_src_url.split('/')[-1]
         repo_name = repo[:-4] if repo[-4:] == ".git" else repo
@@ -141,12 +147,19 @@ def get_lab_spec(repo_name):
 
     lab_spec = get_lab_spec(repo_name)
     try:
-        lar = LabActionRunner(get_installer_steps_spec(lab_spec), "")
+        lar = LabActionRunner(get_build_installer_steps_spec(lab_spec))
         lar.run_install_source()
 
-        lar = LabActionRunner(get_build_steps_spec(lab_spec), "")
+        lar = LabActionRunner(get_build_steps_spec(lab_spec))
         lar.run_build_steps()
 
+        lar = LabActionRunner(get_runtime_installer_steps(lab_spec))
+        lar.run_install_source()
+
+        lar = LabActionRunner(get_runtime_actions_steps(lab_spec))
+        lar.run_init_lab()
+        lar.run_start_lab()
+
         return "Success"
     except Exception, e:
         VMM_LOGGER.error("VMManager.test_lab failed: " + str(e))