X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=bluval%2Fbluval.py;h=8ed6bdfb36714f6738f67a302c767593f192bf52;hp=bf5e0c854a0f35f1301099df1ae046be0a1ebafe;hb=81fa8e8789ab70cd5058260d299510e5d88dea42;hpb=ab78424814fb38a688567daad9c7091b5f58d3d6

diff --git a/bluval/bluval.py b/bluval/bluval.py
index bf5e0c8..8ed6bdf 100644
--- a/bluval/bluval.py
+++ b/bluval/bluval.py
@@ -15,48 +15,73 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 ##############################################################################
-"""This module parses yaml file, reads sections, testcases and executes each
+"""This module parses yaml file, reads layers, testcases and executes each
 testcase
 """
 
 import subprocess
-import sys
+import click
 import yaml
 
 def run_testcase(testcase):
     """Runs a single testcase
     """
     show_stopper = testcase.get('show_stopper', False)
+    what = testcase.get('what')
+    variables = "variables.yaml"
+    results = "results/"+testcase.get('layer')+"/"+what
+    test_path = "tests/"+testcase.get('layer')+"/"+what
+    args = ["robot", "-V", variables, "-d", results, test_path]
 
     print('Executing testcase {}'.format(testcase['name']))
     print('          show_stopper {}'.format(show_stopper))
-    cmd = 'robot {}'.format(testcase['what'])
-    print('Invoking {}'.format(cmd))
+    print('Invoking {}'.format(args))
     try:
-        status = subprocess.call(cmd, shell=True)
-        if status != 0 and testcase['show_stopper']:
+        status = subprocess.call(args, shell=False)
+        if status != 0 and show_stopper:
             print('Show stopper testcase failed')
             return status
     except OSError:
-        print('Error while executing {}'.format(cmd))
+        print('Error while executing {}'.format(args))
         return -1
     return status
 
 
-def parse_yaml(testcase_loc):
-    """Parse yaml file and do tasks on each testcase
+def validate_layer(blueprint, layer):
+    """validates a layer by validating all testcases under that layer
     """
-    with open(testcase_loc) as testcase_file:
-        testcases = yaml.safe_load(testcase_file)
-    blueprint = testcases['blueprint']
-    for section in blueprint['sections']:
-        print('## Section {}'.format(section))
-        for testcase in blueprint[section]:
-            run_testcase(testcase)
+    print('## Layer {}'.format(layer))
+    for testcase in blueprint[layer]:
+        testcase['layer'] = layer
+        run_testcase(testcase)
+
+
+def validate_blueprint(yaml_loc, layer):
+    """Parse yaml file and validates given layer. If no layer given all layers
+    validated
+    """
+    with open(yaml_loc) as yaml_file:
+        yamldoc = yaml.safe_load(yaml_file)
+    blueprint = yamldoc['blueprint']
+    if layer is None:
+        for each_layer in blueprint['layers']:
+            validate_layer(blueprint, each_layer)
+    else:
+        validate_layer(blueprint, layer)
+
+
+@click.command()
+@click.argument('blueprint')
+@click.option('--layer', '-l')
+def main(blueprint, layer):
+    """Takes blueprint name and optional layer. Validates inputs and derives
+    yaml location from blueprint name. Invokes validate on blue print.
+    """
+    yaml_loc = 'bluval/bluval-{}.yaml'.format(blueprint)
+    layer = layer.lower()
+    validate_blueprint(yaml_loc, layer)
 
 
 if __name__ == "__main__":
-    if len(sys.argv) != 2:
-        print('usage: bluval.py <testcase.yaml>')
-        sys.exit(1)
-    parse_yaml(sys.argv[1])
+    # pylint: disable=no-value-for-parameter
+    main()