diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json index e638a101cb12..d59d195b8d47 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json @@ -11,6 +11,7 @@ "Location": "http://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/managedClusterOperationResults/1ca6e48d-70ca-4e43-b652-3b0522f64d67?api-version=2020-01-01-preview" } }, - "204": {} + "204": {}, + "200": {} } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json index ba1fe79076be..cfe0add5855e 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json @@ -29,17 +29,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "adminUserName": "vmadmin", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json index 1f95cbff7e49..596c355ccaa7 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json @@ -16,17 +16,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "fabricSettings": [ @@ -113,17 +116,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "adminUserName": "vmadmin", @@ -211,17 +217,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "http" } ], "adminUserName": "vmadmin", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json index 1ed5700b5e16..6bd51c60283f 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json @@ -21,17 +21,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "http" } ], "fabricSettings": [ @@ -122,17 +125,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "adminUserName": "vmadmin", @@ -223,17 +229,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "adminUserName": "vmadmin", @@ -324,17 +333,20 @@ { "frontendPort": 80, "backendPort": 80, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 443, "backendPort": 443, - "protocol": "http" + "protocol": "http", + "probeProtocol": "http" }, { "frontendPort": 10000, "backendPort": 10000, - "protocol": "tcp" + "protocol": "tcp", + "probeProtocol": "tcp" } ], "adminUserName": "vmadmin", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json index 2f38d90c3430..577f254ca490 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json @@ -12,6 +12,7 @@ "Location": "http://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/managedClusterOperationResults/1ca6e48d-70ca-4e43-b652-3b0522f64d67?api-version=2020-01-01-preview" } }, - "204": {} + "204": {}, + "200": {} } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index c32defd2363e..b3ea64d33cb4 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -51,7 +51,7 @@ } ], "tags": [ - "Cluster" + "ManagedCluster" ], "x-ms-pageable": { "nextLinkName": "nextLink" @@ -327,6 +327,9 @@ "204": { "description": "The resource was not found." }, + "200": { + "description": "The operation completed successfully." + }, "default": { "description": "The detailed error response.", "schema": { @@ -405,10 +408,16 @@ "schema": { "type": "array", "items": { - "$ref": "#/definitions/ClusterVersionDetails" + "$ref": "#/definitions/ManagedClusterVersionDetails" }, "description": "The list of available Service Fabric runtime versions." } + }, + "default": { + "description": "The detailed error response.", + "schema": { + "$ref": "#/definitions/ErrorModel" + } } } } @@ -416,26 +425,21 @@ }, "definitions": { "AzureActiveDirectory": { - "required": [ - "tenantId", - "clusterApplication", - "clientApplication" - ], "properties": { "tenantId": { - "type": "boolean", + "type": "string", "description": "Azure active directory tenant id." }, "clusterApplication": { "type": "string", - "description": "Azure active directory cluster application." + "description": "Azure active directory cluster application id." }, "clientApplication": { "type": "string", - "description": "Azure active directory client application." + "description": "Azure active directory client application id." } }, - "description": "Azure active directory." + "description": "The settings to enable AAD authentication on the cluster." }, "ClientCertificate": { "required": [ @@ -487,7 +491,7 @@ "Ready" ] }, - "ClusterVersionDetails": { + "ManagedClusterVersionDetails": { "properties": { "msiVersion": { "type": "string", @@ -514,12 +518,14 @@ "properties": { "frontendPort": { "type": "integer", + "format": "int32", "description": "The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values are between 1 and 65534.", "minimum": 1, "maximum": 65534 }, "backendPort": { "type": "integer", + "format": "int32", "description": "The port used for internal connections on the endpoint. Acceptable values are between 1 and 65535.", "minimum": 1, "maximum": 65534 @@ -629,11 +635,13 @@ }, "clientConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for client connections to the cluster.", "default": 19000 }, "httpGatewayConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for http connections to the cluster.", "default": 19080 }, @@ -649,16 +657,19 @@ }, "loadBalancingRules": { "type": "array", - "$ref": "#/definitions/LoadBalancingRule", - "description": "Describes a load balancing rule." + "items": { + "$ref": "#/definitions/LoadBalancingRule" + }, + "description": "Describes load balancing rules." }, "clients": { "type": "array", - "$ref": "#/definitions/ClientCertificate", + "items": { + "$ref": "#/definitions/ClientCertificate" + }, "description": "client certificates for the cluster." }, "azureActiveDirectory": { - "type": "array", "$ref": "#/definitions/AzureActiveDirectory", "description": "Azure active directory." }, @@ -696,6 +707,7 @@ }, "reverseProxyEndpointPort": { "type": "integer", + "format": "int32", "description": "The endpoint used by reverse proxy." } }, @@ -705,10 +717,12 @@ "properties": { "clientConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for client connections to the cluster." }, "httpGatewayConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for http connections to the cluster." }, "loadBalancingRules": { @@ -745,6 +759,7 @@ }, "reverseProxyEndpointPort": { "type": "integer", + "format": "int32", "description": "The endpoint used by reverse proxy." } }, diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index a3105dbd9133..dfaf46442833 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -523,6 +523,9 @@ "204": { "description": "The resource was not found." }, + "200": { + "description": "The operation completed successfully." + }, "default": { "description": "The detailed error response.", "schema": { @@ -540,7 +543,7 @@ "description": "The node type definition" }, { - "$ref": "#/definitions/ProxyResource" + "$ref": "#/definitions/ManagedProxyResource" } ], "properties": { @@ -584,12 +587,14 @@ }, "vmInstanceCount": { "type": "integer", + "format": "int32", "description": "The number of nodes in the node type. This count should match the capacity property in the corresponding VirtualMachineScaleSet resource.", "minimum": 1, "maximum": 2147483647 }, "diskSizeInGB": { "type": "integer", + "format": "int32", "description": "Disk size for each vm in the node type in GBs." }, "placementProperties": { @@ -676,6 +681,7 @@ "properties": { "vmInstanceCount": { "type": "integer", + "format": "int32", "description": "The number of nodes in the node type. This count should match the capacity property in the corresponding VirtualMachineScaleSet resource.", "minimum": 1, "maximum": 2147483647 @@ -740,7 +746,7 @@ }, "description": "Node type update request" }, - "ProxyResource": { + "ManagedProxyResource": { "properties": { "id": { "type": "string", diff --git a/specification/servicefabric/resource-manager/readme.md b/specification/servicefabric/resource-manager/readme.md index 0e301cceb90e..f9f151dcd57c 100644 --- a/specification/servicefabric/resource-manager/readme.md +++ b/specification/servicefabric/resource-manager/readme.md @@ -68,6 +68,8 @@ These settings apply only when `--tag=package-2020-03` is specified on the comma input-file: - Microsoft.ServiceFabric/stable/2020-03-01/cluster.json - Microsoft.ServiceFabric/stable/2020-03-01/application.json +- Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +- Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json ``` ### Tag: package-2020-01-preview