Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added patch API to ArcSettings resource and introduced ArcConnectivit…
…yProperties attribute
  • Loading branch information
lsweeney24 committed Apr 28, 2022
commit 63308249742a4ccdb140bed82fca98de512ee4b6
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,55 @@
}
}
},
"patch": {
"operationId": "ArcSettings_Update",
"description": "Update ArcSettings for HCI cluster.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/ClusterNameParameter"
},
{
"$ref": "#/parameters/ArcSettingNameParameter"
},
{
"name": "arcSetting",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ArcSetting"
},
"description": "ArcSettings parameters that needs to be updated"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ArcSetting"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
}
},
"x-ms-examples": {
"Patch ArcSetting": {
"$ref": "./examples/PatchArcSetting.json"
}
},
"delete": {
"operationId": "ArcSettings_Delete",
"description": "Delete ArcSetting resource details of HCI Cluster.",
Expand Down Expand Up @@ -427,6 +476,12 @@
"$ref": "#/definitions/PerNodeState"
},
"readOnly": true
},
"connectivityProperties": {
"description": "contains connectivity related configuration for ARC resources",
"type": "object",
"items": {
"$ref": "#/definitions/ArcConnectivityProperties"
}
}
},
Expand Down Expand Up @@ -469,6 +524,17 @@
}
}
},
"ArcConnectivityProperties": {
"description": "Connectivity related configuration required by arc server.",
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "True indicates ARC connectivity is enabled"
}
},
"additionalProperties": false
},
"PasswordCredential": {
"type": "object",
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@
"200": {
"description": "OK"
},
"202": {
"description": "Accepted"
},
"204": {
"description": "No content"
},
Expand All @@ -292,7 +295,8 @@
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
}
},
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureStackHCI/clusters/{clusterName}/uploadCertificate": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"clusterName": "myCluster",
"arcSettingName": "default",
"arcSetting": {
"properties": {
"connectivityProperties": {
"enabled": true
}
}
},
"api-version": "2022-05-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster/arcSettings/default",
"type": "Microsoft.AzureStackHCI/clusters/arcSettings",
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
},
"properties": {
"provisioningState": "Succeeded",
"arcInstanceResourceGroup": "ArcInstance-rg",
"aggregateState": "Creating",
"connectivityProperties": {
"enabled": true
},
"perNodeDetails": [
{
"name": "Node-1",
"arcInstance": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-1",
"state": "Creating"
},
{
"name": "Node-2",
"arcInstance": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-2",
"state": "Creating"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,46 @@
"api-version": "2022-05-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster/arcSettings/default/extensions/MicrosoftMonitoringAgent",
"name": "MicrosoftMonitoringAgent",
"type": "Microsoft.AzureStackHCI/clusters/arcSettings/extensions",
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
},
"properties": {
"provisioningState": "Succeeded",
"extensionParameters": {
"publisher": "Microsoft.Compute",
"type": "string",
"typeHandlerVersion": "1.10.3",
"autoUpgradeMinorVersion": false,
"settings": {
"workspaceId": "xx"
}
},
"aggregateState": "PartiallyConnected",
"perNodeExtensionDetails": [
{
"name": "Node-1",
"extension": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-1/Extensions/MicrosoftMonitoringAgent",
"state": "Connected"
},
{
"name": "Node-2",
"extension": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-2/Extensions/MicrosoftMonitoringAgent",
"state": "Disconnected"
}
]
}
}
},
"201": {
"body": {
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster/arcSettings/default/extensions/MicrosoftMonitoringAgent",
Expand Down Expand Up @@ -59,6 +99,7 @@
]
}
}
}
},
"202": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@
"arcInstance": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-2",
"state": "Creating"
}
]
],
"connectivityProperties": {
"enabled" : false
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,21 @@
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Extension"
}
},
"201": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Extension"
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PATCH should not be returning 201. Seems to be a miss in the previous review. You can remove this if not supported.

https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md#patch-resource

},
"202": {
"description": "Accepted"
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
Expand Down