This commit is contained in:
parent
5d3cb64526
commit
74061d02e0
3 changed files with 5 additions and 5 deletions
|
|
@ -81,12 +81,12 @@ async def stop_timer(request: Request, ident: str):
|
||||||
async def test_hub_access(
|
async def test_hub_access(
|
||||||
headers: header_dependency,
|
headers: header_dependency,
|
||||||
client: http_client_dependency,
|
client: http_client_dependency,
|
||||||
org_name: Annotated[str, Query()],
|
org_id: Annotated[int, Query()],
|
||||||
resource_name: Annotated[str, Query()] = "example_resource",
|
resource_name: Annotated[str, Query()] = "example_resource",
|
||||||
action: Annotated[str, Query()] = "read",
|
action: Annotated[str, Query()] = "read",
|
||||||
instance: Optional[Annotated[str, Query()]] = None,
|
instance: Optional[Annotated[str, Query()]] = None,
|
||||||
):
|
):
|
||||||
rn = generate_resource_name(resource=resource_name, org=org_name, instance=instance)
|
rn = generate_resource_name(resource=resource_name, org=org_id, instance=instance)
|
||||||
|
|
||||||
request_body = {
|
request_body = {
|
||||||
"rn": rn.model_dump(),
|
"rn": rn.model_dump(),
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ class CustomBaseModel(BaseModel):
|
||||||
|
|
||||||
class ResourceName(CustomBaseModel):
|
class ResourceName(CustomBaseModel):
|
||||||
service: str
|
service: str
|
||||||
organisation: str
|
organisation_id: int
|
||||||
resource: str
|
resource: str
|
||||||
instance: Optional[str] = None
|
instance: Optional[str] = None
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,11 @@ def create_timer(func: Callable, interval: int, stop_event: threading.Event):
|
||||||
|
|
||||||
|
|
||||||
def generate_resource_name(
|
def generate_resource_name(
|
||||||
org: str, resource: str, instance: Optional[str] = None
|
org: int, resource: str, instance: Optional[str] = None
|
||||||
) -> ResourceName:
|
) -> ResourceName:
|
||||||
rn = ResourceName(
|
rn = ResourceName(
|
||||||
service=settings.SERVICE_NAME,
|
service=settings.SERVICE_NAME,
|
||||||
organisation=org,
|
organisation_id=org,
|
||||||
resource=resource,
|
resource=resource,
|
||||||
instance=instance,
|
instance=instance,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue