From 202886c490c839c7c98c90de95469f142f68c1b3 Mon Sep 17 00:00:00 2001 From: Evgeny Agafonchikov Date: Thu, 10 May 2018 14:55:06 +0300 Subject: [PATCH] Initial network error fixes and suppressions --- .../2018-05-01/checkDnsAvailability.json | 6 ++-- .../2018-05-01/expressRouteCircuit.json | 6 ++-- .../expressRouteCrossConnection.json | 6 ++-- .../stable/2018-05-01/loadBalancer.json | 6 ++-- .../stable/2018-05-01/network.json | 6 ++-- .../stable/2018-05-01/networkInterface.json | 6 ++-- .../2018-05-01/networkSecurityGroup.json | 6 ++-- .../stable/2018-05-01/networkWatcher.json | 6 ++-- .../stable/2018-05-01/publicIpAddress.json | 6 ++-- .../stable/2018-05-01/routeTable.json | 6 ++-- .../stable/2018-05-01/usage.json | 6 ++-- .../stable/2018-05-01/virtualNetwork.json | 6 ++-- .../2018-05-01/virtualNetworkGateway.json | 6 ++-- .../2018-05-01/vmssNetworkInterface.json | 13 ++++--- .../2018-05-01/vmssPublicIpAddress.json | 13 ++++--- .../network/resource-manager/readme.md | 35 +++++++++++++++++++ 16 files changed, 79 insertions(+), 60 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/checkDnsAvailability.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/checkDnsAvailability.json index bae218fe307a..90fa3c6326df 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/checkDnsAvailability.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/checkDnsAvailability.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCircuit.json index 221cf836ffaf..0ae49a083a95 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCircuit.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCrossConnection.json index 0f8a9327e184..86cebb4bce5a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/expressRouteCrossConnection.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/loadBalancer.json index d9c59926573c..253caf157f1f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/loadBalancer.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/network.json index 01991fd91e45..c8b0a516f0db 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/network.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkInterface.json index 4eb38d45cc19..5d14c7a4ceff 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkInterface.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkSecurityGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkSecurityGroup.json index c0419208eb19..ef5266341b35 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkSecurityGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkSecurityGroup.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json index e2e2fddf2f58..4613eab09f7d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/publicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/publicIpAddress.json index 376c03b49356..7b0a126fd9f8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/publicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/publicIpAddress.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/routeTable.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/routeTable.json index 0c8c4651f5f2..19d4352c95dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/routeTable.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/routeTable.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/usage.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/usage.json index 784bd6481af8..ee77427646d9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/usage.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/usage.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetwork.json index bf754b527ff8..98a46f3d4796 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetwork.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetworkGateway.json index d202ef722691..aa5e1286641c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/virtualNetworkGateway.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssNetworkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssNetworkInterface.json index 7c2102267ab4..274762b6147f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssNetworkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssNetworkInterface.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { @@ -395,6 +393,13 @@ "required": true, "type": "string", "description": "The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client API version." } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssPublicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssPublicIpAddress.json index 2b352004b7ea..c28e7e415513 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssPublicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/vmssPublicIpAddress.json @@ -10,12 +10,10 @@ "https" ], "consumes": [ - "application/json", - "text/json" + "application/json" ], "produces": [ - "application/json", - "text/json" + "application/json" ], "security": [ { @@ -256,6 +254,13 @@ "required": true, "type": "string", "description": "The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client API version." } } } diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 75b1d35ae461..8fa60e3841a0 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -410,6 +410,41 @@ input-file: - Microsoft.Network/preview/2015-05-01-preview/network.json ``` +## Suppression +``` yaml +directive: + - suppress: RequiredPropertiesMissingInResourceModel + reason: name, id and type properties are inherited from the upper level + - suppress: TrackedResourceListByImmediateParent + reason: Another list APIs naming approach is used over the specs + - suppress: EnumInsteadOfBoolean + reason: Booleans are used by networking APIs + - suppress: GetInOperationName + where: $.paths["/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability"].get.operationId + reason: Customized verb is used for API + - suppress: GetInOperationName + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/CheckIPAddressAvailability"].get.operationId + reason: Customized verb is used for API + - suppress: PutInOperationName + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey"].put.operationId + reason: Customized verb is used for API + - suppress: PostOperationIdContainsUrlVerb + from: networkWatcher.json + reason: Customized verbs are used for API + - suppress: PostOperationIdContainsUrlVerb + from: expressRouteCircuit.json + reason: Customized verbs are used for API + - suppress: PostOperationIdContainsUrlVerb + from: expressRouteCrossConnection.json + reason: Customized verbs are used for API + - suppress: OperationIdNounVerb + from: vmssPublicIpAddress.json + reason: VMSS specs have custom naming + - suppress: OperationIdNounVerb + from: vmssNetworkInterface.json + reason: VMSS specs have custom naming +``` + --- # Code Generation