Commit 1918de9c authored by Ville Hallivuori's avatar Ville Hallivuori
Browse files

Update XR Driver functional tests to work with newer TF baseline

parent 7c50154f

src/device/service/drivers/xr/README_XR.md

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ Upload descriptors_emulatex_xr.json via WEB UI to setup fake topology. 
Setup service by following commands in src directory. Kubernetes endpoins change on every build, so setup script is mandatory.



```bash

    source tests/ofc22/setup_test_env.sh 

    source  device/service/drivers/xr/setup_test_env.sh

    python -m pytest --verbose tests/ofc22/tests/test_functional_create_service_xr.py 

```

src/device/service/drivers/xr/setup_test_env.sh

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#!/bin/sh

export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get service/contextservice --namespace tfs  --template '{{.spec.clusterIP}}')

export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service/contextservice --namespace tfs  -o jsonpath='{.spec.ports[?(@.name=="grpc")].port}')

export COMPUTESERVICE_SERVICE_HOST=$(kubectl get service/computeservice --namespace tfs  --template '{{.spec.clusterIP}}')

export COMPUTESERVICE_SERVICE_PORT_HTTP=$(kubectl get service/computeservice --namespace tfs  -o jsonpath='{.spec.ports[?(@.name=="http")].port}')

echo "CONTEXTSERVICE_SERVICE_HOST=$CONTEXTSERVICE_SERVICE_HOST"

echo "CONTEXTSERVICE_SERVICE_PORT_GRPC=$CONTEXTSERVICE_SERVICE_PORT_GRPC"

echo "COMPUTESERVICE_SERVICE_HOST=$COMPUTESERVICE_SERVICE_HOST"

echo "COMPUTESERVICE_SERVICE_PORT_HTTP=$COMPUTESERVICE_SERVICE_PORT_HTTP"

src/tests/ofc22/tests/test_functional_create_service_xr.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ from common.tools.object_factory.Connection import json_connection_id 
from common.tools.object_factory.Device import json_device_id

from common.tools.object_factory.Service import json_service_id

from common.tools.grpc.Tools import grpc_message_to_json_string

from compute.tests.mock_osm.MockOSM import MockOSM

from tests.tools.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from context.client.EventsCollector import EventsCollector

from common.proto.context_pb2 import ContextId, Empty

src/tests/ofc22/tests/test_functional_delete_service_xr.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ from common.tools.object_factory.Connection import json_connection_id 
from common.tools.object_factory.Device import json_device_id

from common.tools.object_factory.Service import json_service_id

from common.tools.grpc.Tools import grpc_message_to_json_string

from compute.tests.mock_osm.MockOSM import MockOSM

from tests.tools.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from context.client.EventsCollector import EventsCollector

from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum