From f108a51961c969fc840d8e208e78e778f097dd74 Mon Sep 17 00:00:00 2001 From: James Dickson Date: Fri, 21 Jun 2024 15:21:33 -0400 Subject: [PATCH] network servers tenants and credential --- components/examples/networkServerSuccess.json | 8 +++++++- components/examples/networkServers.json | 8 +++++++- components/schemas/networkServer.yaml | 12 +++++++++++ .../schemas/networkServerCreateNSX.yaml | 20 +++++++++++++++++-- .../schemas/networkServerUpdateNSX.yaml | 9 +++++++++ 5 files changed, 53 insertions(+), 4 deletions(-) diff --git a/components/examples/networkServerSuccess.json b/components/examples/networkServerSuccess.json index 3767ed9f..1a8ca390 100644 --- a/components/examples/networkServerSuccess.json +++ b/components/examples/networkServerSuccess.json @@ -57,6 +57,12 @@ "dateCreated": "2023-10-10T19:55:20Z", "lastUpdated": "2023-10-10T19:56:16Z", "enabled": true, - "visible": true + "visible": true, + "credential": { + "type": "local" + }, + "tenants": [ + + ] } } diff --git a/components/examples/networkServers.json b/components/examples/networkServers.json index 550cae82..9f472d0a 100644 --- a/components/examples/networkServers.json +++ b/components/examples/networkServers.json @@ -57,7 +57,13 @@ "dateCreated": "2023-10-10T20:04:34Z", "lastUpdated": "2023-10-10T20:07:54Z", "enabled": true, - "visible": true + "visible": true, + "credential": { + "type": "local" + }, + "tenants": [ + + ] } ] } diff --git a/components/schemas/networkServer.yaml b/components/schemas/networkServer.yaml index f80082af..a49e5bbc 100644 --- a/components/schemas/networkServer.yaml +++ b/components/schemas/networkServer.yaml @@ -168,3 +168,15 @@ properties: type: boolean visible: type: boolean + credential: + $ref: creds.yaml + tenants: + type: array + items: + type: object + properties: + id: + type: integer + format: int64 + name: + type: string \ No newline at end of file diff --git a/components/schemas/networkServerCreateNSX.yaml b/components/schemas/networkServerCreateNSX.yaml index 996257a3..81819196 100644 --- a/components/schemas/networkServerCreateNSX.yaml +++ b/components/schemas/networkServerCreateNSX.yaml @@ -4,8 +4,6 @@ required: - type - name - serviceUrl - - serviceUsername - - servicePassword - zoneId properties: type: @@ -52,3 +50,21 @@ properties: type: integer format: int64 description: ID of the Cloud that the NSX network server integration should be attached to. + credential: + type: object + description: 'Map containing Credential ID or the default `{"type": "local"}` which means use the values set in the local serviceUsername and servicePassword instead of associating a credential.' + properties: + type: + type: string + id: + type: integer + format: int64 + tenants: + type: array + description: Array of tenant account ids that are allowed access + items: + type: object + properties: + id: + type: integer + format: int64 diff --git a/components/schemas/networkServerUpdateNSX.yaml b/components/schemas/networkServerUpdateNSX.yaml index 863ce29f..b5fb4c66 100644 --- a/components/schemas/networkServerUpdateNSX.yaml +++ b/components/schemas/networkServerUpdateNSX.yaml @@ -24,3 +24,12 @@ properties: enum: - public - private + tenants: + type: array + description: Array of tenant account ids that are allowed access + items: + type: object + properties: + id: + type: integer + format: int64