Merge branch 'main' into test/update-multi-tenant-scenarios

Author: ArthurTonial

.env_integration_tests.example

@@ -8,8 +8,8 @@ CLOUD_SDK_CFG_ADMS_DEFAULT_URI=https://your-adm-host.cfapps.eu20.hana.ondemand.c
 CLOUD_SDK_CFG_ADMS_DEFAULT_RESOURCE=urn:sap:identity:application:provider:name:your-adm-app-name
 
 # AGENT GATEWAY
-APPFND_CONHOS_LANDSCAPE=your-landscape-here
-TENANT_SUBDOMAIN=your-tenant-subdomain-here
+CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=your-landscape-here
+CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=your-tenant-subdomain-here
 AGW_USER_TOKEN=your-user-jwt-here
 
 # AGENT MEMORY

docs/INTEGRATION_TESTS.md

@@ -54,10 +54,10 @@ CLOUD_SDK_CFG_DESTINATION_DEFAULT_URI=https://your-destination-configuration-uri
 CLOUD_SDK_CFG_DESTINATION_DEFAULT_IDENTITYZONE=your-identity-zone-here
 
 # Landscape suffix used to resolve the IAS destination name
-APPFND_CONHOS_LANDSCAPE=your-landscape-here
+CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=your-landscape-here
 
 # Tenant subdomain for multi-tenant lookup
-TENANT_SUBDOMAIN=your-tenant-subdomain-here
+CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=your-tenant-subdomain-here
 
 # User JWT for token exchange scenarios (get_user_auth)
 # If not set, user auth scenarios are automatically skipped
@@ -121,6 +121,18 @@ CLOUD_SDK_CFG_DESTINATION_DEFAULT_URI=https://your-destination-configuration-uri
 CLOUD_SDK_CFG_DESTINATION_DEFAULT_IDENTITYZONE=your-identity-zone-here
 ```
 
+### DMS Integration Tests
+
+For DMS (Document Management Service) integration tests, configure the following variables in `.env_integration_tests`:
+
+```bash
+# DMS Configuration
+CLOUD_SDK_CFG_SDM_DEFAULT_URI=https://your-sdm-api-uri-here
+CLOUD_SDK_CFG_SDM_DEFAULT_UAA='{"url":"https://your-auth-url","clientid":"your-client-id","clientsecret":"your-client-secret","identityzone":"your-identity-zone"}'
+```
+
+**Note**: The test fixture automatically onboards test repositories (standard and version-enabled) at session start and cleans them up on teardown. No pre-existing repositories are required.
+
 ### ObjectStore Integration Tests
 
 For ObjectStore integration tests, configure the following variables in `.env_integration_tests`:
@@ -147,6 +159,7 @@ uv run pytest tests/agent_memory/integration/ -v
 uv run pytest tests/core/integration/auditlog -v
 uv run pytest tests/core/integration/data_anonymization -v
 uv run pytest tests/destination/integration/ -v
+uv run pytest tests/dms/integration/ -v
 uv run pytest tests/objectstore/integration/ -v
 ```
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sap-cloud-sdk"
-version = "0.26.0"
+version = "0.26.1"
 description = "SAP Cloud SDK for Python"
 readme = "README.md"
 license = "Apache-2.0"

src/sap_cloud_sdk/dms/client.py

@@ -110,9 +110,7 @@ def __init__(
             read_timeout=read_timeout,
         )
         self._telemetry_source: Optional[Module] = None
-        logger.debug(
-            "DMSClient initialized for instance '%s'", credentials.instance_name
-        )
+        logger.debug("DMSClient initialized")
 
     @record_metrics(Module.DMS, Operation.DMS_ONBOARD_REPOSITORY)
     def onboard_repository(

src/sap_cloud_sdk/dms/config.py

@@ -19,7 +19,6 @@ class BindingData:
         uaa: JSON string containing XSUAA authentication credentials
     """
 
-    instance_name: str
     uri: str
     uaa: str
 
@@ -91,7 +90,6 @@ def to_credentials(self) -> DMSCredentials:
         token_url = uaa_data["url"].rstrip("/") + "/oauth/token"
 
         return DMSCredentials(
-            instance_name=self.instance_name,
             uri=self.uri,
             client_id=uaa_data["clientid"],
             client_secret=uaa_data["clientsecret"],
@@ -114,7 +112,7 @@ def load_sdm_config_from_env_or_mount(instance: Optional[str] = None) -> DMSCred
     """
     inst = instance or "default"
     binding = BindingData(
-        uri="", uaa="", instance_name=""
+        uri="", uaa=""
     )  # Initialize with empty values; will be populated by resolver
 
     try:

src/sap_cloud_sdk/dms/model.py

@@ -30,7 +30,6 @@ def _to_dict_drop_none(obj: Any) -> dict[str, Any]:
 class DMSCredentials:
     """Credentials for authenticating with the DMS service."""
 
-    instance_name: str
     uri: str
     client_id: str
     client_secret: str

tests/agentgateway/integration/conftest.py

@@ -7,6 +7,7 @@
 from dotenv import load_dotenv
 
 from sap_cloud_sdk.agentgateway import create_client, AgentGatewayClient
+from sap_cloud_sdk.agentgateway.exceptions import MCPServerNotFoundError
 
 
 def _setup_cloud_mode():
@@ -21,12 +22,18 @@ def agw_client() -> AgentGatewayClient:
     """Create an AgentGatewayClient from environment variables."""
     _setup_cloud_mode()
 
-    tenant_subdomain = os.environ.get("TENANT_SUBDOMAIN")
+    tenant_subdomain = os.environ.get("CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN")
     if not tenant_subdomain:
-        pytest.fail("TENANT_SUBDOMAIN environment variable is not set")
+        pytest.skip("CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN is not set — skipping AGW integration tests")
+
+    landscape = os.environ.get("CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE")
+    if landscape:
+        os.environ.setdefault("APPFND_CONHOS_LANDSCAPE", landscape)
 
     try:
         return create_client(tenant_subdomain=tenant_subdomain)
+    except MCPServerNotFoundError as e:
+        pytest.skip(f"AGW not subscribed for this tenant — skipping AGW integration tests: {e}")
     except Exception as e:
         pytest.fail(f"Failed to create Agent Gateway client for integration tests: {e}")
 
@@ -45,3 +52,11 @@ def pytest_collection_modifyitems(config, items):
     for item in items:
         if "integration" in str(item.fspath):
             item.add_marker(pytest.mark.integration)
+
+
+def pytest_runtest_call(item):
+    """Skip AGW tests that fail due to missing subscription."""
+    try:
+        item.runtest()
+    except MCPServerNotFoundError as e:
+        pytest.skip(f"AGW not subscribed for this tenant — skipping: {e}")

tests/agentgateway/integration/test_agw_bdd.py

@@ -2,8 +2,8 @@
 
 Run against a live BTP tenant:
 
-    APPFND_CONHOS_LANDSCAPE=<landscape> \\
-    TENANT_SUBDOMAIN=<tenant-subdomain> \\
+    CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=<tenant-subdomain> \\
+    CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=<landscape> \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTID=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTSECRET=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_URL=... \\

tests/dms/integration/conftest.py

@@ -1,8 +1,15 @@
 from sap_cloud_sdk.dms import create_client
+from sap_cloud_sdk.dms.exceptions import DMSError
+from sap_cloud_sdk.dms.model import InternalRepoRequest
 import pytest
+import logging
 from pathlib import Path
 from dotenv import load_dotenv
 
+logger = logging.getLogger(__name__)
+
+_SDK_TEST_REPO_PREFIX = "sdk-integration-test-"
+
 
 @pytest.fixture(scope="session")
 def dms_client():
@@ -17,6 +24,47 @@ def dms_client():
         pytest.skip(f"DMS integration tests require credentials: {e}")
 
 
+@pytest.fixture(scope="session", autouse=True)
+def _setup_test_repositories(dms_client):
+    """Create test repositories for integration tests and clean up after.
+
+    Always onboards a standard and a version-enabled repository for the test
+    session, then deletes them on teardown.
+    """
+    created_repos = []
+
+    logger.info("Onboarding test repositories")
+    try:
+        repo = dms_client.onboard_repository(
+            InternalRepoRequest(
+                displayName=f"{_SDK_TEST_REPO_PREFIX}standard",
+                description="Auto-created by SDK integration tests",
+            )
+        )
+        created_repos.append(repo.id)
+
+        repo = dms_client.onboard_repository(
+            InternalRepoRequest(
+                displayName=f"{_SDK_TEST_REPO_PREFIX}versioned",
+                description="Auto-created by SDK integration tests (versioning)",
+                isVersionEnabled=True,
+            )
+        )
+        created_repos.append(repo.id)
+    except DMSError as e:
+        pytest.skip(f"DMS ECM repository connection not available — skipping DMS integration tests: {e}")
+
+    yield
+
+    # Cleanup: delete repositories we created
+    for repo_id in created_repos:
+        try:
+            dms_client.delete_repository(repo_id)
+            logger.info("Cleaned up test repository %s", repo_id)
+        except Exception as e:
+            logger.warning("Failed to clean up test repository %s: %s", repo_id, e)
+
+
 def _setup_cloud_mode():
     """Common setup for cloud mode integration tests."""
     env_file = Path(__file__).parents[3] / ".env_integration_tests"

tests/dms/unit/test_client_admin.py

@@ -72,7 +72,6 @@ def client():
             mock_http = Mock()
             MockHttp.return_value = mock_http
             creds = DMSCredentials(
-                instance_name="test-instance",
                 uri="https://api.example.com",
                 client_id="test-client",
                 client_secret="test-secret",