From e5e13887b264dc68228cb04debea50f009173d84 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 9 Feb 2017 09:30:13 -0800 Subject: [PATCH 01/25] add service fabric swagger file --- .../2016-09-01/swagger/servicefabric.json | 757 ++++++++++++++++++ 1 file changed, 757 insertions(+) create mode 100644 arm-servicefabric/2016-09-01/swagger/servicefabric.json diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json new file mode 100644 index 000000000000..4049caf46587 --- /dev/null +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -0,0 +1,757 @@ +{ + "swagger": "2.0", + "info": { + "title": "ServiceFabricClient", + "version": "2016-09-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}": { + "patch": { + "tags": [ + "ClusterpatchOperation" + ], + "operationId": "ClusterOperation_Update", + "description": "Update cluster config", + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Resource Group to which the server belongs." + }, + { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the cluster" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "name": "PatchRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ClusterPatchRequest" + }, + "description": "Patch Request" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + } + }, + "get": { + "tags": [ + "ClusterGetOperation" + ], + "operationId": "ClusterOperation_get", + "description": "Get cluster config", + "produces": [ + "application/json" + ], + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Resource Group to which the server belongs." + }, + { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the cluster" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ClusterResource" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ClusterResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + } + }, + "put": { + "tags": [ + "ClusterCreateOperation" + ], + "operationId": "ClusterOperation_Create", + "description": "Create cluster config", + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Resource Group to which the server belongs." + }, + { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the cluster" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "name": "PutRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ClusterResource" + }, + "description": "Put Request" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ClusterResource" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ClusterResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + } + } + } + }, + "definitions": { + "CertificateDescription": { + "description": "Certificate description", + "properties": { + "thumbprint": { + "type": "string" + }, + "thumbprintSecondary": { + "type": "string" + }, + "x509StoreName": { + "type": "string", + "enum": [ + "AddressBook", + "AuthRoot", + "CertificateAuthority", + "Disallowed", + "My", + "Root", + "TrustedPeople", + "TrustedPublisher" + ] + } + } + }, + "SettingsParameterDescription": { + "description": "Settings parameter description", + "properties": { + "name": { + "type": "string", + "description": "name" + }, + "value": { + "type": "string", + "description": "name" + } + } + }, + "SettingsSectionDescription": { + "description": "Settings section description", + "properties": { + "name": { + "type": "string", + "description": "name" + }, + "parameters": { + "type": "array", + "items": { + "$ref": "#/definitions/SettingsParameterDescription" + } + } + } + }, + "EndpointRangeDescription": { + "description": "Endpoint range description", + "properties": { + "startPort": { + "type": "integer" + }, + "endPort": { + "type": "integer" + } + } + }, + "NodeTypeDescription": { + "description": "NodeType description", + "properties": { + "name": { + "type": "string" + }, + "placementProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "capacities": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "clientConnectionEndpointPort": { + "type": "integer" + }, + "httpGatewayEndpointPort": { + "type": "integer" + }, + "durabilityLevel": { + "type": "string", + "enum": [ + "Bronze", + "Silver", + "Gold", + "Platimun" + ] + }, + "applicationPorts": { + "$ref": "#/definitions/EndpointRangeDescription" + }, + "ephemeralPorts": { + "$ref": "#/definitions/EndpointRangeDescription" + }, + "isPrimary": { + "type": "boolean", + "description": "Is primary or not" + }, + "vmInstanceCount": { + "type": "integer" + }, + "reverseProxyEndpointPort": { + "type": "integer" + } + } + }, + "ClientCertificateThumbprint": { + "description": "NodeType description", + "properties": { + "isAdmin": { + "type": "boolean", + "description": "Is admin or not" + }, + "certificateThumbprint": { + "type": "string" + } + } + }, + "ClientCertificateCommonName": { + "description": "NodeType description", + "properties": { + "isAdmin": { + "type": "boolean", + "description": "Is admin or not" + }, + "certificateIssuerThumbprint": { + "type": "string" + } + } + }, + "ClusterEnvironment": { + "type": "string", + "enum": [ + "Default", + "Windows", + "Linux" + ] + }, + "ClusterVersionDetails": { + "description": "NodeType description", + "properties": { + "codeVersion": { + "type": "string" + }, + "supportExpiryUtc": { + "type": "string" + }, + "environment": { + "$ref": "#/definitions/ClusterEnvironment" + } + } + }, + "PaasServiceTypeHealthPolicy": { + "description": "Paas service type health policy", + "properties": { + "maxPercentUnhealthyServices": { + "type": "integer" + } + } + }, + "PaasApplicationHealthPolicy": { + "description": "Paas application health policy", + "properties": { + "defaultServiceTypeHealthPolicy": { + "$ref": "#/definitions/PaasServiceTypeHealthPolicy" + }, + "serivceTypeHealthPolicies": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/PaasServiceTypeHealthPolicy" + } + } + } + }, + "PaasClusterUpgradeHealthPolicy": { + "description": "Paas cluster upgrade health policy", + "properties": { + "maxPercentUnhealthyNodes": { + "type": "integer" + }, + "maxPercentUnhealthyApplications": { + "type": "integer" + }, + "applicationHealthPolicies": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/PaasApplicationHealthPolicy" + } + } + } + }, + "PaasServiceTypeDeltaHealthPolicy": { + "description": "Paas service type delta health policy", + "properties": { + "maxPercentDeltaUnhealthyServices": { + "type": "integer" + } + } + }, + "PaasApplicationDeltaHealthPolicy": { + "description": "Paas application delta health policy", + "properties": { + "defaultServiceTypeDeltaHealthPolicy": { + "$ref": "#/definitions/PaasServiceTypeDeltaHealthPolicy" + }, + "serivceTypeDeltaHealthPolicies": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/PaasServiceTypeDeltaHealthPolicy" + } + } + } + }, + "PaasClusterUpgradeDeltaHealthPolicy": { + "description": "Paas cluster upgrade delta health policy", + "properties": { + "maxPercentDeltaUnhealthyNodes": { + "type": "integer" + }, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": { + "type": "integer" + }, + "maxPercentDeltaUnhealthyApplications": { + "type": "integer" + }, + "applicationHealthPolicies": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/PaasApplicationDeltaHealthPolicy" + } + } + } + }, + "paasClusterUpgradePolicy": { + "description": "Paas cluster upgrade policy", + "properties": { + "overrideUserUpgradePolicy": { + "type": "boolean" + }, + "forceRestart": { + "type": "boolean" + }, + "upgradeReplicaSetCheckTimeout": { + "type": "string" + }, + "healthCheckWaitDuration": { + "type": "string" + }, + "healthCheckStableDuration": { + "type": "string" + }, + "healthCheckRetryTimeout": { + "type": "string" + }, + "upgradeTimeout": { + "type": "string" + }, + "upgradeDomainTimeout": { + "type": "string" + }, + "healthPolicy": { + "$ref": "#/definitions/PaasClusterUpgradeHealthPolicy" + }, + "deltaHealthPolicy": { + "$ref": "#/definitions/PaasClusterUpgradeDeltaHealthPolicy" + } + } + }, + "diagnosticsStorageAccountConfig": { + "description": "Diagnostics storage account config", + "properties": { + "storageAccountName": { + "type": "string" + }, + "primaryAccessKey": { + "type": "string" + }, + "secondaryAccessKey": { + "type": "string" + }, + "protectedAccountKeyName": { + "type": "string" + }, + "blobEndpoint": { + "type": "string" + }, + "queueEndpoint": { + "type": "string" + }, + "tableEndpoint": { + "type": "string" + } + } + }, + "clusterResourceProperties": { + "description": "The cluster resource properties", + "properties": { + "availableClusterVersions": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ClusterVersionDetails" + } + }, + "clusterId": { + "type": "string" + }, + "clusterState": { + "type": "string", + "enum": [ + "Default", + "WaitingForNodes", + "Deploying", + "BaselineUpgrade", + "UpdatingUserConfiguration", + "UpdatingUserCertificate", + "UpdatingInfrastructure", + "EnforcingClusterVersion", + "UpgradeServiceUnreachable", + "Deleting", + "ScaleUp", + "ScaleDown", + "AutoScale", + "Ready", + "Failed" + ] + }, + "clusterEndpoint": { + "type": "string", + "readOnly": true + }, + "clusterCodeVersion": { + "type": "string" + }, + "certificate": { + "$ref": "#/definitions/CertificateDescription" + }, + "reliabilityLevel": { + "type": "string", + "enum": [ + "Invalid", + "Bronze", + "Silver", + "Gold", + "Platinum" + ] + }, + "upgradeMode": { + "type": "string", + "enum": [ + "Default", + "Automatic", + "Manual" + ] + }, + "clientCertificateThumbprints": { + "type": "array", + "items": { + "$ref": "#/definitions/ClientCertificateThumbprint" + } + }, + "clientCertificateCommonNames": { + "type": "array", + "items": { + "$ref": "#/definitions/ClientCertificateCommonName" + } + }, + "fabricSettings": { + "type": "array", + "items": { + "$ref": "#/definitions/SettingsSectionDescription" + } + }, + "reverseProxyCertificate": { + "$ref": "#/definitions/CertificateDescription" + }, + "managementEndpoint": { + "type": "string", + "readOnly": true + }, + "nodeTypes": { + "type": "array", + "items": { + "$ref": "#/definitions/NodeTypeDescription" + } + }, + "provisioningState": { + "type": "string", + "readOnly": true, + "enum": [ + "Default", + "WaitingForNodes", + "Deploying", + "BaselineUpgrade", + "UpdatingUserConfiguration", + "UpdatingUserCertificate", + "UpdatingInfrastructure", + "EnforcingClusterVersion", + "UpgradeServiceUnreachable", + "Deleting", + "ScaleUp", + "ScaleDown", + "AutoScale", + "Ready", + "Failed" + ] + }, + "vmImage": { + "type": "string", + "readOnly": true + }, + "diagnosticsStorageAccountConfig": { + "$ref": "#/definitions/diagnosticsStorageAccountConfig" + }, + "upgradeDescription": { + "$ref": "#/definitions/paasClusterUpgradePolicy" + } + } + }, + "clusterPatchParameters": { + "description": "Cluster patch parameters", + "properties": { + "properties": { + "$ref": "#/definitions/clusterResourceProperties" + }, + "propertyNames": { + "description": "Allowed properties", + "type": "array", + "items": { + "type": "string", + "enum": [ + "ReliabilityLevel", + "ClusterUpgradeMode", + "ClientCertificateThumbprints", + "FabricSettings", + "ReverseProxyCertificate", + "NodeTypes" + ] + } + } + }, + "required": [ + "properties" + ], + "x-ms-azure-resource": false + }, + "ClusterPatchRequest": { + "description": "Cluster patch request", + "properties": { + "properties": { + "$ref": "#/definitions/clusterPatchParameters" + } + } + }, + "ClusterResource": { + "description": "The cluster resource", + "properties": { + "properties": { + "$ref": "#/definitions/clusterResourceProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ErrorModel": { + "description": "The model of the error", + "properties": { + "error": { + "description": "The error", + "properties": { + "code": { + "type": "string" + }, + "message": { + "type": "string" + } + } + } + } + }, + "Resource": { + "description": "The resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource ID." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "location": { + "type": "string", + "description": "Resource location." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true + } + }, + "parameters": { + "subscriptionId": { + "type": "string", + "name": "subscriptionId", + "description": "The subscription identifier", + "in": "path", + "required": true + }, + "api-version": { + "type": "string", + "name": "api-version", + "description": "The version of the api", + "in": "query", + "required": true + } + } +} \ No newline at end of file From e07f8d97733f5d65abc7cbdaf0479c693c82bf71 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 2 Mar 2017 21:29:11 -0800 Subject: [PATCH 02/25] fix comments --- .../2016-09-01/swagger/servicefabric.json | 160 +++++++++++++++--- 1 file changed, 133 insertions(+), 27 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 4049caf46587..8e9dcb0c1c16 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -38,7 +38,7 @@ "tags": [ "ClusterpatchOperation" ], - "operationId": "ClusterOperation_Update", + "operationId": "Clusters_Update", "description": "Update cluster config", "produces": [ "application/json" @@ -69,7 +69,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ClusterPatchRequest" + "$ref": "#/definitions/ClusterUpdateParameters" }, "description": "Patch Request" }, @@ -96,8 +96,8 @@ "tags": [ "ClusterGetOperation" ], - "operationId": "ClusterOperation_get", - "description": "Get cluster config", + "operationId": "Clusters_Get", + "description": "Get cluster resource", "produces": [ "application/json" ], @@ -127,13 +127,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ClusterResource" + "$ref": "#/definitions/Cluster" } }, "202": { "description": "Accepted", "schema": { - "$ref": "#/definitions/ClusterResource" + "$ref": "#/definitions/Cluster" } }, "default": { @@ -148,8 +148,8 @@ "tags": [ "ClusterCreateOperation" ], - "operationId": "ClusterOperation_Create", - "description": "Create cluster config", + "operationId": "Clusters_Create", + "description": "Create cluster resource", "produces": [ "application/json" ], @@ -179,7 +179,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ClusterResource" + "$ref": "#/definitions/Cluster" }, "description": "Put Request" }, @@ -191,13 +191,100 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ClusterResource" + "$ref": "#/definitions/Cluster" } }, "202": { "description": "Accepted", "schema": { - "$ref": "#/definitions/ClusterResource" + "$ref": "#/definitions/Cluster" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters": { + "get": { + "tags": [ + "ClusterListByResourceGroupOperation" + ], + "operationId": "Clusters_ListByResourceGroup", + "description": "List cluster resource by resource group", + "produces": [ + "application/json" + ], + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Resource Group to which the server belongs." + }, + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ClusterListResult" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ClusterListResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ServiceFabric/clusters": { + "get": { + "tags": [ + "ClusterListOperation" + ], + "operationId": "Clusters_List", + "description": "List cluster resource", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ClusterListResult" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ClusterListResult" } }, "default": { @@ -210,7 +297,7 @@ } } }, - "definitions": { + "definitions": { "CertificateDescription": { "description": "Certificate description", "properties": { @@ -297,7 +384,7 @@ }, "httpGatewayEndpointPort": { "type": "integer" - }, + }, "durabilityLevel": { "type": "string", "enum": [ @@ -330,7 +417,7 @@ "properties": { "isAdmin": { "type": "boolean", - "description": "Is admin or not" + "description": "Is admin or not" }, "certificateThumbprint": { "type": "string" @@ -342,7 +429,7 @@ "properties": { "isAdmin": { "type": "boolean", - "description": "Is admin or not" + "description": "Is admin or not" }, "certificateIssuerThumbprint": { "type": "string" @@ -452,7 +539,7 @@ } } }, - "paasClusterUpgradePolicy": { + "PaasClusterUpgradePolicy": { "description": "Paas cluster upgrade policy", "properties": { "overrideUserUpgradePolicy": { @@ -487,7 +574,7 @@ } } }, - "diagnosticsStorageAccountConfig": { + "DiagnosticsStorageAccountConfig": { "description": "Diagnostics storage account config", "properties": { "storageAccountName": { @@ -513,7 +600,7 @@ } } }, - "clusterResourceProperties": { + "ClusterProperties": { "description": "The cluster resource properties", "properties": { "availableClusterVersions": { @@ -631,18 +718,25 @@ "readOnly": true }, "diagnosticsStorageAccountConfig": { - "$ref": "#/definitions/diagnosticsStorageAccountConfig" + "$ref": "#/definitions/DiagnosticsStorageAccountConfig" }, "upgradeDescription": { - "$ref": "#/definitions/paasClusterUpgradePolicy" + "$ref": "#/definitions/PaasClusterUpgradePolicy" } } }, - "clusterPatchParameters": { + "ClusterPropertiesUpdateParameters": { "description": "Cluster patch parameters", "properties": { "properties": { - "$ref": "#/definitions/clusterResourceProperties" + "$ref": "#/definitions/ClusterProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Cluster tags." }, "propertyNames": { "description": "Allowed properties", @@ -655,7 +749,8 @@ "ClientCertificateThumbprints", "FabricSettings", "ReverseProxyCertificate", - "NodeTypes" + "NodeTypes", + "Tags" ] } } @@ -665,19 +760,19 @@ ], "x-ms-azure-resource": false }, - "ClusterPatchRequest": { + "ClusterUpdateParameters": { "description": "Cluster patch request", "properties": { "properties": { - "$ref": "#/definitions/clusterPatchParameters" + "$ref": "#/definitions/ClusterPropertiesUpdateParameters" } } }, - "ClusterResource": { + "Cluster": { "description": "The cluster resource", "properties": { "properties": { - "$ref": "#/definitions/clusterResourceProperties" + "$ref": "#/definitions/ClusterProperties" } }, "allOf": [ @@ -686,6 +781,17 @@ } ] }, + "ClusterListResult": { + "description": "Cluster list result", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Cluster" + } + } + } + }, "ErrorModel": { "description": "The model of the error", "properties": { From b3b4d495af5aa23d37575a8161d079920866abc4 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 2 Mar 2017 22:00:26 -0800 Subject: [PATCH 03/25] fix commets 2 --- .../2016-09-01/swagger/servicefabric.json | 83 +++++++++++-------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 8e9dcb0c1c16..76630cca3649 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -81,9 +81,6 @@ "200": { "description": "OK" }, - "202": { - "description": "Accepted" - }, "default": { "description": "Error", "schema": { @@ -130,12 +127,6 @@ "$ref": "#/definitions/Cluster" } }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/Cluster" - } - }, "default": { "description": "Error", "schema": { @@ -194,11 +185,45 @@ "$ref": "#/definitions/Cluster" } }, - "202": { - "description": "Accepted", + "default": { + "description": "Error", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/ErrorModel" } + } + } + }, + "delete": { + "tags": [ + "ClusterDeleteOperation" + ], + "operationId": "Clusters_Delete", + "description": "Delete cluster resource", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Resource Group to which the server belongs." + }, + { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the cluster" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "OK" }, "default": { "description": "Error", @@ -240,19 +265,10 @@ "schema": { "$ref": "#/definitions/ClusterListResult" } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ClusterListResult" - } - }, - "default": { - "description": "Error", - "schema": { - "$ref": "#/definitions/ErrorModel" - } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, @@ -280,19 +296,10 @@ "schema": { "$ref": "#/definitions/ClusterListResult" } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ClusterListResult" - } - }, - "default": { - "description": "Error", - "schema": { - "$ref": "#/definitions/ErrorModel" - } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } } @@ -789,6 +796,10 @@ "items": { "$ref": "#/definitions/Cluster" } + }, + "nextLink": { + "type": "string", + "description": "The URL to use for getting the next set of results." } } }, From 46358eb9ab154669bf87d6f71edb81d771b9fbf4 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Fri, 3 Mar 2017 13:03:43 -0800 Subject: [PATCH 04/25] add example and fix comments --- .../ClusterDeleteOperation_example.json | 11 + .../examples/ClusterGetOperation_example.json | 167 +++++++++ ...rListByResourceGroupOperation_exmaple.json | 247 ++++++++++++++ .../ClusterListOperation_example.json | 246 +++++++++++++ .../ClusterPatchOperation_exmaple.json | 195 +++++++++++ .../examples/ClusterPutOperation_exmaple.json | 323 ++++++++++++++++++ .../2016-09-01/swagger/servicefabric.json | 37 +- 7 files changed, 1222 insertions(+), 4 deletions(-) create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json diff --git a/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json new file mode 100644 index 000000000000..17752f39fb1f --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "resRg", + "clusterName": "myCluster", + "api-version": "2016-09-01" + }, + "responses": { + "200": {} + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json new file mode 100644 index 000000000000..1c489d5c5ca7 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json @@ -0,0 +1,167 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "resRg", + "clusterName": "myCluster", + "api-version": "2016-09-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "location": "southcentralus", + "name": "myCluster", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "1a1acec2-8d75-424a-81af-2fb83dd1cac8", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "Ready", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/1a1acec2-8d75-424a-81af-2fb83dd1cac8", + "certificate": { + "thumbprint": "1901CF0F76AF711BEE53DF39941092BDAC8D9050", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "3nrb4ixoj6ogq2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://3nrb4ixoj6ogq2.blob.core.windows.net/", + "queueEndpoint": "https://3nrb4ixoj6ogq2.queue.core.windows.net/", + "tableEndpoint": "https://3nrb4ixoj6ogq2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + }, + "tags": { + "clusterName": "myCluster", + "resourceType": "Service Fabric" + }, + "type": "Microsoft.ServiceFabric/clusters" + } + } + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json new file mode 100644 index 000000000000..e7ffb3b9d398 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json @@ -0,0 +1,247 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "resRg", + "api-version": "2016-09-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "type": "Microsoft.ServiceFabric/clusters", + "location": "westus", + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/bmwdemo", + "name": "bmwdemo", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "bmwdemo" + }, + "etag": "W/\"636235816154466842\"", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "a4e23572-8443-470e-adcb-3b7ebe6d582b", + "clusterCodeVersion": "5.4.164.9494", + "clusterState": "Ready", + "managementEndpoint": "http://bmwdemo.westus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://westus.servicefabric.azure.com/runtime/clusters/a4e23572-8443-470e-adcb-3b7ebe6d582b", + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "sflogsbmwdemo4564", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://sflogsbmwdemo4564.blob.core.windows.net/", + "queueEndpoint": "https://sflogsbmwdemo4564.queue.core.windows.net/", + "tableEndpoint": "https://sflogsbmwdemo4564.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "Demo", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + }, + { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/sfclust4", + "name": "sfclust4", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "sfclust4" + }, + "etag": "W/\"636236828712048932\"", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "Ready", + "managementEndpoint": "https://sfclust4.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", + "certificate": { + "thumbprint": "68A89C30F20B2A198B0A26DF3744079D0F5AC2FC", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "t2vgl3f2bk6qw2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://t2vgl3f2bk6qw2.blob.core.windows.net/", + "queueEndpoint": "https://t2vgl3f2bk6qw2.queue.core.windows.net/", + "tableEndpoint": "https://t2vgl3f2bk6qw2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json new file mode 100644 index 000000000000..1bbab9beecb6 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json @@ -0,0 +1,246 @@ +{ + "parameters": { + "subscriptionId": "subid", + "api-version": "2016-09-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "type": "Microsoft.ServiceFabric/clusters", + "location": "westus", + "id": "/subscriptions/subid/resourcegroups/bmwdemo/providers/Microsoft.ServiceFabric/clusters/bmwdemo", + "name": "bmwdemo", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "bmwdemo" + }, + "etag": "W/\"636235816154466842\"", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "a4e23572-8443-470e-adcb-3b7ebe6d582b", + "clusterCodeVersion": "5.4.164.9494", + "clusterState": "Ready", + "managementEndpoint": "http://bmwdemo.westus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://westus.servicefabric.azure.com/runtime/clusters/a4e23572-8443-470e-adcb-3b7ebe6d582b", + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "sflogsbmwdemo4564", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://sflogsbmwdemo4564.blob.core.windows.net/", + "queueEndpoint": "https://sflogsbmwdemo4564.queue.core.windows.net/", + "tableEndpoint": "https://sflogsbmwdemo4564.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "Demo", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + }, + { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/subid/resourcegroups/psdeployrg4/providers/Microsoft.ServiceFabric/clusters/sfclust4", + "name": "sfclust4", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "sfclust4" + }, + "etag": "W/\"636236828712048932\"", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "Ready", + "managementEndpoint": "https://sfclust4.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", + "certificate": { + "thumbprint": "68A89C30F20B2A198B0A26DF3744079D0F5AC2FC", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "t2vgl3f2bk6qw2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://t2vgl3f2bk6qw2.blob.core.windows.net/", + "queueEndpoint": "https://t2vgl3f2bk6qw2.queue.core.windows.net/", + "tableEndpoint": "https://t2vgl3f2bk6qw2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json new file mode 100644 index 000000000000..4f86c7c53254 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -0,0 +1,195 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "resRg", + "clusterName": "myCluster", + "api-version": "2016-09-01", + "ClusterUpdateParameters": { + "properties": { + "properties": { + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "durabilityLevel": "Silver", + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5 + } + ] + }, + "propertyNames": [ + "NodeTypes.DurabilityLevel" + ] + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" + }, + "etag": "W/\"636236839047996583\"", + "properties": { + "provisioningState": "Updating", + "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "UpdatingUserConfiguration", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", + "certificate": { + "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "ba3wzulspn67w2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", + "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", + "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json new file mode 100644 index 000000000000..2746ab521b03 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json @@ -0,0 +1,323 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "resRg", + "clusterName": "myCluster", + "api-version": "2016-09-01", + "ClusterUpdateParameters": { + "properties": { + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ], + "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", + "clusterState": "Ready", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", + "clusterCodeVersion": "5.5.149.9494", + "certificate": { + "thumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A", + "thumbprintSecondary": "361A93445450CC8F2FF747F74500E8044942DAFD", + "x509StoreName": "My" + }, + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "managementEndpoint": "https://sfclust2.southcentralus.cloudapp.azure.com:19080", + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "durabilityLevel": "Bronze", + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5 + } + ], + "provisioningState": "Succeeded", + "vmImage": "Windows", + "diagnosticsStorageAccountConfig": { + "storageAccountName": "7623qfhwmnstw2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://7623qfhwmnstw2.blob.core.windows.net/", + "queueEndpoint": "https://7623qfhwmnstw2.queue.core.windows.net/", + "tableEndpoint": "https://7623qfhwmnstw2.table.core.windows.net/" + }, + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + } + }, + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" + }, + "etag": "W/\"636236839047996583\"", + "properties": { + "provisioningState": "Updating", + "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "UpdatingUserConfiguration", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", + "certificate": { + "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "ba3wzulspn67w2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", + "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", + "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 76630cca3649..4df38b24164b 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -36,10 +36,14 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}": { "patch": { "tags": [ - "ClusterpatchOperation" + "ClusterPatchOperation" ], + "x-ms-long-running-operation": true, "operationId": "Clusters_Update", "description": "Update cluster config", + "x-ms-examples": { + "Patch a cluster": { "$ref": "../examples/ClusterPatchOperation_exmaple.json" } + }, "produces": [ "application/json" ], @@ -65,7 +69,7 @@ "$ref": "#/parameters/api-version" }, { - "name": "PatchRequest", + "name": "ClusterUpdateParameters", "in": "body", "required": true, "schema": { @@ -81,6 +85,9 @@ "200": { "description": "OK" }, + "202": { + "description": "Accept" + }, "default": { "description": "Error", "schema": { @@ -95,6 +102,9 @@ ], "operationId": "Clusters_Get", "description": "Get cluster resource", + "x-ms-examples": { + "Get a cluster": { "$ref": "../examples/ClusterGetOperation_example.json" } + }, "produces": [ "application/json" ], @@ -140,7 +150,11 @@ "ClusterCreateOperation" ], "operationId": "Clusters_Create", + "x-ms-long-running-operation": true, "description": "Create cluster resource", + "x-ms-examples": { + "Put a cluster": { "$ref": "../examples/ClusterPutOperation_exmaple.json" } + }, "produces": [ "application/json" ], @@ -166,7 +180,7 @@ "$ref": "#/parameters/api-version" }, { - "name": "PutRequest", + "name": "ClusterUpdateParameters", "in": "body", "required": true, "schema": { @@ -185,6 +199,9 @@ "$ref": "#/definitions/Cluster" } }, + "202": { + "description": "Accept" + }, "default": { "description": "Error", "schema": { @@ -199,6 +216,9 @@ ], "operationId": "Clusters_Delete", "description": "Delete cluster resource", + "x-ms-examples": { + "Delete a cluster": { "$ref": "../examples/ClusterDeleteOperation_example.json" } + }, "parameters": [ { "name": "resourceGroupName", @@ -225,6 +245,9 @@ "200": { "description": "OK" }, + "204": { + "description": "NoContent" + }, "default": { "description": "Error", "schema": { @@ -241,6 +264,9 @@ ], "operationId": "Clusters_ListByResourceGroup", "description": "List cluster resource by resource group", + "x-ms-examples": { + "List cluster by resource group": { "$ref": "../examples/ClusterListByResourceGroupOperation_exmaple.json" } + }, "produces": [ "application/json" ], @@ -279,6 +305,9 @@ ], "operationId": "Clusters_List", "description": "List cluster resource", + "x-ms-examples": { + "List clusters": { "$ref": "../examples/ClusterListOperation_example.json" } + }, "produces": [ "application/json" ], @@ -789,7 +818,7 @@ ] }, "ClusterListResult": { - "description": "Cluster list result", + "description": "Cluster list results", "properties": { "value": { "type": "array", From 3ceecb26f3a07964f1c8c06a0d6e3a8abc746cb8 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Sat, 4 Mar 2017 09:41:30 -0800 Subject: [PATCH 05/25] use flatten properties --- .../2016-09-01/swagger/servicefabric.json | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 4df38b24164b..6de1f0c5320e 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -42,7 +42,9 @@ "operationId": "Clusters_Update", "description": "Update cluster config", "x-ms-examples": { - "Patch a cluster": { "$ref": "../examples/ClusterPatchOperation_exmaple.json" } + "Patch a cluster": { + "$ref": "../examples/ClusterPatchOperation_exmaple.json" + } }, "produces": [ "application/json" @@ -103,7 +105,9 @@ "operationId": "Clusters_Get", "description": "Get cluster resource", "x-ms-examples": { - "Get a cluster": { "$ref": "../examples/ClusterGetOperation_example.json" } + "Get a cluster": { + "$ref": "../examples/ClusterGetOperation_example.json" + } }, "produces": [ "application/json" @@ -152,8 +156,10 @@ "operationId": "Clusters_Create", "x-ms-long-running-operation": true, "description": "Create cluster resource", - "x-ms-examples": { - "Put a cluster": { "$ref": "../examples/ClusterPutOperation_exmaple.json" } + "x-ms-examples": { + "Put a cluster": { + "$ref": "../examples/ClusterPutOperation_exmaple.json" + } }, "produces": [ "application/json" @@ -216,8 +222,10 @@ ], "operationId": "Clusters_Delete", "description": "Delete cluster resource", - "x-ms-examples": { - "Delete a cluster": { "$ref": "../examples/ClusterDeleteOperation_example.json" } + "x-ms-examples": { + "Delete a cluster": { + "$ref": "../examples/ClusterDeleteOperation_example.json" + } }, "parameters": [ { @@ -265,7 +273,9 @@ "operationId": "Clusters_ListByResourceGroup", "description": "List cluster resource by resource group", "x-ms-examples": { - "List cluster by resource group": { "$ref": "../examples/ClusterListByResourceGroupOperation_exmaple.json" } + "List cluster by resource group": { + "$ref": "../examples/ClusterListByResourceGroupOperation_exmaple.json" + } }, "produces": [ "application/json" @@ -306,7 +316,9 @@ "operationId": "Clusters_List", "description": "List cluster resource", "x-ms-examples": { - "List clusters": { "$ref": "../examples/ClusterListOperation_example.json" } + "List clusters": { + "$ref": "../examples/ClusterListOperation_example.json" + } }, "produces": [ "application/json" @@ -765,6 +777,7 @@ "description": "Cluster patch parameters", "properties": { "properties": { + "x-ms-client-flatten": true, "$ref": "#/definitions/ClusterProperties" }, "tags": { @@ -800,6 +813,7 @@ "description": "Cluster patch request", "properties": { "properties": { + "x-ms-client-flatten": true, "$ref": "#/definitions/ClusterPropertiesUpdateParameters" } } @@ -808,6 +822,7 @@ "description": "The cluster resource", "properties": { "properties": { + "x-ms-client-flatten": true, "$ref": "#/definitions/ClusterProperties" } }, From 1596740f44e98327cb62cbc29467c0bce75464cd Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Mon, 6 Mar 2017 16:00:40 -0800 Subject: [PATCH 06/25] small update --- arm-servicefabric/2016-09-01/swagger/servicefabric.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 6de1f0c5320e..4a6d03768727 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -85,7 +85,10 @@ ], "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/Cluster" + } }, "202": { "description": "Accept" @@ -774,7 +777,7 @@ } }, "ClusterPropertiesUpdateParameters": { - "description": "Cluster patch parameters", + "description": "Cluster properties update parameters", "properties": { "properties": { "x-ms-client-flatten": true, @@ -810,7 +813,7 @@ "x-ms-azure-resource": false }, "ClusterUpdateParameters": { - "description": "Cluster patch request", + "description": "Cluster update request", "properties": { "properties": { "x-ms-client-flatten": true, From da2f21c6b51ffb5251003581943f95f351f267c6 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Mon, 6 Mar 2017 16:32:34 -0800 Subject: [PATCH 07/25] mark readonly --- .../2016-09-01/swagger/servicefabric.json | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 4a6d03768727..38b2ad28b4c6 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -629,25 +629,32 @@ "description": "Diagnostics storage account config", "properties": { "storageAccountName": { - "type": "string" + "type": "string", + "readOnly": true }, "primaryAccessKey": { - "type": "string" + "type": "string", + "readOnly": true }, "secondaryAccessKey": { - "type": "string" + "type": "string", + "readOnly": true }, "protectedAccountKeyName": { - "type": "string" + "type": "string", + "readOnly": true }, "blobEndpoint": { - "type": "string" + "type": "string", + "readOnly": true }, "queueEndpoint": { - "type": "string" + "type": "string", + "readOnly": true }, "tableEndpoint": { - "type": "string" + "type": "string", + "readOnly": true } } }, @@ -662,9 +669,11 @@ } }, "clusterId": { + "readOnly": true, "type": "string" }, "clusterState": { + "readOnly": true, "type": "string", "enum": [ "Default", From abe445adadae1b3a77f89272a0030764df08dc12 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Tue, 7 Mar 2017 07:16:13 -0800 Subject: [PATCH 08/25] fix comments --- .../ClusterDeleteOperation_example.json | 2 +- .../examples/ClusterGetOperation_example.json | 4 +- ...rListByResourceGroupOperation_exmaple.json | 159 +------- .../ClusterListOperation_example.json | 6 +- .../ClusterPatchOperation_exmaple.json | 349 +++++++++--------- .../examples/ClusterPutOperation_exmaple.json | 79 +--- .../2016-09-01/swagger/servicefabric.json | 62 ++-- 7 files changed, 209 insertions(+), 452 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json index 17752f39fb1f..f7dc439b8bb3 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01" diff --git a/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json index 1c489d5c5ca7..8dec6391d607 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterGetOperation_example.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01" @@ -9,7 +9,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", "location": "southcentralus", "name": "myCluster", "properties": { diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json index e7ffb3b9d398..3bb5d148020f 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "resRg", "api-version": "2016-09-01" }, @@ -12,7 +12,7 @@ { "type": "Microsoft.ServiceFabric/clusters", "location": "westus", - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/bmwdemo", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/bmwdemo", "name": "bmwdemo", "tags": { "resourceType": "Service Fabric", @@ -84,161 +84,6 @@ } ] } - }, - { - "type": "Microsoft.ServiceFabric/clusters", - "location": "southcentralus", - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/sfclust4", - "name": "sfclust4", - "tags": { - "resourceType": "Service Fabric", - "clusterName": "sfclust4" - }, - "etag": "W/\"636236828712048932\"", - "properties": { - "provisioningState": "Succeeded", - "clusterId": "029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", - "clusterCodeVersion": "5.5.149.9494", - "clusterState": "Ready", - "managementEndpoint": "https://sfclust4.southcentralus.cloudapp.azure.com:19080", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", - "certificate": { - "thumbprint": "68A89C30F20B2A198B0A26DF3744079D0F5AC2FC", - "x509StoreName": "My" - }, - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], - "fabricSettings": [ - { - "name": "Security", - "parameters": [ - { - "name": "ClusterProtectionLevel", - "value": "EncryptAndSign" - } - ] - } - ], - "upgradeDescription": { - "overrideUserUpgradePolicy": false, - "forceRestart": true, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "diagnosticsStorageAccountConfig": { - "storageAccountName": "t2vgl3f2bk6qw2", - "protectedAccountKeyName": "StorageAccountKey1", - "blobEndpoint": "https://t2vgl3f2bk6qw2.blob.core.windows.net/", - "queueEndpoint": "https://t2vgl3f2bk6qw2.queue.core.windows.net/", - "tableEndpoint": "https://t2vgl3f2bk6qw2.table.core.windows.net/" - }, - "nodeTypes": [ - { - "name": "nt1vm", - "clientConnectionEndpointPort": 19000, - "httpGatewayEndpointPort": 19080, - "applicationPorts": { - "startPort": 20000, - "endPort": 30000 - }, - "ephemeralPorts": { - "startPort": 49152, - "endPort": 65534 - }, - "isPrimary": true, - "vmInstanceCount": 5, - "durabilityLevel": "Bronze" - } - ], - "vmImage": "Windows", - "reliabilityLevel": "Silver", - "upgradeMode": "Automatic", - "availableClusterVersions": [ - { - "codeVersion": "5.1.158.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.0.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.207.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.121.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.311.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.30.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.35.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.38.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.118.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.132.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.145.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.164.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.67.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.149.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - } - ] - } } ] } diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json index 1bbab9beecb6..0699db42f414 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2016-09-01" }, "responses": { @@ -11,7 +11,7 @@ { "type": "Microsoft.ServiceFabric/clusters", "location": "westus", - "id": "/subscriptions/subid/resourcegroups/bmwdemo/providers/Microsoft.ServiceFabric/clusters/bmwdemo", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/bmwdemo/providers/Microsoft.ServiceFabric/clusters/bmwdemo", "name": "bmwdemo", "tags": { "resourceType": "Service Fabric", @@ -87,7 +87,7 @@ { "type": "Microsoft.ServiceFabric/clusters", "location": "southcentralus", - "id": "/subscriptions/subid/resourcegroups/psdeployrg4/providers/Microsoft.ServiceFabric/clusters/sfclust4", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/psdeployrg4/providers/Microsoft.ServiceFabric/clusters/sfclust4", "name": "sfclust4", "tags": { "resourceType": "Service Fabric", diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json index 4f86c7c53254..d68b2bc31b2d 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -1,195 +1,192 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01", "ClusterUpdateParameters": { "properties": { - "properties": { - "nodeTypes": [ - { - "name": "nt1vm", - "clientConnectionEndpointPort": 19000, - "httpGatewayEndpointPort": 19080, - "durabilityLevel": "Silver", - "applicationPorts": { - "startPort": 20000, - "endPort": 30000 - }, - "ephemeralPorts": { - "startPort": 49152, - "endPort": 65534 - }, - "isPrimary": true, - "vmInstanceCount": 5 - } - ] - }, + "nodeTypes": [ + { + "name": "n1", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "durabilityLevel": "Silver", + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5 + } + ], "propertyNames": [ "NodeTypes.DurabilityLevel" ] } - } - }, - "responses": { - "200": { - "headers": {}, - "body": { - "type": "Microsoft.ServiceFabric/clusters", - "location": "southcentralus", - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", - "name": "myCluster", - "tags": { - "resourceType": "Service Fabric", - "clusterName": "myCluster" - }, - "etag": "W/\"636236839047996583\"", - "properties": { - "provisioningState": "Updating", - "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", - "clusterCodeVersion": "5.5.149.9494", - "clusterState": "UpdatingUserConfiguration", - "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", - "certificate": { - "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", - "x509StoreName": "My" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" }, - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], - "fabricSettings": [ - { - "name": "Security", - "parameters": [ - { - "name": "ClusterProtectionLevel", - "value": "EncryptAndSign" - } - ] - } - ], - "upgradeDescription": { - "overrideUserUpgradePolicy": false, - "forceRestart": true, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 + "etag": "W/\"636236839047996583\"", + "properties": { + "provisioningState": "Updating", + "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "UpdatingUserConfiguration", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", + "certificate": { + "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", + "x509StoreName": "My" }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "diagnosticsStorageAccountConfig": { - "storageAccountName": "ba3wzulspn67w2", - "protectedAccountKeyName": "StorageAccountKey1", - "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", - "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", - "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" - }, - "nodeTypes": [ - { - "name": "nt1vm", - "clientConnectionEndpointPort": 19000, - "httpGatewayEndpointPort": 19080, - "applicationPorts": { - "startPort": 20000, - "endPort": 30000 - }, - "ephemeralPorts": { - "startPort": 49152, - "endPort": 65534 + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 }, - "isPrimary": true, - "vmInstanceCount": 5, - "durabilityLevel": "Bronze" - } - ], - "vmImage": "Windows", - "reliabilityLevel": "Silver", - "upgradeMode": "Automatic", - "availableClusterVersions": [ - { - "codeVersion": "5.1.158.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.0.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.207.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.121.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.311.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.30.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.35.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.38.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.118.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } }, - { - "codeVersion": "5.4.132.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" + "diagnosticsStorageAccountConfig": { + "storageAccountName": "ba3wzulspn67w2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", + "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", + "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" }, - { - "codeVersion": "5.4.145.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.164.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.67.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.149.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - } - ] + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } } } } - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json index 2746ab521b03..7cf7a91d8433 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json @@ -1,85 +1,12 @@ { "parameters": { - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01", "ClusterUpdateParameters": { "properties": { - "availableClusterVersions": [ - { - "codeVersion": "5.1.158.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.0.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.207.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.121.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.311.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.30.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.35.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.38.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.118.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.132.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.145.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.164.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.67.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.149.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - } - ], "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", - "clusterState": "Ready", "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterCodeVersion": "5.5.149.9494", "certificate": { @@ -150,7 +77,7 @@ } } }, - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", "name": "myCluster", "type": "Microsoft.ServiceFabric/clusters", "location": "southcentralus", @@ -166,7 +93,7 @@ "body": { "type": "Microsoft.ServiceFabric/clusters", "location": "southcentralus", - "id": "/subscriptions/subid/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", "name": "myCluster", "tags": { "resourceType": "Service Fabric", diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 38b2ad28b4c6..e846e3cc03b9 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -40,7 +40,7 @@ ], "x-ms-long-running-operation": true, "operationId": "Clusters_Update", - "description": "Update cluster config", + "description": "Update cluster configuration", "x-ms-examples": { "Patch a cluster": { "$ref": "../examples/ClusterPatchOperation_exmaple.json" @@ -77,7 +77,7 @@ "schema": { "$ref": "#/definitions/ClusterUpdateParameters" }, - "description": "Patch Request" + "description": "The parameters which contains the property value and property name which used to update the cluster configuration" }, { "$ref": "#/parameters/subscriptionId" @@ -85,13 +85,13 @@ ], "responses": { "200": { - "description": "OK", + "description": "OK - Cluster updated successfully", "schema": { "$ref": "#/definitions/Cluster" } }, "202": { - "description": "Accept" + "description": "Accepted - Update request accepted; the operation will complete asynchronously." }, "default": { "description": "Error", @@ -139,7 +139,7 @@ ], "responses": { "200": { - "description": "OK", + "description": "OK - Get cluster successfully", "schema": { "$ref": "#/definitions/Cluster" } @@ -189,7 +189,7 @@ "$ref": "#/parameters/api-version" }, { - "name": "ClusterUpdateParameters", + "name": "Cluster resource", "in": "body", "required": true, "schema": { @@ -203,13 +203,13 @@ ], "responses": { "200": { - "description": "OK", + "description": "OK - Put cluster successfully", "schema": { "$ref": "#/definitions/Cluster" } }, "202": { - "description": "Accept" + "description": "Accepted - Put request accepted; the operation will complete asynchronously." }, "default": { "description": "Error", @@ -254,7 +254,7 @@ ], "responses": { "200": { - "description": "OK" + "description": "OK - cluster deleted successfully" }, "204": { "description": "NoContent" @@ -285,7 +285,7 @@ ], "parameters": [ { - "name": "resourceGroupName", + "name": "resourceGroupName", "in": "path", "required": true, "type": "string", @@ -300,7 +300,7 @@ ], "responses": { "200": { - "description": "OK", + "description": "OK - Get cluster successfully", "schema": { "$ref": "#/definitions/ClusterListResult" } @@ -336,7 +336,7 @@ ], "responses": { "200": { - "description": "OK", + "description": "OK - Get cluster successfully", "schema": { "$ref": "#/definitions/ClusterListResult" } @@ -378,11 +378,11 @@ "properties": { "name": { "type": "string", - "description": "name" + "description": "The name of settings parameter description" }, "value": { "type": "string", - "description": "name" + "description": "The value of the property" } } }, @@ -391,7 +391,7 @@ "properties": { "name": { "type": "string", - "description": "name" + "description": "The name of settings section description" }, "parameters": { "type": "array", @@ -629,32 +629,25 @@ "description": "Diagnostics storage account config", "properties": { "storageAccountName": { - "type": "string", - "readOnly": true + "type": "string" }, "primaryAccessKey": { - "type": "string", - "readOnly": true + "type": "string" }, "secondaryAccessKey": { - "type": "string", - "readOnly": true + "type": "string" }, "protectedAccountKeyName": { - "type": "string", - "readOnly": true + "type": "string" }, "blobEndpoint": { - "type": "string", - "readOnly": true + "type": "string" }, "queueEndpoint": { - "type": "string", - "readOnly": true + "type": "string" }, "tableEndpoint": { - "type": "string", - "readOnly": true + "type": "string" } } }, @@ -669,7 +662,6 @@ } }, "clusterId": { - "readOnly": true, "type": "string" }, "clusterState": { @@ -694,8 +686,7 @@ ] }, "clusterEndpoint": { - "type": "string", - "readOnly": true + "type": "string" }, "clusterCodeVersion": { "type": "string" @@ -743,8 +734,7 @@ "$ref": "#/definitions/CertificateDescription" }, "managementEndpoint": { - "type": "string", - "readOnly": true + "type": "string" }, "nodeTypes": { "type": "array", @@ -754,7 +744,6 @@ }, "provisioningState": { "type": "string", - "readOnly": true, "enum": [ "Default", "WaitingForNodes", @@ -774,8 +763,7 @@ ] }, "vmImage": { - "type": "string", - "readOnly": true + "type": "string" }, "diagnosticsStorageAccountConfig": { "$ref": "#/definitions/DiagnosticsStorageAccountConfig" From f0a3bf845241475af7eb0a4a9a5cba520dfdd559 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Tue, 7 Mar 2017 11:56:59 -0800 Subject: [PATCH 09/25] update patch --- .../2016-09-01/swagger/servicefabric.json | 87 ++++++++++++------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index e846e3cc03b9..62b7d5e9d2eb 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -285,7 +285,7 @@ ], "parameters": [ { - "name": "resourceGroupName", + "name": "resourceGroupName", "in": "path", "required": true, "type": "string", @@ -651,6 +651,56 @@ } } }, + "ClusterPropertiesUpdateParameters": { + "description": "The cluster resource properties", + "properties": { + "reliabilityLevel": { + "type": "string", + "enum": [ + "Invalid", + "Bronze", + "Silver", + "Gold", + "Platinum" + ] + }, + "upgradeMode": { + "type": "string", + "enum": [ + "Default", + "Automatic", + "Manual" + ] + }, + "clusterCodeVersion": { + "type": "string" + }, + "certificate": { + "$ref": "#/definitions/CertificateDescription" + }, + "clientCertificateThumbprints": { + "type": "array", + "items": { + "$ref": "#/definitions/ClientCertificateThumbprint" + } + }, + "fabricSettings": { + "type": "array", + "items": { + "$ref": "#/definitions/SettingsSectionDescription" + } + }, + "reverseProxyCertificate": { + "$ref": "#/definitions/CertificateDescription" + }, + "nodeTypes": { + "type": "array", + "items": { + "$ref": "#/definitions/NodeTypeDescription" + } + } + } + }, "ClusterProperties": { "description": "The cluster resource properties", "properties": { @@ -773,12 +823,12 @@ } } }, - "ClusterPropertiesUpdateParameters": { - "description": "Cluster properties update parameters", + "ClusterUpdateParameters": { + "description": "Cluster update request", "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/ClusterProperties" + "$ref": "#/definitions/ClusterPropertiesUpdateParameters" }, "tags": { "type": "object", @@ -786,35 +836,6 @@ "type": "string" }, "description": "Cluster tags." - }, - "propertyNames": { - "description": "Allowed properties", - "type": "array", - "items": { - "type": "string", - "enum": [ - "ReliabilityLevel", - "ClusterUpgradeMode", - "ClientCertificateThumbprints", - "FabricSettings", - "ReverseProxyCertificate", - "NodeTypes", - "Tags" - ] - } - } - }, - "required": [ - "properties" - ], - "x-ms-azure-resource": false - }, - "ClusterUpdateParameters": { - "description": "Cluster update request", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ClusterPropertiesUpdateParameters" } } }, From 3061d0e5e24b281d63a0ca575ced5f7749839fa6 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Wed, 8 Mar 2017 16:21:12 -0800 Subject: [PATCH 10/25] address comments --- .../ClusterPatchOperation_exmaple.json | 126 ++++-------------- .../2016-09-01/swagger/servicefabric.json | 77 +++++------ 2 files changed, 59 insertions(+), 144 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json index d68b2bc31b2d..c8cf33c19a5e 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -21,11 +21,9 @@ "endPort": 65534 }, "isPrimary": true, - "vmInstanceCount": 5 + "vmInstanceCount": 5, + "reverseProxyEndpointPort": 9998 } - ], - "propertyNames": [ - "NodeTypes.DurabilityLevel" ] } }, @@ -37,42 +35,25 @@ "location": "southcentralus", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", "name": "myCluster", - "tags": { - "resourceType": "Service Fabric", - "clusterName": "myCluster" - }, - "etag": "W/\"636236839047996583\"", + "tags": {}, + "etag": "W/\"636244182147134147\"", "properties": { - "provisioningState": "Updating", - "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", - "clusterCodeVersion": "5.5.149.9494", - "clusterState": "UpdatingUserConfiguration", - "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", - "certificate": { - "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", - "x509StoreName": "My" - }, + "provisioningState": "Succeeded", + "clusterId": "8d566293-3508-4d62-ba7b-056fa710c3c9", + "clusterCodeVersion": "5.5.216.0", + "clusterState": "Ready", + "managementEndpoint": "http://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/8d566293-3508-4d62-ba7b-056fa710c3c9", "clientCertificateThumbprints": [], "clientCertificateCommonNames": [], - "fabricSettings": [ - { - "name": "Security", - "parameters": [ - { - "name": "ClusterProtectionLevel", - "value": "EncryptAndSign" - } - ] - } - ], + "fabricSettings": [], "upgradeDescription": { "overrideUserUpgradePolicy": false, "forceRestart": true, "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", + "healthCheckWaitDuration": "00:00:01", + "healthCheckStableDuration": "00:00:01", + "healthCheckRetryTimeout": "00:00:01", "upgradeTimeout": "12:00:00", "upgradeDomainTimeout": "02:00:00", "healthPolicy": { @@ -86,15 +67,15 @@ } }, "diagnosticsStorageAccountConfig": { - "storageAccountName": "ba3wzulspn67w2", + "storageAccountName": "sflogssdktest5486", "protectedAccountKeyName": "StorageAccountKey1", - "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", - "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", - "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" + "blobEndpoint": "https://sflogssdktest5486.blob.core.windows.net/", + "queueEndpoint": "https://sflogssdktest5486.queue.core.windows.net/", + "tableEndpoint": "https://sflogssdktest5486.table.core.windows.net/" }, "nodeTypes": [ { - "name": "nt1vm", + "name": "n1", "clientConnectionEndpointPort": 19000, "httpGatewayEndpointPort": 19080, "applicationPorts": { @@ -107,80 +88,26 @@ }, "isPrimary": true, "vmInstanceCount": 5, - "durabilityLevel": "Bronze" + "reverseProxyEndpointPort": 9998, + "durabilityLevel": "Silver" } ], "vmImage": "Windows", - "reliabilityLevel": "Silver", + "reliabilityLevel": "Bronze", "upgradeMode": "Automatic", "availableClusterVersions": [ - { - "codeVersion": "5.1.158.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.0.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.2.207.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.121.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.3.311.9590", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.30.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.35.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.38.100", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.118.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.4.132.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, { "codeVersion": "5.4.145.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "supportExpiryUtc": "2017-05-10T00:00:00", "environment": "Windows" }, { "codeVersion": "5.4.164.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - }, - { - "codeVersion": "5.5.67.9494", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "supportExpiryUtc": "2017-05-10T00:00:00", "environment": "Windows" }, { - "codeVersion": "5.5.149.9494", + "codeVersion": "5.5.216.0", "supportExpiryUtc": "9999-12-31T23:59:59.9999999", "environment": "Windows" } @@ -189,4 +116,5 @@ } } } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 62b7d5e9d2eb..953767194835 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -54,18 +54,10 @@ ], "parameters": [ { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Resource Group to which the server belongs." + "$ref": "#/parameters/resourceGroupNameParameter" }, { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the cluster" + "$ref": "#/parameters/clusterNameParameter" }, { "$ref": "#/parameters/api-version" @@ -117,18 +109,10 @@ ], "parameters": [ { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Resource Group to which the server belongs." + "$ref": "#/parameters/resourceGroupNameParameter" }, { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the cluster" + "$ref": "#/parameters/clusterNameParameter" }, { "$ref": "#/parameters/api-version" @@ -172,18 +156,10 @@ ], "parameters": [ { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Resource Group to which the server belongs." + "$ref": "#/parameters/resourceGroupNameParameter" }, { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the cluster" + "$ref": "#/parameters/clusterNameParameter" }, { "$ref": "#/parameters/api-version" @@ -232,18 +208,10 @@ }, "parameters": [ { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Resource Group to which the server belongs." + "$ref": "#/parameters/resourceGroupNameParameter" }, { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the cluster" + "$ref": "#/parameters/clusterNameParameter" }, { "$ref": "#/parameters/api-version" @@ -285,11 +253,7 @@ ], "parameters": [ { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Resource Group to which the server belongs." + "$ref": "#/parameters/resourceGroupNameParameter" }, { "$ref": "#/parameters/api-version" @@ -673,27 +637,33 @@ ] }, "clusterCodeVersion": { + "description": "The ServiceFabric code version, if set it, please make sure you have set upgradeMode to Manual, otherwise ,it will fail", "type": "string" }, "certificate": { + "description": "The cluster certificate settings, the new certificate should exist in Vmss or KeyVault,before you add it, it will override original value", "$ref": "#/definitions/CertificateDescription" }, "clientCertificateThumbprints": { + "description": "The cluster client thumbprints, it will override existing collection", "type": "array", "items": { "$ref": "#/definitions/ClientCertificateThumbprint" } }, "fabricSettings": { + "description": "The new fabric settings for the cluster, Be noted, it will only update or add to existing collection, it will NOT override", "type": "array", "items": { "$ref": "#/definitions/SettingsSectionDescription" } }, "reverseProxyCertificate": { + "description": "Certificate for the reverse proxy", "$ref": "#/definitions/CertificateDescription" }, "nodeTypes": { + "description": "The settings for NodeTypes, it will override", "type": "array", "items": { "$ref": "#/definitions/NodeTypeDescription" @@ -739,6 +709,7 @@ "type": "string" }, "clusterCodeVersion": { + "description": "The ServiceFabric code version", "type": "string" }, "certificate": { @@ -934,6 +905,22 @@ "description": "The version of the api", "in": "query", "required": true + }, + "resourceGroupNameParameter": { + "description": "The name of the Resource Group to which the server belongs.", + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "clusterNameParameter": { + "description": "The name of the cluster", + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } } } \ No newline at end of file From 5c444a8c31b317633b57178a41365ecfb38bb1c0 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Tue, 14 Mar 2017 21:30:29 -0700 Subject: [PATCH 11/25] fix json format --- .../ClusterPatchOperation_exmaple.json | 168 +++++++++--------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json index c8cf33c19a5e..27eb675f134f 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -26,93 +26,93 @@ } ] } - }, - "responses": { - "200": { - "headers": {}, - "body": { - "type": "Microsoft.ServiceFabric/clusters", - "location": "southcentralus", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", - "name": "myCluster", - "tags": {}, - "etag": "W/\"636244182147134147\"", - "properties": { - "provisioningState": "Succeeded", - "clusterId": "8d566293-3508-4d62-ba7b-056fa710c3c9", - "clusterCodeVersion": "5.5.216.0", - "clusterState": "Ready", - "managementEndpoint": "http://myCluster.southcentralus.cloudapp.azure.com:19080", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/8d566293-3508-4d62-ba7b-056fa710c3c9", - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], - "fabricSettings": [], - "upgradeDescription": { - "overrideUserUpgradePolicy": false, - "forceRestart": true, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:00:01", - "healthCheckStableDuration": "00:00:01", - "healthCheckRetryTimeout": "00:00:01", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "diagnosticsStorageAccountConfig": { - "storageAccountName": "sflogssdktest5486", - "protectedAccountKeyName": "StorageAccountKey1", - "blobEndpoint": "https://sflogssdktest5486.blob.core.windows.net/", - "queueEndpoint": "https://sflogssdktest5486.queue.core.windows.net/", - "tableEndpoint": "https://sflogssdktest5486.table.core.windows.net/" + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "tags": {}, + "etag": "W/\"636244182147134147\"", + "properties": { + "provisioningState": "Succeeded", + "clusterId": "8d566293-3508-4d62-ba7b-056fa710c3c9", + "clusterCodeVersion": "5.5.216.0", + "clusterState": "Ready", + "managementEndpoint": "http://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/8d566293-3508-4d62-ba7b-056fa710c3c9", + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:00:01", + "healthCheckStableDuration": "00:00:01", + "healthCheckRetryTimeout": "00:00:01", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 }, - "nodeTypes": [ - { - "name": "n1", - "clientConnectionEndpointPort": 19000, - "httpGatewayEndpointPort": 19080, - "applicationPorts": { - "startPort": 20000, - "endPort": 30000 - }, - "ephemeralPorts": { - "startPort": 49152, - "endPort": 65534 - }, - "isPrimary": true, - "vmInstanceCount": 5, - "reverseProxyEndpointPort": 9998, - "durabilityLevel": "Silver" - } - ], - "vmImage": "Windows", - "reliabilityLevel": "Bronze", - "upgradeMode": "Automatic", - "availableClusterVersions": [ - { - "codeVersion": "5.4.145.9494", - "supportExpiryUtc": "2017-05-10T00:00:00", - "environment": "Windows" + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "sflogssdktest5486", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://sflogssdktest5486.blob.core.windows.net/", + "queueEndpoint": "https://sflogssdktest5486.queue.core.windows.net/", + "tableEndpoint": "https://sflogssdktest5486.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "n1", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 }, - { - "codeVersion": "5.4.164.9494", - "supportExpiryUtc": "2017-05-10T00:00:00", - "environment": "Windows" + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 }, - { - "codeVersion": "5.5.216.0", - "supportExpiryUtc": "9999-12-31T23:59:59.9999999", - "environment": "Windows" - } - ] - } + "isPrimary": true, + "vmInstanceCount": 5, + "reverseProxyEndpointPort": 9998, + "durabilityLevel": "Silver" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Bronze", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "2017-05-10T00:00:00", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "2017-05-10T00:00:00", + "environment": "Windows" + }, + { + "codeVersion": "5.5.216.0", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] } } } From d0bedb07f73d206876abb0bb40e3be2f18e3ac73 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Wed, 15 Mar 2017 07:26:44 -0700 Subject: [PATCH 12/25] fix example --- .../ClusterDeleteOperation_example.json | 3 +- ...rListByResourceGroupOperation_exmaple.json | 62 ++++++++++++++----- .../ClusterListOperation_example.json | 2 - .../ClusterPatchOperation_exmaple.json | 1 + .../examples/ClusterPutOperation_exmaple.json | 3 +- .../2016-09-01/swagger/servicefabric.json | 18 ++---- 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json index f7dc439b8bb3..43b4e50c4489 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterDeleteOperation_example.json @@ -6,6 +6,7 @@ "api-version": "2016-09-01" }, "responses": { - "200": {} + "200": {}, + "204":{} } } \ No newline at end of file diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json index 3bb5d148020f..479f2e87b2ca 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterListByResourceGroupOperation_exmaple.json @@ -11,27 +11,40 @@ "value": [ { "type": "Microsoft.ServiceFabric/clusters", - "location": "westus", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/bmwdemo", - "name": "bmwdemo", + "location": "southcentralus", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/psrg1/providers/Microsoft.ServiceFabric/clusters/testcluster", + "name": "testcluster", "tags": { "resourceType": "Service Fabric", - "clusterName": "bmwdemo" + "clusterName": "testcluster" }, - "etag": "W/\"636235816154466842\"", "properties": { "provisioningState": "Succeeded", - "clusterId": "a4e23572-8443-470e-adcb-3b7ebe6d582b", - "clusterCodeVersion": "5.4.164.9494", + "clusterId": "29cfe945-7ff1-4234-b567-09871226d4f6", + "clusterCodeVersion": "5.5.216.0", "clusterState": "Ready", - "managementEndpoint": "http://bmwdemo.westus.cloudapp.azure.com:19080", - "clusterEndpoint": "https://westus.servicefabric.azure.com/runtime/clusters/a4e23572-8443-470e-adcb-3b7ebe6d582b", + "managementEndpoint": "https://testcluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/29cfe945-7ff1-4234-b567-09871226d4f6", + "certificate": { + "thumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A", + "x509StoreName": "My" + }, "clientCertificateThumbprints": [], "clientCertificateCommonNames": [], - "fabricSettings": [], + "fabricSettings": [ + { + "name": "Security", + "parameters": [ + { + "name": "ClusterProtectionLevel", + "value": "EncryptAndSign" + } + ] + } + ], "upgradeDescription": { "overrideUserUpgradePolicy": false, - "forceRestart": true, + "forceRestart": false, "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", "healthCheckWaitDuration": "00:05:00", "healthCheckStableDuration": "00:05:00", @@ -49,15 +62,15 @@ } }, "diagnosticsStorageAccountConfig": { - "storageAccountName": "sflogsbmwdemo4564", + "storageAccountName": "sflogppe231337596", "protectedAccountKeyName": "StorageAccountKey1", - "blobEndpoint": "https://sflogsbmwdemo4564.blob.core.windows.net/", - "queueEndpoint": "https://sflogsbmwdemo4564.queue.core.windows.net/", - "tableEndpoint": "https://sflogsbmwdemo4564.table.core.windows.net/" + "blobEndpoint": "https://sflogppe231337596.blob.core.windows.net/", + "queueEndpoint": "https://sflogppe231337596.queue.core.windows.net/", + "tableEndpoint": "https://sflogppe231337596.table.core.windows.net/" }, "nodeTypes": [ { - "name": "Demo", + "name": "n1", "clientConnectionEndpointPort": 19000, "httpGatewayEndpointPort": 19080, "applicationPorts": { @@ -70,15 +83,30 @@ }, "isPrimary": true, "vmInstanceCount": 5, - "durabilityLevel": "Bronze" + "durabilityLevel": "Silver" } ], "vmImage": "Windows", "reliabilityLevel": "Silver", "upgradeMode": "Automatic", "availableClusterVersions": [ + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "2017-05-10T00:00:00", + "environment": "Windows" + }, { "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "2017-05-10T00:00:00", + "environment": "Windows" + }, + { + "codeVersion": "5.5.216.0", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.219.0", "supportExpiryUtc": "9999-12-31T23:59:59.9999999", "environment": "Windows" } diff --git a/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json index 0699db42f414..c1dcfbad779a 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterListOperation_example.json @@ -17,7 +17,6 @@ "resourceType": "Service Fabric", "clusterName": "bmwdemo" }, - "etag": "W/\"636235816154466842\"", "properties": { "provisioningState": "Succeeded", "clusterId": "a4e23572-8443-470e-adcb-3b7ebe6d582b", @@ -93,7 +92,6 @@ "resourceType": "Service Fabric", "clusterName": "sfclust4" }, - "etag": "W/\"636236828712048932\"", "properties": { "provisioningState": "Succeeded", "clusterId": "029c03b7-d94e-4c64-9dd4-b1c3bb0914c1", diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json index 27eb675f134f..544e2eecdfdf 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -29,6 +29,7 @@ } }, "responses": { + "202":{}, "200": { "headers": {}, "body": { diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json index 7cf7a91d8433..b18e22319c28 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json @@ -4,7 +4,7 @@ "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01", - "ClusterUpdateParameters": { + "Cluster": { "properties": { "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", @@ -88,6 +88,7 @@ } }, "responses": { + "202":{}, "200": { "headers": {}, "body": { diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 953767194835..a8a3c7a2a92d 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -767,20 +767,10 @@ "type": "string", "enum": [ "Default", - "WaitingForNodes", - "Deploying", - "BaselineUpgrade", - "UpdatingUserConfiguration", - "UpdatingUserCertificate", - "UpdatingInfrastructure", - "EnforcingClusterVersion", - "UpgradeServiceUnreachable", - "Deleting", - "ScaleUp", - "ScaleDown", - "AutoScale", - "Ready", - "Failed" + "Updating", + "Succeeded", + "Failed", + "Canceled" ] }, "vmImage": { From 20950e41eef47da10cfaab957e2d46a42a1e4ea5 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Wed, 15 Mar 2017 14:18:29 -0700 Subject: [PATCH 13/25] fix example --- .../2016-09-01/examples/ClusterPutOperation_exmaple.json | 1 - 1 file changed, 1 deletion(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json index b18e22319c28..561f68df6c58 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json @@ -100,7 +100,6 @@ "resourceType": "Service Fabric", "clusterName": "myCluster" }, - "etag": "W/\"636236839047996583\"", "properties": { "provisioningState": "Updating", "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", From 6ed64fceb799ff00e4111f4d37fed17b10b0b03c Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Wed, 15 Mar 2017 16:18:25 -0700 Subject: [PATCH 14/25] fix example validation error --- .../2016-09-01/examples/ClusterPatchOperation_exmaple.json | 1 - .../2016-09-01/examples/ClusterPutOperation_exmaple.json | 2 +- arm-servicefabric/2016-09-01/swagger/servicefabric.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json index 544e2eecdfdf..cba193504a07 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPatchOperation_exmaple.json @@ -38,7 +38,6 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", "name": "myCluster", "tags": {}, - "etag": "W/\"636244182147134147\"", "properties": { "provisioningState": "Succeeded", "clusterId": "8d566293-3508-4d62-ba7b-056fa710c3c9", diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json index 561f68df6c58..4e792f1b1854 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json @@ -4,7 +4,7 @@ "resourceGroupName": "resRg", "clusterName": "myCluster", "api-version": "2016-09-01", - "Cluster": { + "ClusterResource": { "properties": { "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index a8a3c7a2a92d..ef848dcf851f 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -165,7 +165,7 @@ "$ref": "#/parameters/api-version" }, { - "name": "Cluster resource", + "name": "ClusterResource", "in": "body", "required": true, "schema": { From e14ff8f00c30844c5f1607ec783393f6fe68fcd5 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 11:15:55 -0700 Subject: [PATCH 15/25] add opearions api --- .../2016-09-01/swagger/servicefabric.json | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index ef848dcf851f..e0732dbb64db 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -310,6 +310,37 @@ "nextLinkName": "nextLink" } } + }, + "/providers/Microsoft.ServiceFabric/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "description": "Lists all of the available ServiceFabric REST API operations.", + "parameters": [ + { + "$ref": "#/parameters/api-version" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorModel" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } } }, "definitions": { @@ -829,6 +860,59 @@ } } }, + "AvailableOperationDisplay": { + "description": "Operation detail", + "properties": { + "provider": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "operation": { + "type": "string" + }, + "description": { + "type": "string" + } + } + }, + "OperationResult": { + "description": "Available operation list result", + "properties": { + "name": { + "type": "string" + }, + "display": { + "$ref": "#/definitions/AvailableOperationDisplay" + }, + "origin": { + "type": "string" + }, + "nextLink": { + "type": "string", + "description": "The URL to use for getting the next set of results." + } + } + }, + "OperationListResult": { + "description": "Result of the request to list ServiceFabric operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "description": "List of ServiceFabric operations supported by the Microsoft.ServiceFabric resource provider.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/OperationResult" + } + }, + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string", + "readOnly": true + } + } + }, "ErrorModel": { "description": "The model of the error", "properties": { From 4f411013d944644157d51a40ad3bbe8d00591021 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 11:53:37 -0700 Subject: [PATCH 16/25] Comment correction --- arm-servicefabric/2016-09-01/swagger/servicefabric.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index e0732dbb64db..18bfc239e180 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -683,7 +683,7 @@ } }, "fabricSettings": { - "description": "The new fabric settings for the cluster, Be noted, it will only update or add to existing collection, it will NOT override", + "description": "The new fabric settings for the cluster, Be noted, it will overwrite existing collection", "type": "array", "items": { "$ref": "#/definitions/SettingsSectionDescription" From 9ed58cd411186c5ced8598be9d6b8960ba93f3fd Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 12:13:11 -0700 Subject: [PATCH 17/25] add example for max and min --- ...n => ClusterPutOperation_exmaple_max.json} | 24 +- .../ClusterPutOperation_exmaple_min.json | 212 ++++++++++++++++++ 2 files changed, 231 insertions(+), 5 deletions(-) rename arm-servicefabric/2016-09-01/examples/{ClusterPutOperation_exmaple.json => ClusterPutOperation_exmaple_max.json} (93%) create mode 100644 arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json similarity index 93% rename from arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json rename to arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json index 4e792f1b1854..191fc43549ee 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json @@ -16,8 +16,15 @@ }, "reliabilityLevel": "Silver", "upgradeMode": "Automatic", - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], + "clientCertificateThumbprints": [ + "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + ], + "clientCertificateCommonNames": [ + { + "isAdmin": "true", + "certificateThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + } + ], "fabricSettings": [ { "name": "Security", @@ -88,7 +95,7 @@ } }, "responses": { - "202":{}, + "202": {}, "200": { "headers": {}, "body": { @@ -111,8 +118,15 @@ "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", "x509StoreName": "My" }, - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], + "clientCertificateThumbprints": [ + "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + ], + "clientCertificateCommonNames": [ + { + "isAdmin": "true", + "certificateThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + } + ], "fabricSettings": [ { "name": "Security", diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json new file mode 100644 index 000000000000..6f0ea82532c2 --- /dev/null +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json @@ -0,0 +1,212 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "resRg", + "clusterName": "myCluster", + "api-version": "2016-09-01", + "ClusterResource": { + "properties": { + "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", + "clusterCodeVersion": "5.5.149.9494", + "certificate": { + "thumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A", + "thumbprintSecondary": "361A93445450CC8F2FF747F74500E8044942DAFD", + "x509StoreName": "My" + }, + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [], + "managementEndpoint": "", + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "durabilityLevel": "Bronze", + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5 + } + ], + "provisioningState": "Succeeded", + "vmImage": "Windows", + "diagnosticsStorageAccountConfig": { + "storageAccountName": "7623qfhwmnstw2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://7623qfhwmnstw2.blob.core.windows.net/", + "queueEndpoint": "https://7623qfhwmnstw2.queue.core.windows.net/", + "tableEndpoint": "https://7623qfhwmnstw2.table.core.windows.net/" + }, + "upgradeDescription": {} + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" + } + } + }, + "responses": { + "202":{}, + "200": { + "headers": {}, + "body": { + "type": "Microsoft.ServiceFabric/clusters", + "location": "southcentralus", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", + "name": "myCluster", + "tags": { + "resourceType": "Service Fabric", + "clusterName": "myCluster" + }, + "properties": { + "provisioningState": "Updating", + "clusterId": "466e7604-b8ae-4696-a91d-d7b5fcc63628", + "clusterCodeVersion": "5.5.149.9494", + "clusterState": "UpdatingUserConfiguration", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", + "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/466e7604-b8ae-4696-a91d-d7b5fcc63628", + "certificate": { + "thumbprint": "483B5DE52ECA35147B94C5E116FA7B2E34BB68F9", + "x509StoreName": "My" + }, + "clientCertificateThumbprints": [], + "clientCertificateCommonNames": [], + "fabricSettings": [], + "upgradeDescription": { + "overrideUserUpgradePolicy": false, + "forceRestart": true, + "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", + "healthCheckWaitDuration": "00:05:00", + "healthCheckStableDuration": "00:05:00", + "healthCheckRetryTimeout": "00:45:00", + "upgradeTimeout": "12:00:00", + "upgradeDomainTimeout": "02:00:00", + "healthPolicy": { + "maxPercentUnhealthyNodes": 100, + "maxPercentUnhealthyApplications": 100 + }, + "deltaHealthPolicy": { + "maxPercentDeltaUnhealthyNodes": 0, + "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, + "maxPercentDeltaUnhealthyApplications": 0 + } + }, + "diagnosticsStorageAccountConfig": { + "storageAccountName": "ba3wzulspn67w2", + "protectedAccountKeyName": "StorageAccountKey1", + "blobEndpoint": "https://ba3wzulspn67w2.blob.core.windows.net/", + "queueEndpoint": "https://ba3wzulspn67w2.queue.core.windows.net/", + "tableEndpoint": "https://ba3wzulspn67w2.table.core.windows.net/" + }, + "nodeTypes": [ + { + "name": "nt1vm", + "clientConnectionEndpointPort": 19000, + "httpGatewayEndpointPort": 19080, + "applicationPorts": { + "startPort": 20000, + "endPort": 30000 + }, + "ephemeralPorts": { + "startPort": 49152, + "endPort": 65534 + }, + "isPrimary": true, + "vmInstanceCount": 5, + "durabilityLevel": "Bronze" + } + ], + "vmImage": "Windows", + "reliabilityLevel": "Silver", + "upgradeMode": "Automatic", + "availableClusterVersions": [ + { + "codeVersion": "5.1.158.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.0.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.2.207.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.121.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.3.311.9590", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.30.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.35.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.38.100", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.118.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.132.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.145.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.4.164.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.67.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + }, + { + "codeVersion": "5.5.149.9494", + "supportExpiryUtc": "9999-12-31T23:59:59.9999999", + "environment": "Windows" + } + ] + } + } + } + } +} \ No newline at end of file From 40fdf217c0b27ceccc10d6beff1fb3a79a962fb3 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 12:27:20 -0700 Subject: [PATCH 18/25] fix name --- arm-servicefabric/2016-09-01/swagger/servicefabric.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 18bfc239e180..afb85d2839f2 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -144,8 +144,11 @@ "x-ms-long-running-operation": true, "description": "Create cluster resource", "x-ms-examples": { - "Put a cluster": { - "$ref": "../examples/ClusterPutOperation_exmaple.json" + "Put a cluster with min parmaeter": { + "$ref": "../examples/ClusterPutOperation_exmaple_min.json" + }, + "Put a cluster with max parmaeter": { + "$ref": "../examples/ClusterPutOperation_exmaple_max.json" } }, "produces": [ From 36aab524c7fefe16cc5e2eaebe5eb117b952b069 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 13:02:59 -0700 Subject: [PATCH 19/25] fix build error --- .../examples/ClusterPutOperation_exmaple_max.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json index 191fc43549ee..5cfb502b5c57 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json @@ -21,8 +21,8 @@ ], "clientCertificateCommonNames": [ { - "isAdmin": "true", - "certificateThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + "isAdmin": true, + "certificateIssuerThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" } ], "fabricSettings": [ @@ -123,8 +123,8 @@ ], "clientCertificateCommonNames": [ { - "isAdmin": "true", - "certificateThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" + "isAdmin": true, + "certificateIssuerThumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A" } ], "fabricSettings": [ From 7de603409139b0acaa8b264871a81e4005fe4825 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 13:12:03 -0700 Subject: [PATCH 20/25] small updates --- .../examples/ClusterPutOperation_exmaple_min.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json index 6f0ea82532c2..4c15a4300892 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json @@ -9,17 +9,13 @@ "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterCodeVersion": "5.5.149.9494", - "certificate": { - "thumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A", - "thumbprintSecondary": "361A93445450CC8F2FF747F74500E8044942DAFD", - "x509StoreName": "My" - }, + "certificate": {}, "reliabilityLevel": "Silver", "upgradeMode": "Automatic", "clientCertificateThumbprints": [], "clientCertificateCommonNames": [], "fabricSettings": [], - "managementEndpoint": "", + "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", "nodeTypes": [ { "name": "nt1vm", From baa568775eccac1ed84ee86600860c31fce71378 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 15:32:17 -0700 Subject: [PATCH 21/25] fix comments --- .../2016-09-01/examples/ClusterPutOperation_exmaple_max.json | 5 ----- .../2016-09-01/examples/ClusterPutOperation_exmaple_min.json | 5 ----- 2 files changed, 10 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json index 5cfb502b5c57..3a736a38145c 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json @@ -6,8 +6,6 @@ "api-version": "2016-09-01", "ClusterResource": { "properties": { - "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterCodeVersion": "5.5.149.9494", "certificate": { "thumbprint": "5F3660C715EBBDA31DB1FFDCF508302348DE8E7A", @@ -84,9 +82,6 @@ } } }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", - "name": "myCluster", - "type": "Microsoft.ServiceFabric/clusters", "location": "southcentralus", "tags": { "resourceType": "Service Fabric", diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json index 4c15a4300892..09bf3782bbc6 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json @@ -6,8 +6,6 @@ "api-version": "2016-09-01", "ClusterResource": { "properties": { - "clusterId": "4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", - "clusterEndpoint": "https://warp-test-winfabrp-southcentralus.trafficmanager.net/runtime/clusters/4d0af3c4-04c4-4ea4-a7a0-5917aca0fe03", "clusterCodeVersion": "5.5.149.9494", "certificate": {}, "reliabilityLevel": "Silver", @@ -45,9 +43,6 @@ }, "upgradeDescription": {} }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resRg/providers/Microsoft.ServiceFabric/clusters/myCluster", - "name": "myCluster", - "type": "Microsoft.ServiceFabric/clusters", "location": "southcentralus", "tags": { "resourceType": "Service Fabric", From 8a93b06eef2c2971451e9c2fa4b9428b5e0239b4 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 16:42:31 -0700 Subject: [PATCH 22/25] fix comments about readonly , remove empty array --- .../ClusterPutOperation_exmaple_max.json | 6 +++--- .../ClusterPutOperation_exmaple_min.json | 7 +------ .../2016-09-01/swagger/servicefabric.json | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json index 3a736a38145c..49bb3eda4047 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_max.json @@ -124,11 +124,11 @@ ], "fabricSettings": [ { - "name": "Security", + "name": "Hosting", "parameters": [ { - "name": "ClusterProtectionLevel", - "value": "EncryptAndSign" + "name": "ActivationMaxRetryInterval", + "value": "10000" } ] } diff --git a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json index 09bf3782bbc6..fadfbc15748e 100644 --- a/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json +++ b/arm-servicefabric/2016-09-01/examples/ClusterPutOperation_exmaple_min.json @@ -7,12 +7,8 @@ "ClusterResource": { "properties": { "clusterCodeVersion": "5.5.149.9494", - "certificate": {}, "reliabilityLevel": "Silver", "upgradeMode": "Automatic", - "clientCertificateThumbprints": [], - "clientCertificateCommonNames": [], - "fabricSettings": [], "managementEndpoint": "https://myCluster.southcentralus.cloudapp.azure.com:19080", "nodeTypes": [ { @@ -40,8 +36,7 @@ "blobEndpoint": "https://7623qfhwmnstw2.blob.core.windows.net/", "queueEndpoint": "https://7623qfhwmnstw2.queue.core.windows.net/", "tableEndpoint": "https://7623qfhwmnstw2.table.core.windows.net/" - }, - "upgradeDescription": {} + } }, "location": "southcentralus", "tags": { diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index afb85d2839f2..fa306118bf3f 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -716,6 +716,8 @@ } }, "clusterId": { + "readOnly": true, + "description": "The cluster id used internally by ServiceFabirc", "type": "string" }, "clusterState": { @@ -740,10 +742,11 @@ ] }, "clusterEndpoint": { + "readOnly": true, "type": "string" }, "clusterCodeVersion": { - "description": "The ServiceFabric code version", + "description": "The ServiceFabric code version, you don't need to set it, when you choose upgradeMode as Automatic", "type": "string" }, "certificate": { @@ -816,7 +819,16 @@ "upgradeDescription": { "$ref": "#/definitions/PaasClusterUpgradePolicy" } - } + }, + "required": [ + "managementEndpoint", + "reliabilityLevel", + "provisioningState", + "vmImage", + "diagnosticsStorageAccountConfig", + "nodeTypes", + "upgradeMode" + ] }, "ClusterUpdateParameters": { "description": "Cluster update request", From de33ecb02414cf2a63012862032f65a52e1de627 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Thu, 16 Mar 2017 17:01:02 -0700 Subject: [PATCH 23/25] add description --- .../2016-09-01/swagger/servicefabric.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index fa306118bf3f..0a93cd8fa44d 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -709,6 +709,7 @@ "description": "The cluster resource properties", "properties": { "availableClusterVersions": { + "description": "The available cluster code version which the cluster can upgrade to, note that you must choose upgradeMode to manual to upgrade to", "type": "array", "readOnly": true, "items": { @@ -721,6 +722,7 @@ "type": "string" }, "clusterState": { + "description": "The state for the cluster", "readOnly": true, "type": "string", "enum": [ @@ -742,6 +744,7 @@ ] }, "clusterEndpoint": { + "description": "The endpoint for the cluster connecting to servicefabric resource provider", "readOnly": true, "type": "string" }, @@ -750,12 +753,13 @@ "type": "string" }, "certificate": { + "description": "The cluster certificate", "$ref": "#/definitions/CertificateDescription" }, "reliabilityLevel": { + "description": "The reliability level for the cluster", "type": "string", "enum": [ - "Invalid", "Bronze", "Silver", "Gold", @@ -763,44 +767,51 @@ ] }, "upgradeMode": { + "description": "The cluster upgrade mode", "type": "string", "enum": [ - "Default", "Automatic", "Manual" ] }, "clientCertificateThumbprints": { + "description": "The client certificate thumbprints", "type": "array", "items": { "$ref": "#/definitions/ClientCertificateThumbprint" } }, "clientCertificateCommonNames": { + "description": "The certificate common name and issurer thumprint for the client certificate", "type": "array", "items": { "$ref": "#/definitions/ClientCertificateCommonName" } }, "fabricSettings": { + "description": "The faric setting collection", "type": "array", "items": { "$ref": "#/definitions/SettingsSectionDescription" } }, "reverseProxyCertificate": { + "description": "The certificate for the reverse proxy", "$ref": "#/definitions/CertificateDescription" }, "managementEndpoint": { + "description": "The cluster management endpoint address", "type": "string" }, "nodeTypes": { + "description": "The arary of the nodeType", "type": "array", "items": { "$ref": "#/definitions/NodeTypeDescription" } }, "provisioningState": { + "description": "The provisioning state of the cluster", "type": "string", "enum": [ "Default", @@ -811,12 +822,15 @@ ] }, "vmImage": { + "description": "The os type", "type": "string" }, "diagnosticsStorageAccountConfig": { + "description": "The storage diagnostics account configuration ", "$ref": "#/definitions/DiagnosticsStorageAccountConfig" }, "upgradeDescription": { + "description": "The upgrade policy", "$ref": "#/definitions/PaasClusterUpgradePolicy" } }, From c31b04ab8f34951ab525f72ebcbc4ff586b88b47 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Fri, 17 Mar 2017 09:57:15 -0700 Subject: [PATCH 24/25] fix comments --- .../2016-09-01/swagger/servicefabric.json | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index 0a93cd8fa44d..f5d01ff972b6 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -392,6 +392,7 @@ "description": "The name of settings section description" }, "parameters": { + "description": "Settings parameter description", "type": "array", "items": { "$ref": "#/definitions/SettingsParameterDescription" @@ -417,24 +418,31 @@ "type": "string" }, "placementProperties": { + "description": "Placement properties key", "type": "object", "additionalProperties": { + "description": "Placement properties value", "type": "string" } }, "capacities": { + "description": "Capacities key", "type": "object", "additionalProperties": { + "description": "Capacities value", "type": "string" } }, "clientConnectionEndpointPort": { + "description": "Client connection endpoint port", "type": "integer" }, "httpGatewayEndpointPort": { + "description": "Http gateway endpoint port", "type": "integer" }, "durabilityLevel": { + "description": "Nodetype durability Level", "type": "string", "enum": [ "Bronze", @@ -444,19 +452,23 @@ ] }, "applicationPorts": { + "description": "Application ports", "$ref": "#/definitions/EndpointRangeDescription" }, "ephemeralPorts": { + "description": "Ephemeral ports", "$ref": "#/definitions/EndpointRangeDescription" }, "isPrimary": { - "type": "boolean", - "description": "Is primary or not" + "description": "Primary node or not", + "type": "boolean" }, "vmInstanceCount": { + "description": "Instance count", "type": "integer" }, "reverseProxyEndpointPort": { + "description": "Reverse proxy endpoint port", "type": "integer" } } @@ -811,6 +823,7 @@ } }, "provisioningState": { + "readOnly": true, "description": "The provisioning state of the cluster", "type": "string", "enum": [ @@ -822,7 +835,7 @@ ] }, "vmImage": { - "description": "The os type", + "description": "The OS type", "type": "string" }, "diagnosticsStorageAccountConfig": { @@ -837,7 +850,6 @@ "required": [ "managementEndpoint", "reliabilityLevel", - "provisioningState", "vmImage", "diagnosticsStorageAccountConfig", "nodeTypes", From 32e3ee415d1168f96371b22cd2be1cec280e4e70 Mon Sep 17 00:00:00 2001 From: Ching Chen Date: Fri, 17 Mar 2017 12:23:38 -0700 Subject: [PATCH 25/25] add comments --- .../2016-09-01/swagger/servicefabric.json | 66 ++++++++++++++++++- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/arm-servicefabric/2016-09-01/swagger/servicefabric.json b/arm-servicefabric/2016-09-01/swagger/servicefabric.json index f5d01ff972b6..102e42dbc06d 100644 --- a/arm-servicefabric/2016-09-01/swagger/servicefabric.json +++ b/arm-servicefabric/2016-09-01/swagger/servicefabric.json @@ -351,12 +351,15 @@ "description": "Certificate description", "properties": { "thumbprint": { + "description": "Primary certificate thumbprint", "type": "string" }, "thumbprintSecondary": { + "description": "Secondary certificate thumbprint", "type": "string" }, "x509StoreName": { + "description": "Certificate x509 store location", "type": "string", "enum": [ "AddressBook", @@ -404,9 +407,11 @@ "description": "Endpoint range description", "properties": { "startPort": { + "description": "Endpoint start port", "type": "integer" }, "endPort": { + "description": "Endpoint end port", "type": "integer" } } @@ -415,6 +420,7 @@ "description": "NodeType description", "properties": { "name": { + "description": "NodeType description name", "type": "string" }, "placementProperties": { @@ -481,6 +487,7 @@ "description": "Is admin or not" }, "certificateThumbprint": { + "description": "ClientCertificate thumbprint", "type": "string" } } @@ -490,14 +497,16 @@ "properties": { "isAdmin": { "type": "boolean", - "description": "Is admin or not" + "description": "Is the certificate for admin usage or not" }, "certificateIssuerThumbprint": { + "description": "Certificate issuer thumbprint", "type": "string" } } }, "ClusterEnvironment": { + "description": "Cluster environment", "type": "string", "enum": [ "Default", @@ -509,12 +518,15 @@ "description": "NodeType description", "properties": { "codeVersion": { + "description": "Cluster code version", "type": "string" }, "supportExpiryUtc": { + "description": "Support expiry Utc", "type": "string" }, "environment": { + "description": "Cluster environment", "$ref": "#/definitions/ClusterEnvironment" } } @@ -523,6 +535,7 @@ "description": "Paas service type health policy", "properties": { "maxPercentUnhealthyServices": { + "description": "max percent of unhealthy services", "type": "integer" } } @@ -531,11 +544,14 @@ "description": "Paas application health policy", "properties": { "defaultServiceTypeHealthPolicy": { + "description": "default ServiceType health policy", "$ref": "#/definitions/PaasServiceTypeHealthPolicy" }, "serivceTypeHealthPolicies": { + "description": "SerivceType health policies", "type": "object", "additionalProperties": { + "description": "Paas ServiceType health policies", "$ref": "#/definitions/PaasServiceTypeHealthPolicy" } } @@ -545,14 +561,18 @@ "description": "Paas cluster upgrade health policy", "properties": { "maxPercentUnhealthyNodes": { + "description": "Max percent of unhealthy nodes", "type": "integer" }, "maxPercentUnhealthyApplications": { + "description": "Max percent of unhealthy applications", "type": "integer" }, "applicationHealthPolicies": { + "description": "Application health policies", "type": "object", "additionalProperties": { + "description": "Paas application health policy", "$ref": "#/definitions/PaasApplicationHealthPolicy" } } @@ -562,6 +582,7 @@ "description": "Paas service type delta health policy", "properties": { "maxPercentDeltaUnhealthyServices": { + "description": "max percent of delta unhealthy services", "type": "integer" } } @@ -570,11 +591,14 @@ "description": "Paas application delta health policy", "properties": { "defaultServiceTypeDeltaHealthPolicy": { + "description": "default serviceType delta health policy", "$ref": "#/definitions/PaasServiceTypeDeltaHealthPolicy" }, "serivceTypeDeltaHealthPolicies": { + "description": "SerivceType delta health policies", "type": "object", "additionalProperties": { + "description": "Paas serviceType delta health policy", "$ref": "#/definitions/PaasServiceTypeDeltaHealthPolicy" } } @@ -584,17 +608,22 @@ "description": "Paas cluster upgrade delta health policy", "properties": { "maxPercentDeltaUnhealthyNodes": { + "description": "Max of percent of delta unhealthy nodes", "type": "integer" }, "maxPercentUpgradeDomainDeltaUnhealthyNodes": { + "description": "Max of percent upgrade domain delta unhealthy nodes", "type": "integer" }, "maxPercentDeltaUnhealthyApplications": { + "description": "Max percent of delta unhealthy applications", "type": "integer" }, "applicationHealthPolicies": { + "description": "Application health policies", "type": "object", "additionalProperties": { + "description": "Paas application delta health policy", "$ref": "#/definitions/PaasApplicationDeltaHealthPolicy" } } @@ -604,33 +633,43 @@ "description": "Paas cluster upgrade policy", "properties": { "overrideUserUpgradePolicy": { + "description": "Override user upgrade policy", "type": "boolean" }, "forceRestart": { + "description": "Force restart or not", "type": "boolean" }, "upgradeReplicaSetCheckTimeout": { + "description": "Upgrade replica set check timeout", "type": "string" }, "healthCheckWaitDuration": { + "description": "Health check wait duration", "type": "string" }, "healthCheckStableDuration": { + "description": "Health check stable duration", "type": "string" }, "healthCheckRetryTimeout": { + "description": "Health check retry timeout", "type": "string" }, "upgradeTimeout": { + "description": "Upgrade Timeout", "type": "string" }, "upgradeDomainTimeout": { + "description": "upgrade domain timeout", "type": "string" }, "healthPolicy": { + "description": "Health Policy", "$ref": "#/definitions/PaasClusterUpgradeHealthPolicy" }, "deltaHealthPolicy": { + "description": "Delta health policy", "$ref": "#/definitions/PaasClusterUpgradeDeltaHealthPolicy" } } @@ -639,24 +678,31 @@ "description": "Diagnostics storage account config", "properties": { "storageAccountName": { + "description": "Diagnostics storage account name", "type": "string" }, "primaryAccessKey": { + "description": "Primary diagnostics storage access key", "type": "string" }, "secondaryAccessKey": { + "description": "Secondary diagnostics storage access key", "type": "string" }, "protectedAccountKeyName": { + "description": "Protected Diagnostics storage key name", "type": "string" }, "blobEndpoint": { + "description": "Diagnostics storage account blob endpoint", "type": "string" }, "queueEndpoint": { + "description": "Diagnostics storage account queue endpoint", "type": "string" }, "tableEndpoint": { + "description": "Diagnostics storage account table endpoint", "type": "string" } } @@ -665,6 +711,7 @@ "description": "The cluster resource properties", "properties": { "reliabilityLevel": { + "description": "Cluster reliability level", "type": "string", "enum": [ "Invalid", @@ -675,6 +722,7 @@ ] }, "upgradeMode": { + "description": "Cluster upgrade mode", "type": "string", "enum": [ "Default", @@ -832,7 +880,11 @@ "Succeeded", "Failed", "Canceled" - ] + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } }, "vmImage": { "description": "The OS type", @@ -868,7 +920,7 @@ "additionalProperties": { "type": "string" }, - "description": "Cluster tags." + "description": "Cluster update parameters" } } }, @@ -905,15 +957,19 @@ "description": "Operation detail", "properties": { "provider": { + "description": "Provider name", "type": "string" }, "resource": { + "description": "Resource name", "type": "string" }, "operation": { + "description": "Operation name", "type": "string" }, "description": { + "description": "Operation description", "type": "string" } } @@ -922,12 +978,14 @@ "description": "Available operation list result", "properties": { "name": { + "description": "Result name", "type": "string" }, "display": { "$ref": "#/definitions/AvailableOperationDisplay" }, "origin": { + "description": "Origin result", "type": "string" }, "nextLink": { @@ -961,9 +1019,11 @@ "description": "The error", "properties": { "code": { + "description": "The error code", "type": "string" }, "message": { + "description": "The error message", "type": "string" } }