**/*.pyc
**/__pycache__/
**/__pycache__/**
+**/app_tests
**/*.pyc
**/__pycache__/
**/__pycache__/**
+**/app_tests
RUN pip install --upgrade pip
RUN pip install --no-use-pep517 -r /requirements.txt
-COPY ice_validator/ /vvp
+RUN adduser -D vvpuser
+USER vvpuser
+
+COPY --chown=vvpuser ice_validator/ /vvp
WORKDIR /vvp
-ENTRYPOINT ["pytest"]
+ENTRYPOINT ["pytest", "tests"]
return [e for e in errors if e]
+def relative_paths(base_dir, paths):
+ return [os.path.relpath(p, base_dir) for p in paths]
+
+
def generate_json(outpath, template_path, categories):
"""
Creates a JSON summary of the entire test run.
reqs = load_current_requirements()
data = {
"version": "dublin",
- "template_directory": template_path,
+ "template_directory": os.path.splitdrive(template_path)[1].replace(
+ os.path.sep, "/"
+ ),
"timestamp": make_iso_timestamp(),
"checksum": hash_directory(template_path),
"categories": categories,
for result in ALL_RESULTS:
results.append(
{
- "files": result.files,
+ "files": relative_paths(template_path, result.files),
"test_module": result.test_module,
"test_case": result.test_case,
"result": result.outcome,
description: base
parameters:
- vm_role:
- type: number
vnf_id:
type: number
vf_module_id:
type: OS::Nova::Server
properties:
metadata:
- vm_role: { get_param: vm_role }
vnf_id: { get_param: vnf_id }
vf_module_id: { get_param: vf_module_id }
vnf_name: { get_param: vnf_name }
description: base
parameters:
- vm_role:
- type: string
vnf_id:
type: string
vf_module_id:
type: OS::Nova::Server
properties:
metadata:
- vm_role: { get_param: vm_role }
vnf_id: { get_param: vnf_id }
vf_module_id: { get_param: vf_module_id }
vnf_name: { get_param: vnf_name }
assert not set(invalid_networks), (
"Heat templates must only create internal networks "
- "and follow format int_{network-role}_network"
+ "and follow format int_{{network-role}}_network"
"{}".format(", ".join(invalid_networks))
)
check_server_parameter_name(yaml_file, "vf_module_name", "vf_module_name")
-@validates("R-95430")
-def test_vm_role_parameter_type_and_parameter_name(yaml_file):
- check_parameter_type(yaml_file, "vm_role", "string")
- check_server_parameter_name(yaml_file, "vm_role", "vm_role")
-
-
@validates("R-54340")
def test_vf_module_index_parameter_type_and_parameter_name(yaml_file):
check_parameter_type(yaml_file, "vf_module_index", "number")