From fd48d49a4b9c62f3d955e7da23ec5187c59be40f Mon Sep 17 00:00:00 2001 From: "KeYu(AnkhSpirit)" <33389195+KeYu-AnkhSpirit@users.noreply.github.com> Date: Thu, 18 Nov 2021 10:55:00 +0800 Subject: [PATCH] Fix tag network (#16772) * fix OBJECT_ADDITIONAL_PROPERTIES error in "network" * fix LRO_RESPONSE_HEADER error in "network" * fix INVALID_TYPE error in "network" --- .../examples/CloudServiceNetworkInterfaceGet.json | 5 +---- .../examples/CloudServiceNetworkInterfaceList.json | 10 ++-------- .../CloudServiceRoleInstanceNetworkInterfaceList.json | 5 +---- ...ateVirtualWanVpnServerConfigurationVpnProfile.json | 4 +++- .../NetworkWatcherAvailableProvidersListGet.json | 3 +++ .../NetworkWatcherAzureReachabilityReportGet.json | 3 +++ .../NetworkWatcherConnectionMonitorQuery.json | 3 +++ .../examples/NetworkWatcherConnectivityCheck.json | 3 +++ .../examples/NetworkWatcherFlowLogConfigure.json | 3 +++ .../examples/NetworkWatcherFlowLogStatusQuery.json | 3 +++ .../examples/NetworkWatcherIpFlowVerify.json | 3 +++ .../NetworkWatcherNetworkConfigurationDiagnostic.json | 3 +++ .../2021-05-01/examples/NetworkWatcherNextHopGet.json | 3 +++ .../NetworkWatcherPacketCaptureQueryStatus.json | 3 +++ .../examples/NetworkWatcherSecurityGroupViewGet.json | 3 +++ .../examples/NetworkWatcherTroubleshootGet.json | 3 +++ .../NetworkWatcherTroubleshootResultQuery.json | 3 +++ .../examples/P2SVpnGatewayGenerateVpnProfile.json | 4 +++- .../P2SVpnGatewayGetConnectionHealthDetailed.json | 4 +++- .../examples/QueryInboundNatRulePortMapping.json | 3 +++ ...tualNetworkGatewaySetVpnClientIpsecParameters.json | 11 ++++++++++- 21 files changed, 65 insertions(+), 20 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceGet.json index 37ebf50be17e..e4a783757e6e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceGet.json @@ -54,10 +54,7 @@ "networkSecurityGroup": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" }, - "primary": true, - "roleInstance": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/cloudServices/cs1/roleInstances/TestVMRole_IN_0" - } + "primary": true } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceList.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceList.json index 7dfd5e776da1..662934959c01 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceNetworkInterfaceList.json @@ -54,10 +54,7 @@ "networkSecurityGroup": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" }, - "primary": true, - "roleInstance": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/cloudServices/cs1/roleInstances/TestVMRole_IN_0" - } + "primary": true } }, { @@ -105,10 +102,7 @@ "networkSecurityGroup": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" }, - "primary": true, - "roleInstance": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/cloudServices/cs1/roleInstances/TestVMRole_IN_1" - } + "primary": true } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceRoleInstanceNetworkInterfaceList.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceRoleInstanceNetworkInterfaceList.json index 5994635d61a3..a1945061a22e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceRoleInstanceNetworkInterfaceList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/CloudServiceRoleInstanceNetworkInterfaceList.json @@ -55,10 +55,7 @@ "networkSecurityGroup": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1" }, - "primary": true, - "roleInstance": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/cloudServices/cs1/roleInstances/TestVMRole_IN_0" - } + "primary": true } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/GenerateVirtualWanVpnServerConfigurationVpnProfile.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/GenerateVirtualWanVpnServerConfigurationVpnProfile.json index 4d2a58589fc2..579dfaced80f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/GenerateVirtualWanVpnServerConfigurationVpnProfile.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/GenerateVirtualWanVpnServerConfigurationVpnProfile.json @@ -12,7 +12,9 @@ "responses": { "202": {}, "200": { - "body": "" + "body": { + "profileUrl": "aaaaaaaaaaaaaaaaaaaaaaaaaaa" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAvailableProvidersListGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAvailableProvidersListGet.json index 17645884034e..152888a7e448 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAvailableProvidersListGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAvailableProvidersListGet.json @@ -40,6 +40,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/availableProvidersList?api-version=2021-05-01" + }, "body": { "countries": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAzureReachabilityReportGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAzureReachabilityReportGet.json index 46d36b41b3ac..edaee19d8ee2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAzureReachabilityReportGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherAzureReachabilityReportGet.json @@ -50,6 +50,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/azureReachabilityReport?api-version=2021-05-01" + }, "body": { "aggregationLevel": "State", "providerLocation": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectionMonitorQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectionMonitorQuery.json index 03ef31805587..e8fac16b8665 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectionMonitorQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectionMonitorQuery.json @@ -41,6 +41,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1/query?api-version=2021-05-01" + }, "body": { "sourceStatus": "Active", "states": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectivityCheck.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectivityCheck.json index 5e9d23908749..f9038213f661 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectivityCheck.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherConnectivityCheck.json @@ -47,6 +47,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectivityCheck?api-version=2021-05-01" + }, "body": { "hops": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogConfigure.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogConfigure.json index ad4d51c726e1..7a0fa66decdd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogConfigure.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogConfigure.json @@ -23,6 +23,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/configureFlowLog?api-version=2021-05-01" + }, "body": { "targetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogStatusQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogStatusQuery.json index 54881dec9f95..68b54bd5e369 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogStatusQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherFlowLogStatusQuery.json @@ -19,6 +19,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/queryFlowLogStatus?api-version=2021-05-01" + }, "body": { "targetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/nsg1", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherIpFlowVerify.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherIpFlowVerify.json index 218d2e88a7f1..0983c033aa0b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherIpFlowVerify.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherIpFlowVerify.json @@ -22,6 +22,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/ipFlowVerify?api-version=2021-05-01" + }, "body": { "access": "Allow", "ruleName": "Rule1" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json index c1c5a904ed17..fb7c9a9d35eb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json @@ -107,6 +107,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/networkConfigurationDiagnostic?api-version=2021-05-01" + }, "body": { "results": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNextHopGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNextHopGet.json index 4b0b1251ff31..01f630656a82 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNextHopGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherNextHopGet.json @@ -20,6 +20,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/nextHop?api-version=2021-05-01" + }, "body": { "nextHopType": "VnetLocal", "nextHopIpAddress": "10.0.0.1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherPacketCaptureQueryStatus.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherPacketCaptureQueryStatus.json index d4fb779e03c8..735aaaa9cf29 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherPacketCaptureQueryStatus.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherPacketCaptureQueryStatus.json @@ -18,6 +18,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/troubleshoot?api-version=2021-05-01" + }, "body": { "name": "pc1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/packetCaptures/pc1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherSecurityGroupViewGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherSecurityGroupViewGet.json index 3ff669478645..a767c444781b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherSecurityGroupViewGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherSecurityGroupViewGet.json @@ -74,6 +74,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/queryStatus?api-version=2021-05-01" + }, "body": { "networkInterfaces": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootGet.json index 91cc104b572a..ef2ab2308244 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootGet.json @@ -41,6 +41,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/troubleshoot?api-version=2021-05-01" + }, "body": { "startTime": "2017-01-12T00:19:47.0442834Z", "endTime": "2017-01-12T00:20:09.914Z", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootResultQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootResultQuery.json index ed33529c985c..ab9dc53a22ee 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootResultQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/NetworkWatcherTroubleshootResultQuery.json @@ -37,6 +37,9 @@ } }, "202": { + "headers": { + "Location": "https:/management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/queryTroubleshootResult?api-version=2021-05-01" + }, "body": { "startTime": "2017-01-12T00:19:47.0442834Z", "endTime": "2017-01-12T00:20:09.914Z", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGenerateVpnProfile.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGenerateVpnProfile.json index 43065ff87f4f..005a6afb68ad 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGenerateVpnProfile.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGenerateVpnProfile.json @@ -11,7 +11,9 @@ "responses": { "202": {}, "200": { - "body": "" + "body": { + "profileUrl": "aaaaaaaaaaaaaaaaaaaaaaaaaaa" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGetConnectionHealthDetailed.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGetConnectionHealthDetailed.json index 20a315ae5a5f..ee6008bd0560 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGetConnectionHealthDetailed.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/P2SVpnGatewayGetConnectionHealthDetailed.json @@ -14,7 +14,9 @@ }, "responses": { "200": { - "body": "" + "body": { + "sasUrl": "aaaaaaaaaaaaaaaaaa" + } }, "202": {} } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/QueryInboundNatRulePortMapping.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/QueryInboundNatRulePortMapping.json index 3f0cdea3121c..e77a3cd78643 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/QueryInboundNatRulePortMapping.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/QueryInboundNatRulePortMapping.json @@ -23,6 +23,9 @@ } }, "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb1/backendAddressPools/bp1/queryInboundNatRulePortMapping?api-version=2021-05-01" + }, "body": { "inboundNatRulePortMappings": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/VirtualNetworkGatewaySetVpnClientIpsecParameters.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/VirtualNetworkGatewaySetVpnClientIpsecParameters.json index 590d74597dcf..28b685baec32 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/VirtualNetworkGatewaySetVpnClientIpsecParameters.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2021-05-01/examples/VirtualNetworkGatewaySetVpnClientIpsecParameters.json @@ -18,7 +18,16 @@ "responses": { "202": {}, "200": { - "body": "" + "body": { + "saLifeTimeSeconds": 86473, + "saDataSizeKilobytes": 429497, + "ipsecEncryption": "AES256", + "ipsecIntegrity": "SHA256", + "ikeEncryption": "AES256", + "ikeIntegrity": "SHA384", + "dhGroup": "DHGroup2", + "pfsGroup": "PFS2" + } } } }