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/.gitlab-ci.yml

@@ -125,7 +125,7 @@ end2end_test ecoc24:
     - docker ps -a
     
     # Clean old docker images
-    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
+    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi -f
 
   #coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
   rules:

src/tests/ecoc24/Dockerfile

@@ -79,17 +79,17 @@ COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
 COPY src/tests/*.py ./tests/
-#COPY src/tests/ofc24/__init__.py ./tests/ofc24/__init__.py
-#COPY src/tests/ofc24/descriptors/topology.json ./tests/ofc24/descriptors/topology.json
-#COPY src/tests/ofc24/descriptors/service-unidir.json ./tests/ofc24/descriptors/service-unidir.json
-#COPY src/tests/ofc24/descriptors/service-bidir.json ./tests/ofc24/descriptors/service-bidir.json
-#COPY src/tests/ofc24/tests/. ./tests/ofc24/tests/
+COPY src/tests/ofc24/__init__.py ./tests/ofc24/__init__.py
+COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/descriptor_ip.json
+COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/descriptor_opt.json
+COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/link_mapping.json
+COPY src/tests/ofc24/tests/. ./tests/ofc24/tests/
 
 RUN tee ./run_tests.sh <<EOF
 #!/bin/bash
 source /var/teraflow/tfs_runtime_env_vars.sh
 export PYTHONPATH=/var/teraflow
-#pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_bootstrap.py             --junitxml=/opt/results/report_bootstrap.xml
+pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_bootstrap.py             --junitxml=/opt/results/report_bootstrap.xml
 #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_unidir.py --junitxml=/opt/results/report_create_service_unidir.xml
 #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_unidir.py --junitxml=/opt/results/report_delete_service_unidir.xml
 #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py  --junitxml=/opt/results/report_create_service_bidir.xml
@@ -98,13 +98,6 @@ export PYTHONPATH=/var/teraflow
 EOF
 RUN chmod ug+x ./run_tests.sh
 
-RUN tee /opt/results/report_dummy.xml <<EOF
-<?xml version='1.0' standalone='yes'?>
-<hola>
-    Ejemplo
-</hola>
-EOF
-RUN chmod ug+x ./run_tests.sh
 
 
 

src/tests/ecoc24/descriptors/emulated/link_mapping.json

 {
-    "contexts": [
-        {"context_id": {"context_uuid": {"uuid": "admin"}}}
+    "contexts":[
+       {
+          "context_id":{
+             "context_uuid":{
+                "uuid":"admin"
+             }
+          }
+       }
     ],
-    "topologies": [
-        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
+    "topologies":[
+       {
+          "topology_id":{
+             "context_id":{
+                "context_uuid":{
+                   "uuid":"admin"
+                }
+             },
+             "topology_uuid":{
+                "uuid":"admin"
+             }
+          }
+       }
     ],
-    "links": [
-        {"link_id": {"link_uuid": {"uuid": "IP1_CTP1-MGON1_OTP1"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "CTP1"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON1"}}, "endpoint_uuid": {"uuid": "OTP1"}}
-        ]},
-            {"link_id": {"link_uuid": {"uuid": "IP1_CTP2-MGON1_OTP2"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "CTP2"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON1"}}, "endpoint_uuid": {"uuid": "OTP2"}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "IP1CTP3-MGON1_OTP3"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "CTP3"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON1"}}, "endpoint_uuid": {"uuid": "OTP3"}}
-        ]},            
-        {"link_id": {"link_uuid": {"uuid": "IP2_CTP1-MGON3_OTP1"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "CTP1"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON3"}}, "endpoint_uuid": {"uuid": "OTP1"}}
-        ]},
-            {"link_id": {"link_uuid": {"uuid": "IP2_CTP2-MGON3_OTP2"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "CTP2"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON3"}}, "endpoint_uuid": {"uuid": "OTP2"}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "IP2_CTP3-MGON3_OTP3"}}, "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "CTP3"}},
-            {"device_id": {"device_uuid": {"uuid": "MG-ON3"}}, "endpoint_uuid": {"uuid": "OTP3"}}
-        ]}
+    "links":[
+       {
+          "link_id":{
+             "link_uuid":{
+                "uuid":"CSGW1_CTP1-OTP1"
+             }
+          },
+          "link_endpoint_ids":[
+             {
+                "device_id":{
+                   "device_uuid":{
+                      "uuid":"CSGW1"
+                   }
+                },
+                "endpoint_uuid":{
+                   "uuid":"PORT-xe5"
+                }
+             },
+             {
+                "device_id":{
+                   "device_uuid":{
+                      "uuid":"OTP1.1"
+                   }
+                },
+                "endpoint_uuid":{
+                   "uuid":"P2"
+                }
+             }
+          ]
+       },
+       {
+          "link_id":{
+             "link_uuid":{
+                "uuid":"CSGW2_CTP1-OTP1"
+             }
+          },
+          "link_endpoint_ids":[
+             {
+                "device_id":{
+                   "device_uuid":{
+                      "uuid":"CSGW2"
+                   }
+                },
+                "endpoint_uuid":{
+                   "uuid":"PORT-xe5"
+                }
+             },
+             {
+                "device_id":{
+                   "device_uuid":{
+                      "uuid":"OTP2.1"
+                   }
+                },
+                "endpoint_uuid":{
+                   "uuid":"P2"
+                }
+             }
+          ]
+       }
     ]
-}
+ }
\ No newline at end of file