Merge branch...

Merge branch 'feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers' of https://labs.etsi.org/rep/tfs/controller into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers

src/tests/ecoc24/Dockerfile

@@ -56,7 +56,7 @@ RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;
 # Create component sub-folders, get specific Python packages
 RUN mkdir -p /var/teraflow/tests/ecoc24
 WORKDIR /var/teraflow/tests/ecoc24
-COPY src/tests/ecoc24/requirements.in requirements.in
+COPY src/tests/ofc24/requirements.in requirements.in
 RUN pip-compile --quiet --output-file=requirements.txt requirements.in
 RUN python3 -m pip install -r requirements.txt
 
@@ -81,8 +81,8 @@ COPY src/slice/client/. slice/client/
 COPY src/tests/*.py ./tests/
 COPY src/tests/ecoc24/__init__.py ./tests/ecoc24/__init__.py
 COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/descriptor_ip.json
-COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/descriptor_opt.json
-COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/link_mapping.json
+COPY src/tests/ecoc24/descriptors/descriptor_opt.json ./tests/ecoc24/descriptors/descriptor_opt.json
+COPY src/tests/ecoc24/descriptors/link_mapping.json ./tests/ecoc24/descriptors/link_mapping.json
 COPY src/tests/ecoc24/tests/. ./tests/ecoc24/tests/
 
 RUN tee ./run_tests.sh <<EOF