Commit a76319d6 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OECC/PSC'22: 

- Improved descriptors
- Corrected dump_logs script
parent 639ebee2

src/tests/oeccpsc22/descriptors/inter-domain-service.json→src/tests/oeccpsc22/descriptors/inter-domain-slice.json

+6 −7
Original line number Diff line number Diff line 
{

    "services": [

    "slices": [

        {

            "service_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "idc-l2-svc"}},

            "service_type": 2,

            "service_status": {"service_status": 1},

            "service_endpoint_ids": [

            "slice_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "slice_uuid": {"uuid": "idc-l2-slice"}},

            "slice_status": {"slice_status": 1},

            "slice_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "DC1"}}, "endpoint_uuid": {"uuid": "int"}},

                {"device_id": {"device_uuid": {"uuid": "DC2"}}, "endpoint_uuid": {"uuid": "int"}}

            ],

            "service_constraints": [

            "slice_constraints": [

                {"sla_capacity": {"capacity_gbps": 10.0}},

                {"sla_latency": {"e2e_latency_ms": 15.2}}

            ],

            "service_config": {"config_rules": [

            "slice_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "/settings", "resource_value": {"mtu": 1512, "vlan_id": 300}}},

                {"action": 1, "custom": {"resource_key": "/device[R1@D1]/endpoint[2]/settings", "resource_value": {"remote_router": "10.0.0.2"}}},

                {"action": 1, "custom": {"resource_key": "/device[R1@D1]/endpoint[5]/settings", "resource_value": {"remote_router": "10.0.0.5"}}},

src/tests/oeccpsc22/dump_logs.sh

+0 −4
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ kubectl --namespace tfs-dom1 logs deployments/serviceservice server > tmp/exec/d 
kubectl --namespace tfs-dom1 logs deployments/pathcompservice frontend > tmp/exec/dom1/pathcomp-frontend.log

kubectl --namespace tfs-dom1 logs deployments/pathcompservice backend > tmp/exec/dom1/pathcomp-backend.log

kubectl --namespace tfs-dom1 logs deployments/sliceservice server > tmp/exec/dom1/slice.log

kubectl --namespace tfs-dom1 logs deployment/computeservice server > tmp/exec/dom1/compute.log

kubectl --namespace tfs-dom1 logs deployment/interdomainservice server > tmp/exec/dom1/interdomain.log

kubectl --namespace tfs-dom1 logs deployment/monitoringservice server > tmp/exec/dom1/monitoring.log

printf "\n"



echo "Collecting logs for Domain 2..."
@@ -37,9 +35,7 @@ kubectl --namespace tfs-dom2 logs deployments/serviceservice server > tmp/exec/d 
kubectl --namespace tfs-dom2 logs deployments/pathcompservice frontend > tmp/exec/dom2/pathcomp-frontend.log

kubectl --namespace tfs-dom2 logs deployments/pathcompservice backend > tmp/exec/dom2/pathcomp-backend.log

kubectl --namespace tfs-dom2 logs deployments/sliceservice server > tmp/exec/dom2/slice.log

kubectl --namespace tfs-dom2 logs deployment/computeservice server > tmp/exec/dom2/compute.log

kubectl --namespace tfs-dom2 logs deployment/interdomainservice server > tmp/exec/dom2/interdomain.log

kubectl --namespace tfs-dom2 logs deployment/monitoringservice server > tmp/exec/dom2/monitoring.log

printf "\n"



echo "Done!"