X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=bluval%2Fbluval.py;h=a0f02d2caadf4d7cbf9f5c72ce65abdd5386630d;hp=1580a40346cc8dfb93a83cfb01b99976486ab6a1;hb=5e95a40c528d9c6ae881a0e9c49628bb20c344ec;hpb=fb63aa36ea17d40af4d0684d768d5e6cc3f80e31

diff --git a/bluval/bluval.py b/bluval/bluval.py
index 1580a40..a0f02d2 100644
--- a/bluval/bluval.py
+++ b/bluval/bluval.py
@@ -20,20 +20,15 @@ testcase
 """
 
 import subprocess
-from pathlib import Path
 import sys
 import traceback
+from pathlib import Path
+
 import click
 import yaml
 
-class BluvalError(Exception):
-    """Base class for exceptions in this module."""
-    pass
-
-
-class ShowStopperError(Exception):
-    """Showstopper test case failed"""
-    pass
+from bluutil import BluvalError
+from bluutil import ShowStopperError
 
 
 def run_testcase(testcase):
@@ -48,8 +43,10 @@ def run_testcase(testcase):
     show_stopper = testcase.get('show_stopper', "False")
     what = testcase.get('what')
     mypath = Path(__file__).absolute()
-    results_path = mypath.parents[2].joinpath("results/"+testcase.get('layer')+"/"+what)
-    test_path = mypath.parents[1].joinpath("tests/"+testcase.get('layer')+"/"+what)
+    results_path = mypath.parents[2].joinpath(
+        "results/"+testcase.get('layer')+"/"+what)
+    test_path = mypath.parents[1].joinpath(
+        "tests/"+testcase.get('layer')+"/"+what)
 
     # add to the variables file the path to where to sotre the logs
     variables_file = mypath.parents[1].joinpath("tests/variables.yaml")
@@ -58,7 +55,8 @@ def run_testcase(testcase):
     variables_file.write_text(str(variables_dict))
 
     # run the test
-    args = ["robot", "-V", str(variables_file), "-d", str(results_path), str(test_path)]
+    args = ["robot", "-V", str(variables_file), "-d",
+            str(results_path), str(test_path)]
 
     print('Executing testcase {}'.format(name))
     print('show_stopper {}'.format(show_stopper))
@@ -71,6 +69,7 @@ def run_testcase(testcase):
         #print('Error while executing {}'.format(args))
         raise BluvalError(OSError)
 
+
 def validate_layer(blueprint, layer):
     """validates a layer by validating all testcases under that layer
     """
@@ -87,53 +86,13 @@ def validate_blueprint(yaml_loc, layer):
     with open(str(yaml_loc)) as yaml_file:
         yamldoc = yaml.safe_load(yaml_file)
     blueprint = yamldoc['blueprint']
-    if layer is None or layer == "all":
-        for each_layer in blueprint['layers']:
-            validate_layer(blueprint, each_layer)
-    else:
-        validate_layer(blueprint, layer)
-
-
-def invoke_docker(bluprint, layer):
-    """Start docker container for given layer
-    """
-    cmd = ("docker run"
-           " -v $HOME/.ssh:/root/.ssh"
-           " -v $HOME/.kube/config:/root/.kube/config"
-           " -v $VALIDATION_HOME/tests/variables.yaml:"
-           "/opt/akraino/validation/tests/variables.yaml"
-           " -v $AKRAINO_HOME/results:/opt/akraino/results"
-           " akraino/validation:{0}-latest"
-           " bin/sh -c"
-           " 'cd /opt/akraino/validation "
-           "&& python bluval/bluval.py -l {0} {1}'").format(layer, bluprint)
-    args = [cmd]
-    try:
-        print('Invoking {}'.format(args))
-        subprocess.call(args, shell=True)
-    except OSError:
-        #print('Error while executing {}'.format(args))
-        raise BluvalError(OSError)
-
-
-def invoke_dockers(yaml_loc, layer, blueprint_name):
-    """Parses yaml file and starts docker container for one/all layers
-    """
-    with open(str(yaml_loc)) as yaml_file:
-        yamldoc = yaml.safe_load(yaml_file)
-    blueprint = yamldoc['blueprint']
-    if layer is None or layer == "all":
-        for each_layer in blueprint['layers']:
-            invoke_docker(blueprint_name, each_layer)
-    else:
-        invoke_docker(blueprint_name, layer)
+    validate_layer(blueprint, layer)
 
 
 @click.command()
 @click.argument('blueprint')
 @click.option('--layer', '-l')
-@click.option('--delegate', '-d', is_flag=True)
-def main(blueprint, layer, delegate):
+def main(blueprint, layer):
     """Takes blueprint name and optional layer. Validates inputs and derives
     yaml location from blueprint name. Invokes validate on blue print.
     """
@@ -142,10 +101,7 @@ def main(blueprint, layer, delegate):
     if layer is not None:
         layer = layer.lower()
     try:
-        if delegate is not None:
-            invoke_dockers(yaml_loc, layer, blueprint)
-        else:
-            validate_blueprint(yaml_loc, layer)
+        validate_blueprint(yaml_loc, layer)
     except ShowStopperError as err:
         print('ShowStopperError:', err)
     except BluvalError as err:
@@ -158,6 +114,7 @@ def main(blueprint, layer, delegate):
         print("-"*60)
         raise
 
+
 if __name__ == "__main__":
     # pylint: disable=no-value-for-parameter
     main()