fix(BA-5710): restrict slice B to UserPermission-only test changes

Earlier the branch pulled test fixtures that also referenced later
slices' renames (SessionMetadata.owner_id, ScheduledSessionData
.main_access_key, SessionDataForPull/Start.main_access_key,
SessionData.owner_id). Revert those fixtures to main state and
re-apply only the UserPermission field renames (user_uuid -> owner_id,
access_key -> main_access_key) which are in this slice's scope.

Also update the two remaining live readers of UserPermission:
- sokovan/scheduler/fair_share/aggregator.py
- api/adapters/session.py (kernel_info_to_node)

And fix the SessionRow.delegate_ownership caller of
KernelRow.delegate_ownership to match the new single-argument signature.

Author: jopemachine

src/ai/backend/manager/api/adapters/session.py

@@ -1011,8 +1011,8 @@ def _kernel_info_to_node(info: KernelInfo) -> KernelNode:
                 session_type=info.session.session_type.value,
             ),
             user_info=KernelUserInfoGQLDTO(
-                user_id=info.user_permission.user_uuid,
-                access_key=info.user_permission.access_key,
+                user_id=info.user_permission.owner_id,
+                access_key=info.user_permission.main_access_key,
                 domain_name=info.user_permission.domain_name,
                 group_id=info.user_permission.group_id,
             ),

src/ai/backend/manager/models/session/row.py

@@ -1288,7 +1288,7 @@ def delegate_ownership(self, user_uuid: UUID, access_key: AccessKey) -> None:
         self.user_uuid = user_uuid
         self.access_key = access_key
         for kernel_row in self.kernels:
-            kernel_row.delegate_ownership(user_uuid, access_key)
+            kernel_row.delegate_ownership(user_uuid)
 
     @staticmethod
     async def delete_by_user_id(user_uuid: UUID, *, db_session: SASession) -> None:

src/ai/backend/manager/sokovan/scheduler/fair_share/aggregator.py

@@ -484,7 +484,7 @@ def _generate_slice_specs(
             spec = KernelUsageRecordCreatorSpec(
                 kernel_id=UUID(str(kernel.id)),
                 session_id=UUID(kernel.session.session_id),
-                user_uuid=kernel.user_permission.user_uuid,
+                user_uuid=kernel.user_permission.owner_id,
                 project_id=kernel.user_permission.group_id,
                 domain_name=kernel.user_permission.domain_name,
                 resource_group=scaling_group,

tests/unit/manager/api/compute_sessions/test_handler.py

@@ -70,7 +70,7 @@ def create_session_data(
         cluster_size=1,
         domain_name="default",
         group_id=uuid4(),
-        owner_id=uuid4(),
+        user_uuid=uuid4(),
         occupying_slots=ResourceSlot({"cpu": Decimal("2.0"), "mem": Decimal("4294967296")}),
         requested_slots=ResourceSlot({"cpu": Decimal("4.0"), "mem": Decimal("8589934592")}),
         use_host_network=False,
@@ -80,6 +80,7 @@ def create_session_data(
         num_queries=0,
         creation_id="test-creation-id",
         name=name,
+        access_key=None,
         agent_ids=["agent-001"],
         images=images or ["cr.backend.ai/stable/python:3.11"],
         tag=None,

tests/unit/manager/sokovan/scheduler/handlers/conftest.py

@@ -106,7 +106,8 @@ def _create_session(
             name=f"session-{sid}",
             domain_name="default",
             group_id=group_id,
-            owner_id=user_uuid,
+            user_uuid=user_uuid,
+            access_key=access_key,
             session_type=session_type,
             priority=0,
             created_at=now,
@@ -160,7 +161,7 @@ def _create_session(
             ),
             user_permission=UserPermission(
                 owner_id=user_uuid,
-                main_access_key=None,
+                main_access_key=access_key,
                 domain_name="default",
                 group_id=group_id,
                 uid=None,
@@ -261,7 +262,7 @@ def _create_kernel(
         ),
         user_permission=UserPermission(
             owner_id=user_uuid,
-            main_access_key=None,
+            main_access_key="test-access-key",
             domain_name="default",
             group_id=group_id,
             uid=None,
@@ -544,7 +545,7 @@ def _create(sessions: list[SessionWithKernels]) -> ScheduleResult:
             ScheduledSessionData(
                 session_id=s.session_info.identity.id,
                 creation_id=s.session_info.identity.creation_id,
-                main_access_key=AccessKey("test-access-key"),
+                access_key=AccessKey(s.session_info.metadata.access_key),
                 reason="scheduled-successfully",
             )
             for s in sessions
@@ -563,7 +564,7 @@ def _create(sessions: list[SessionWithKernels]) -> SessionsForPullWithImages:
             SessionDataForPull(
                 session_id=s.session_info.identity.id,
                 creation_id=s.session_info.identity.creation_id,
-                main_access_key=AccessKey("test-access-key"),
+                access_key=AccessKey(s.session_info.metadata.access_key),
                 kernels=[
                     KernelBindingData(
                         kernel_id=KernelId(k.id),
@@ -608,7 +609,7 @@ def _create(sessions: list[SessionWithKernels]) -> SessionsForStartWithImages:
             SessionDataForStart(
                 session_id=s.session_info.identity.id,
                 creation_id=s.session_info.identity.creation_id,
-                main_access_key=AccessKey("test-access-key"),
+                access_key=AccessKey(s.session_info.metadata.access_key),
                 session_type=s.session_info.identity.session_type,
                 name=s.session_info.identity.name,
                 cluster_mode=ClusterMode(s.session_info.resource.cluster_mode),
@@ -623,7 +624,7 @@ def _create(sessions: list[SessionWithKernels]) -> SessionsForStartWithImages:
                     )
                     for k in s.kernel_infos
                 ],
-                owner_id=s.session_info.metadata.owner_id,
+                user_uuid=s.session_info.metadata.user_uuid,
                 user_email="test@example.com",
                 user_name="test-user",
                 environ={},
@@ -659,7 +660,7 @@ def _create(sessions: list[SessionWithKernels]) -> list[TerminatingSessionData]:
         return [
             TerminatingSessionData(
                 session_id=s.session_info.identity.id,
-                main_access_key=AccessKey("test-access-key"),
+                access_key=AccessKey(s.session_info.metadata.access_key),
                 creation_id=s.session_info.identity.creation_id,
                 status=s.session_info.lifecycle.status,
                 status_info="user-requested",

tests/unit/manager/sokovan/scheduler/terminator/conftest.py

@@ -137,7 +137,7 @@ def _create_terminating_session_data(
 
     return TerminatingSessionData(
         session_id=session_id or SessionId(uuid4()),
-        main_access_key=AccessKey("test-key"),
+        access_key=AccessKey("test-key"),
         creation_id=str(uuid4()),
         status=SessionStatus.TERMINATING,
         status_info=status_info,
@@ -214,7 +214,7 @@ def _create_kernel_info(
         ),
         user_permission=UserPermission(
             owner_id=uuid4(),
-            main_access_key=None,
+            main_access_key="test-access-key",
             domain_name="default",
             group_id=uuid4(),
             uid=None,