From 95b4d458122c742ede070fee816c82ff99f7d152 Mon Sep 17 00:00:00 2001 From: Nandita Ashok Date: Mon, 9 Dec 2024 21:49:13 -0800 Subject: [PATCH 1/7] API spec for operation to retrieve NVA boot diagnostics --- ...etworkVirtualApplianceBootDiagnostics.json | 26 ++++++ .../2024-07-01/networkVirtualAppliance.json | 81 +++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json new file mode 100644 index 000000000000..d82afb345636 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2024-07-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "networkVirtualApplianceName": "nva", + "instanceId": 0, + "serialConsoleStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/serialLogs.txt?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b", + "consoleScreenshotStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/consoleScreenshot.png?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b" + }, + "responses": { + "200": { + "headers": { + "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" + }, + "body": { + "instanceId": 0 + } + }, + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index 634c7dd0cbbb..09e88758284c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -360,6 +360,87 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/getBootDiagnosticLogs": { + "post": { + "tags": [ + "NetworkVirtualAppliances" + ], + "operationId": "NetworkVirtualAppliances_GetBootDiagnosticLogs", + "description": "Gets the boot diagnostic logs for a VM instance belonging to the specified Network Virtual Appliance.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "networkVirtualApplianceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of Network Virtual Appliance." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "instanceId", + "in": "body", + "required": true, + "type": "integer", + "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." + }, + { + "name": "serialConsoleStorageSasUrl", + "in": "body", + "required": false, + "type": "string", + "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" + }, + { + "name": "consoleScreenshotStorageSasUrl", + "in": "body", + "required": false, + "type": "string", + "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance." + }, + "202": { + "description": "Request accepted. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance.", + "headers": { + "Location": { + "description": "The URL of the resource used to check the status of the asynchronous operation.", + "type": "string" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Restart All NetworkVirtualAppliance VMs in VM Scale Set": { + "$ref": "./examples/NetworkVirtualApplianceBootDiagnostics.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances": { "get": { "tags": [ From abf6d22112c86213debf6d9f1d10227e662396fd Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Wed, 11 Dec 2024 15:03:13 -0800 Subject: [PATCH 2/7] made some model validation fixes --- ...etworkVirtualApplianceBootDiagnostics.json | 7 +-- .../2024-07-01/networkVirtualAppliance.json | 50 ++++++++++++++++--- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json index d82afb345636..fa7c59fbe1cd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json @@ -9,18 +9,13 @@ "consoleScreenshotStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/consoleScreenshot.png?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b" }, "responses": { - "200": { + "202": { "headers": { "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" }, "body": { "instanceId": 0 } - }, - "202": { - "headers": { - "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" - } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index 09e88758284c..5b515e67635d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -391,29 +391,32 @@ { "name": "instanceId", "in": "body", - "required": true, - "type": "integer", + "required":true, + "schema": { + "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" + }, "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." }, { "name": "serialConsoleStorageSasUrl", "in": "body", "required": false, - "type": "string", + "schema": { + "$ref": "#/definitions/SerialConsoleStorageSasUrl" + }, "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" }, { "name": "consoleScreenshotStorageSasUrl", "in": "body", "required": false, - "type": "string", + "schema": { + "$ref": "#/definitions/ConsoleScreenshotStorageSasUrl" + }, "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" } ], "responses": { - "200": { - "description": "Request successful. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance." - }, "202": { "description": "Request accepted. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance.", "headers": { @@ -421,6 +424,9 @@ "description": "The URL of the resource used to check the status of the asynchronous operation.", "type": "string" } + }, + "schema": { + "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" } }, "default": { @@ -1668,6 +1674,36 @@ } }, "description": "Specifies a list of virtual machine instance IDs from the Network Virtual Appliance VM instances." + }, + "NetworkVirtualApplianceInstanceId": { + "type": "object", + "properties": { + "instanceId": { + "type": "integer", + "description": "The network virtual appliance instance id for which boot diagnostic logs is being requested" + } + }, + "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." + }, + "SerialConsoleStorageSasUrl": { + "type": "object", + "properties": { + "serialConsoleStorageSasUrl": { + "type": "string", + "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" + } + }, + "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" + }, + "ConsoleScreenshotStorageSasUrl": { + "type": "object", + "properties": { + "consoleScreenshotStorageSasUrl": { + "type": "string", + "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" + } + }, + "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" } } } From e1cfc7adf8526a85a9eb3afa7169a7339afffa24 Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Fri, 13 Dec 2024 15:32:34 -0800 Subject: [PATCH 3/7] addressed ARM review comments --- .../examples/NetworkVirtualApplianceBootDiagnostics.json | 5 +++++ .../stable/2024-07-01/networkVirtualAppliance.json | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json index fa7c59fbe1cd..ea38c835a0ab 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json @@ -9,6 +9,11 @@ "consoleScreenshotStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/consoleScreenshot.png?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b" }, "responses": { + "200": { + "body": { + "instanceId": 0 + } + }, "202": { "headers": { "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index 5b515e67635d..da0eef5e9e64 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -417,6 +417,12 @@ } ], "responses": { + "200": { + "description": "Request successful. The operation retrieves boot diagnostic logs for a Network Virtual Appliance VM resource.", + "schema": { + "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" + } + }, "202": { "description": "Request accepted. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance.", "headers": { @@ -1690,6 +1696,7 @@ "properties": { "serialConsoleStorageSasUrl": { "type": "string", + "format": "uri", "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" } }, @@ -1700,6 +1707,7 @@ "properties": { "consoleScreenshotStorageSasUrl": { "type": "string", + "format": "uri", "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" } }, From a2145f91e0e961ece9415de3beb67c243e422a3d Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Tue, 17 Dec 2024 14:26:52 -0800 Subject: [PATCH 4/7] trying to address some model validation and symantic failures --- ...etworkVirtualApplianceBootDiagnostics.json | 6 +-- .../2024-07-01/networkVirtualAppliance.json | 47 +++++-------------- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json index ea38c835a0ab..d82afb345636 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json @@ -10,6 +10,9 @@ }, "responses": { "200": { + "headers": { + "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" + }, "body": { "instanceId": 0 } @@ -17,9 +20,6 @@ "202": { "headers": { "location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/nfvOperations/00000000-0000-0000-0000-000000000000?api-version=2024-07-01" - }, - "body": { - "instanceId": 0 } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index da0eef5e9e64..b4d33debd147 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -391,29 +391,11 @@ { "name": "instanceId", "in": "body", - "required":true, + "required":false, "schema": { - "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" + "$ref": "#/definitions/NetworkVirtualApplianceBootDiagnosticParameters" }, "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." - }, - { - "name": "serialConsoleStorageSasUrl", - "in": "body", - "required": false, - "schema": { - "$ref": "#/definitions/SerialConsoleStorageSasUrl" - }, - "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" - }, - { - "name": "consoleScreenshotStorageSasUrl", - "in": "body", - "required": false, - "schema": { - "$ref": "#/definitions/ConsoleScreenshotStorageSasUrl" - }, - "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" } ], "responses": { @@ -430,9 +412,6 @@ "description": "The URL of the resource used to check the status of the asynchronous operation.", "type": "string" } - }, - "schema": { - "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" } }, "default": { @@ -443,7 +422,7 @@ } }, "x-ms-examples": { - "Restart All NetworkVirtualAppliance VMs in VM Scale Set": { + "Retrieve Boot Diagnostic logs for a given NVA VMSS instance": { "$ref": "./examples/NetworkVirtualApplianceBootDiagnostics.json" } }, @@ -1686,32 +1665,30 @@ "properties": { "instanceId": { "type": "integer", + "format": "int32", "description": "The network virtual appliance instance id for which boot diagnostic logs is being requested" } - }, - "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." + } }, - "SerialConsoleStorageSasUrl": { + "NetworkVirtualApplianceBootDiagnosticParameters": { "type": "object", "properties": { + "instanceId": { + "type": "integer", + "description": "The network virtual appliance instance id for which boot diagnostic logs is being requested" + }, "serialConsoleStorageSasUrl": { "type": "string", "format": "uri", "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" - } - }, - "description": "Specifies the sas-url to the storage blob into which serial console logs for the requested instance will be written" - }, - "ConsoleScreenshotStorageSasUrl": { - "type": "object", - "properties": { + }, "consoleScreenshotStorageSasUrl": { "type": "string", "format": "uri", "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" } }, - "description": "Specifies the sas-url to the storage blob into which console screen shot for the requested instance will be written" + "description": "Specifies input parameters required to retrieve the boot diagnostic logs for an NVA instance" } } } From 49f339e8d36969c4be97f60670e39ff3bc6c9f6a Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Wed, 18 Dec 2024 11:03:15 -0800 Subject: [PATCH 5/7] fix lintdiff errors --- .../stable/2024-07-01/networkVirtualAppliance.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index b4d33debd147..705f486a9aa0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -366,7 +366,7 @@ "NetworkVirtualAppliances" ], "operationId": "NetworkVirtualAppliances_GetBootDiagnosticLogs", - "description": "Gets the boot diagnostic logs for a VM instance belonging to the specified Network Virtual Appliance.", + "description": "Retrieves the boot diagnostic logs for a VM instance belonging to the specified Network Virtual Appliance.", "parameters": [ { "name": "resourceGroupName", @@ -380,6 +380,7 @@ "in": "path", "required": true, "type": "string", + "pattern": ".*", "description": "The name of Network Virtual Appliance." }, { @@ -1675,6 +1676,7 @@ "properties": { "instanceId": { "type": "integer", + "format": "int32", "description": "The network virtual appliance instance id for which boot diagnostic logs is being requested" }, "serialConsoleStorageSasUrl": { From 52e7a27b8ae1bc074e2940dde4e74fea071bec91 Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Wed, 18 Dec 2024 11:42:11 -0800 Subject: [PATCH 6/7] fix prettiercheck after merge conflict resolve --- .../2024-07-01/networkVirtualAppliance.json | 136 +++++++++--------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index ec5b9f1b904a..a90eca20e12a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -434,78 +434,78 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/getBootDiagnosticLogs": { - "post": { - "tags": [ - "NetworkVirtualAppliances" - ], - "operationId": "NetworkVirtualAppliances_GetBootDiagnosticLogs", - "description": "Retrieves the boot diagnostic logs for a VM instance belonging to the specified Network Virtual Appliance.", - "parameters": [ - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - }, - { - "name": "networkVirtualApplianceName", - "in": "path", - "required": true, - "type": "string", - "pattern": "^[A-Za-z0-9_]+", - "description": "The name of Network Virtual Appliance." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "instanceId", - "in": "body", - "required": false, - "schema": { - "$ref": "#/definitions/NetworkVirtualApplianceBootDiagnosticParameters" - }, - "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." - } - ], - "responses": { - "200": { - "description": "Request successful. The operation retrieves boot diagnostic logs for a Network Virtual Appliance VM resource.", - "schema": { - "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" - } - }, - "202": { - "description": "Request accepted. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance.", - "headers": { - "Location": { - "description": "The URL of the resource used to check the status of the asynchronous operation.", - "type": "string" + "post": { + "tags": [ + "NetworkVirtualAppliances" + ], + "operationId": "NetworkVirtualAppliances_GetBootDiagnosticLogs", + "description": "Retrieves the boot diagnostic logs for a VM instance belonging to the specified Network Virtual Appliance.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "networkVirtualApplianceName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[A-Za-z0-9_]+", + "description": "The name of Network Virtual Appliance." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "instanceId", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/NetworkVirtualApplianceBootDiagnosticParameters" + }, + "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." } - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" + ], + "responses": { + "200": { + "description": "Request successful. The operation retrieves boot diagnostic logs for a Network Virtual Appliance VM resource.", + "schema": { + "$ref": "#/definitions/NetworkVirtualApplianceInstanceId" + } + }, + "202": { + "description": "Request accepted. The operation gets the boot diagnostic logs for a Network Virtual Appliance VM instance.", + "headers": { + "Location": { + "description": "The URL of the resource used to check the status of the asynchronous operation.", + "type": "string" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Retrieve Boot Diagnostic logs for a given NVA VMSS instance": { + "$ref": "./examples/NetworkVirtualApplianceBootDiagnostics.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" } } }, - "x-ms-examples": { - "Retrieve Boot Diagnostic logs for a given NVA VMSS instance": { - "$ref": "./examples/NetworkVirtualApplianceBootDiagnostics.json" - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } - } -}, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances": { "get": { "tags": [ From 49ff72cf4559031a0c1f0858c77aee2ccad76ecc Mon Sep 17 00:00:00 2001 From: "Nandita Ashok (from Dev Box)" Date: Wed, 22 Jan 2025 12:18:44 -0800 Subject: [PATCH 7/7] update spec for nva boot diagnostics api for 2024-07-01 --- .../examples/NetworkVirtualApplianceBootDiagnostics.json | 8 +++++--- .../stable/2024-07-01/networkVirtualAppliance.json | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json index d82afb345636..f9b766f3fa41 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceBootDiagnostics.json @@ -4,9 +4,11 @@ "subscriptionId": "subid", "resourceGroupName": "rg1", "networkVirtualApplianceName": "nva", - "instanceId": 0, - "serialConsoleStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/serialLogs.txt?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b", - "consoleScreenshotStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/consoleScreenshot.png?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b" + "request": { + "instanceId": 0, + "serialConsoleStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/serialLogs.txt?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b", + "consoleScreenshotStorageSasUrl": "https://blobcortextesturl.blob.core.windows.net/nvaBootDiagContainer/consoleScreenshot.png?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b" + } }, "responses": { "200": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json index a90eca20e12a..ceefb7840e80 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/networkVirtualAppliance.json @@ -463,13 +463,13 @@ "$ref": "./network.json#/parameters/SubscriptionIdParameter" }, { - "name": "instanceId", + "name": "request", "in": "body", - "required": false, + "required": true, "schema": { "$ref": "#/definitions/NetworkVirtualApplianceBootDiagnosticParameters" }, - "description": "Specifies a virtual machine instance ID from the Network Virtual Appliance VM instances." + "description": "Parameters supplied to retrieve boot diagnostic logs for a NVA VM instance" } ], "responses": {