From b7db7cd559212318f0f32947b747906bc1959651 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 14 Oct 2019 13:46:43 -0700 Subject: [PATCH 01/21] Hybrid RP swagger --- .../preview/2019-03-18/HybridCompute.json | 789 +++++++++++ .../preview/2019-08-02/HybridCompute.json | 1255 +++++++++++++++++ .../2019-08-02/examples/GETExtension.json | 41 + .../2019-08-02/examples/LISTExtension.json | 45 + .../2019-08-02/examples/PUTExtension.json | 67 + .../2019-08-02/examples/UpdateExtension.json | 54 + .../hybridcompute/resource-manager/readme.md | 177 +++ 7 files changed, 2428 insertions(+) create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/GETExtension.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/LISTExtension.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/PUTExtension.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/UpdateExtension.json create mode 100644 specification/hybridcompute/resource-manager/readme.md diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json new file mode 100644 index 000000000000..432eba287151 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json @@ -0,0 +1,789 @@ +{ + "swagger": "2.0", + "info": { + "title": "HybridComputeManagementClient", + "description": "The Hybrid Compute Management Client.", + "version": "2019-01-01-preview" + }, + "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.HybridCompute/machines/{name}": { + "put": { + "tags": [ + "machines" + ], + "operationId": "Machines_CreateOrUpdate", + "description": "The operation to create or update a hybrid machine resource identity in Azure.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hybrid machine." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Machine" + }, + "description": "Parameters supplied to the Create hybrid machine operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Machine" + } + }, + "204": { + "description": "No Content" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {} + }, + "patch": { + "tags": [ + "machines" + ], + "operationId": "Machines_Update", + "description": "The operation to update a hybrid machine.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hybrid machine." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/MachineUpdate" + }, + "description": "Parameters supplied to the Update hybrid machine operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Machine" + } + }, + "204": { + "description": "No Content" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {} + }, + "delete": { + "tags": [ + "machines" + ], + "operationId": "Machines_Delete", + "description": "The operation to remove a hybrid machine identity in Azure.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hybrid machine." + } + ], + "responses": { + "200": { + "description": "OK" + }, + "204": { + "description": "No Content" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {} + }, + "get": { + "tags": [ + "machines" + ], + "operationId": "Machines_Get", + "description": "Retrieves information about the model view or the instance view of a hybrid machine.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hybrid machine." + }, + { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "The expand expression to apply on the operation.", + "enum": [ + "instanceView" + ], + "x-ms-enum": { + "name": "InstanceViewTypes", + "modelAsString": false + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Machine" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {} + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines/{name}/reconnect": { + "post": { + "tags": [ + "machines" + ], + "operationId": "Machines_Reconnect", + "description": "The operation to reconnect a hybrid machine resource to its identity in Azure.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hybrid machine." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/MachineReconnect" + }, + "description": "Parameters supplied to the Reconnect hybrid machine operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Machine" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {} + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines": { + "get": { + "tags": [ + "machines" + ], + "operationId": "Machines_ListByResourceGroup", + "description": "Lists all the hybrid machines in the specified resource group. Use the nextLink property in the response to get the next page of hybrid machines.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MachineListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {}, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.HybridCompute/machines": { + "get": { + "tags": [ + "machines" + ], + "operationId": "Machines_ListBySubscription", + "description": "Lists all the hybrid machines in the specified subscription. Use the nextLink property in the response to get the next page of hybrid machines.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MachineListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": {}, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.HybridCompute/operations": { + "get": { + "tags": [ + "operations" + ], + "operationId": "Operations_List", + "description": "Gets a list of hybrid compute operations.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + } + }, + "definitions": { + "OperationListResult": { + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/OperationValue" + }, + "description": "The list of compute operations" + } + }, + "description": "The List Compute Operation operation response." + }, + "OperationValue": { + "properties": { + "origin": { + "type": "string", + "readOnly": true, + "description": "The origin of the compute operation." + }, + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the compute operation." + }, + "display": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/OperationValueDisplay", + "description": "Display properties" + } + }, + "description": "Describes the properties of a Compute Operation value." + }, + "OperationValueDisplay": { + "properties": { + "operation": { + "type": "string", + "readOnly": true, + "description": "The display name of the compute operation." + }, + "resource": { + "type": "string", + "readOnly": true, + "description": "The display name of the resource the operation applies to." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "The description of the operation." + }, + "provider": { + "type": "string", + "readOnly": true, + "description": "The resource provider for the operation." + } + }, + "description": "Describes the properties of a Hybrid Compute Operation Value Display." + }, + "OSProfile": { + "readOnly": true, + "properties": { + "computerName": { + "type": "string", + "readOnly": true, + "description": "Specifies the host OS name of the hybrid machine." + } + }, + "description": "Specifies the operating system settings for the hybrid machine." + }, + "MachineProperties": { + "properties": { + "osProfile": { + "$ref": "#/definitions/OSProfile", + "description": "Specifies the operating system settings for the hybrid machine." + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The provisioning state, which only appears in the response." + }, + "status": { + "readOnly": true, + "type": "string", + "description": "The status of the hybrid machine agent.", + "enum": [ + "Connected", + "Disconnected", + "Error" + ], + "x-ms-enum": { + "name": "StatusTypes", + "modelAsString": false + } + }, + "lastStatusChange": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The time of the last status change." + }, + "errorDetails": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" + }, + "description": "Details about the error state." + }, + "agentVersion": { + "readOnly": true, + "type": "string", + "description": "The hybrid machine agent full version." + }, + "vmId": { + "readOnly": true, + "type": "string", + "description": "Specifies the hybrid machine unique ID." + }, + "displayName": { + "readOnly": true, + "type": "string", + "description": "Specifies the hybrid machine display name." + }, + "machineFqdn": { + "readOnly": true, + "type": "string", + "description": "Specifies the hybrid machine FQDN." + }, + "physicalLocation": { + "type": "string", + "description": "Resource's Physical Location" + }, + "clientPublicKey": { + "type": "string", + "description": "Public Key that the client provides to be used during initial resource onboarding" + }, + "osName": { + "readOnly": true, + "type": "string", + "description": "The Operating System running on the hybrid machine." + }, + "osVersion": { + "readOnly": true, + "type": "string", + "description": "The version of Operating System running on the hybrid machine." + } + }, + "description": "Describes the properties of a hybrid machine." + }, + "MachineReconnectProperties": { + "properties": { + "vmId": { + "type": "string", + "description": "Specifies the hybrid machine unique ID." + }, + "clientPublicKey": { + "type": "string", + "description": "Public Key that the client provides to be used during initial resource onboarding." + } + }, + "description": "Describes the properties required to reconnect a hybrid machine." + }, + "MachineUpdateProperties": { + "properties": { + "physicalLocation": { + "type": "string", + "description": "Resource's Physical Location" + } + }, + "description": "Describes the ARM updatable properties of a hybrid machine." + }, + "Machine": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/MachineProperties", + "description": "Hybrid Compute Machine properties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Describes a hybrid machine." + }, + "MachineUpdate": { + "properties": { + "identity": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/Identity", + "description": "Hybrid Compute Machine Managed Identity" + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/MachineUpdateProperties", + "description": "Hybrid Compute Machine properties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/UpdateResource" + } + ], + "description": "Describes a hybrid machine Update." + }, + "MachineReconnect": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/MachineReconnectProperties", + "description": "Hybrid Compute Machine properties" + } + }, + "description": "Describes a hybrid machine reconnect." + }, + "MachineListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Machine" + }, + "description": "The list of hybrid machines." + }, + "nextLink": { + "type": "string", + "description": "The URI to fetch the next page of VMs. Call ListNext() with this URI to fetch the next page of hybrid machines." + } + }, + "required": [ + "value" + ], + "description": "The List hybrid machine operation response." + }, + "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", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "identity": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/Identity", + "description": "Hybrid Compute Machine Managed Identity" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true + }, + "UpdateResource": { + "description": "The Update Resource model definition.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + } + }, + "ErrorDetail": { + "title": "Error details.", + "type": "object", + "properties": { + "code": { + "description": "The error's code.", + "type": "string" + }, + "message": { + "description": "A human readable error message.", + "type": "string" + }, + "target": { + "description": "Indicates which property in the request is responsible for the error.", + "type": "string" + }, + "details": { + "description": "Additional error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "required": [ + "code", + "message" + ] + }, + "ErrorResponse": { + "title": "Error response.", + "description": "Contains details when the response code indicates an error.", + "type": "object", + "properties": { + "error": { + "description": "The error details.", + "$ref": "#/definitions/ErrorDetail" + } + }, + "required": [ + "error" + ] + }, + "Identity": { + "title": "Managed Identity.", + "type": "object", + "properties": { + "type": { + "description": "The identity type.", + "type": "string" + }, + "principalId": { + "readOnly": true, + "description": "The identity's principal id.", + "type": "string" + }, + "tenantId": { + "readOnly": true, + "description": "The identity's tenant id.", + "type": "string" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + } + } +} \ No newline at end of file diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json new file mode 100644 index 000000000000..77bb54f4054f --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json @@ -0,0 +1,1255 @@ +{ + "swagger":"2.0", + "info":{ + "title":"HybridComputeManagementClient", + "description":"The Hybrid Compute Management Client.", + "version":"2019-08-02-preview" + }, + "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.HybridCompute/machines/{name}":{ + "put":{ + "tags":[ + "machines" + ], + "operationId":"Machines_CreateOrUpdate", + "description":"The operation to create or update a hybrid machine resource identity in Azure.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the hybrid machine." + }, + { + "name":"parameters", + "in":"body", + "required":true, + "schema":{ + "$ref":"#/definitions/Machine" + }, + "description":"Parameters supplied to the Create hybrid machine operation." + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/Machine" + } + }, + "204":{ + "description":"No Content" + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + } + }, + "patch":{ + "tags":[ + "machines" + ], + "operationId":"Machines_Update", + "description":"The operation to update a hybrid machine.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the hybrid machine." + }, + { + "name":"parameters", + "in":"body", + "required":true, + "schema":{ + "$ref":"#/definitions/MachineUpdate" + }, + "description":"Parameters supplied to the Update hybrid machine operation." + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/Machine" + } + }, + "204":{ + "description":"No Content" + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + } + }, + "delete":{ + "tags":[ + "machines" + ], + "operationId":"Machines_Delete", + "description":"The operation to remove a hybrid machine identity in Azure.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the hybrid machine." + } + ], + "responses":{ + "200":{ + "description":"OK" + }, + "204":{ + "description":"No Content" + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + } + }, + "get":{ + "tags":[ + "machines" + ], + "operationId":"Machines_Get", + "description":"Retrieves information about the model view or the instance view of a hybrid machine.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the hybrid machine." + }, + { + "name":"$expand", + "in":"query", + "required":false, + "type":"string", + "description":"The expand expression to apply on the operation.", + "enum":[ + "instanceView" + ], + "x-ms-enum":{ + "name":"InstanceViewTypes", + "modelAsString":false + } + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/Machine" + } + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines/{name}/reconnect":{ + "post":{ + "tags":[ + "machines" + ], + "operationId":"Machines_Reconnect", + "description":"The operation to reconnect a hybrid machine resource to its identity in Azure.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the hybrid machine." + }, + { + "name":"parameters", + "in":"body", + "required":true, + "schema":{ + "$ref":"#/definitions/MachineReconnect" + }, + "description":"Parameters supplied to the Reconnect hybrid machine operation." + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/Machine" + } + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines":{ + "get":{ + "tags":[ + "machines" + ], + "operationId":"Machines_ListByResourceGroup", + "description":"Lists all the hybrid machines in the specified resource group. Use the nextLink property in the response to get the next page of hybrid machines.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + }, + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineListResult" + } + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + }, + "x-ms-pageable":{ + "nextLinkName":"nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.HybridCompute/machines":{ + "get":{ + "tags":[ + "machines" + ], + "operationId":"Machines_ListBySubscription", + "description":"Lists all the hybrid machines in the specified subscription. Use the nextLink property in the response to get the next page of hybrid machines.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineListResult" + } + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples":{ + }, + "x-ms-pageable":{ + "nextLinkName":"nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines/{name}/extensions/{extensionName}":{ + "put":{ + "tags":[ + "MachineExtensions" + ], + "operationId":"MachineExtensions_CreateOrUpdate", + "description":"The operation to create or update the extension.", + "parameters":[ + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine where the extension should be created or updated." + }, + { + "name":"extensionName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine extension." + }, + { + "name":"extensionParameters", + "in":"body", + "required":true, + "schema":{ + "$ref":"#/definitions/MachineExtension" + }, + "description":"Parameters supplied to the Create Machine Extension operation." + }, + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineExtension" + } + }, + "202":{ + "description":"Accepted" + } + }, + "x-ms-examples": { + "Create or Update a Machine Extension": { + "$ref": "./examples/PUTExtension.json" + } + }, + "x-ms-long-running-operation":true + }, + "patch":{ + "tags":[ + "MachineExtensions" + ], + "operationId":"MachineExtensions_Update", + "description":"The operation to create or update the extension.", + "parameters":[ + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine where the extension should be created or updated." + }, + { + "name":"extensionName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine extension." + }, + { + "name":"extensionParameters", + "in":"body", + "required":true, + "schema":{ + "$ref":"#/definitions/MachineExtensionUpdate" + }, + "description":"Parameters supplied to the Create Machine Extension operation." + }, + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineExtension" + } + }, + "202":{ + "description":"Accepted" + } + }, + "x-ms-examples": { + "Create or Update a Machine Extension": { + "$ref": "./examples/UpdateExtension.json" + } + }, + "x-ms-long-running-operation":true + }, + "delete":{ + "tags":[ + "MachineExtensions" + ], + "operationId":"MachineExtensions_Delete", + "description":"The operation to delete the extension.", + "parameters":[ + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine where the extension should be deleted." + }, + { + "name":"extensionName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine extension." + }, + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK" + }, + "202":{ + "description":"Accepted" + }, + "204":{ + "description":"No Content" + } + }, + "x-ms-long-running-operation":true, + "x-ms-examples":{ + } + }, + "get":{ + "tags":[ + "MachineExtensions" + ], + "operationId":"MachineExtensions_Get", + "description":"The operation to get the extension.", + "parameters":[ + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine containing the extension." + }, + { + "name":"extensionName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine extension." + }, + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineExtension" + } + } + }, + "x-ms-examples": { + "GET Machine Extension": { + "$ref": "./examples/GETExtension.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines/{name}/extensions":{ + "get":{ + "tags":[ + "MachineExtensions" + ], + "operationId":"MachineExtensions_List", + "description":"The operation to get all extensions of a non-Azure machine", + "parameters":[ + { + "name":"resourceGroupName", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the resource group." + }, + { + "name":"name", + "in":"path", + "required":true, + "type":"string", + "description":"The name of the machine containing the extension." + }, + { + "name":"$expand", + "in":"query", + "required":false, + "type":"string", + "description":"The expand expression to apply on the operation." + }, + { + "$ref":"#/parameters/ApiVersionParameter" + }, + { + "$ref":"#/parameters/SubscriptionIdParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/MachineExtensionsListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "GET all Machine Extensions": { + "$ref": "./examples/LISTExtension.json" + } + } + } + }, + "/providers/Microsoft.HybridCompute/operations":{ + "get":{ + "tags":[ + "operations" + ], + "operationId":"Operations_List", + "description":"Gets a list of hybrid compute operations.", + "parameters":[ + { + "$ref":"#/parameters/ApiVersionParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/OperationListResult" + } + }, + "default":{ + "description":"Error response describing why the operation failed.", + "schema":{ + "$ref":"#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable":{ + "nextLinkName":null + } + } + } + }, + "definitions":{ + "OperationListResult":{ + "properties":{ + "value":{ + "type":"array", + "readOnly":true, + "items":{ + "$ref":"#/definitions/OperationValue" + }, + "description":"The list of compute operations" + } + }, + "description":"The List Compute Operation operation response." + }, + "OperationValue":{ + "properties":{ + "origin":{ + "type":"string", + "readOnly":true, + "description":"The origin of the compute operation." + }, + "name":{ + "type":"string", + "readOnly":true, + "description":"The name of the compute operation." + }, + "display":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/OperationValueDisplay", + "description":"Display properties" + } + }, + "description":"Describes the properties of a Compute Operation value." + }, + "OperationValueDisplay":{ + "properties":{ + "operation":{ + "type":"string", + "readOnly":true, + "description":"The display name of the compute operation." + }, + "resource":{ + "type":"string", + "readOnly":true, + "description":"The display name of the resource the operation applies to." + }, + "description":{ + "type":"string", + "readOnly":true, + "description":"The description of the operation." + }, + "provider":{ + "type":"string", + "readOnly":true, + "description":"The resource provider for the operation." + } + }, + "description":"Describes the properties of a Hybrid Compute Operation Value Display." + }, + "OSProfile":{ + "readOnly":true, + "properties":{ + "computerName":{ + "type":"string", + "readOnly":true, + "description":"Specifies the host OS name of the hybrid machine." + } + }, + "description":"Specifies the operating system settings for the hybrid machine." + }, + "MachineProperties":{ + "properties":{ + "osProfile":{ + "$ref":"#/definitions/OSProfile", + "description":"Specifies the operating system settings for the hybrid machine." + }, + "provisioningState":{ + "readOnly":true, + "type":"string", + "description":"The provisioning state, which only appears in the response." + }, + "status":{ + "readOnly":true, + "type":"string", + "description":"The status of the hybrid machine agent.", + "enum":[ + "Connected", + "Disconnected", + "Error" + ], + "x-ms-enum":{ + "name":"StatusTypes", + "modelAsString":false + } + }, + "lastStatusChange":{ + "readOnly":true, + "type":"string", + "format":"date-time", + "description":"The time of the last status change." + }, + "errorDetails":{ + "readOnly":true, + "type":"array", + "items":{ + "$ref":"#/definitions/ErrorDetail" + }, + "description":"Details about the error state." + }, + "agentVersion":{ + "readOnly":true, + "type":"string", + "description":"The hybrid machine agent full version." + }, + "vmId":{ + "readOnly":true, + "type":"string", + "description":"Specifies the hybrid machine unique ID." + }, + "displayName":{ + "readOnly":true, + "type":"string", + "description":"Specifies the hybrid machine display name." + }, + "machineFqdn":{ + "readOnly":true, + "type":"string", + "description":"Specifies the hybrid machine FQDN." + }, + "physicalLocation":{ + "type":"string", + "description":"Resource's Physical Location" + }, + "clientPublicKey":{ + "type":"string", + "description":"Public Key that the client provides to be used during initial resource onboarding" + }, + "osName":{ + "readOnly":true, + "type":"string", + "description":"The Operating System running on the hybrid machine." + }, + "osVersion":{ + "readOnly":true, + "type":"string", + "description":"The version of Operating System running on the hybrid machine." + }, + "extensions":{ + "type":"array", + "items":{ + "$ref":"#/definitions/MachineExtensionInstanceView" + }, + "description":"Machine Extensions information" + } + }, + "description":"Describes the properties of a hybrid machine." + }, + "MachineReconnectProperties":{ + "properties":{ + "vmId":{ + "type":"string", + "description":"Specifies the hybrid machine unique ID." + }, + "clientPublicKey":{ + "type":"string", + "description":"Public Key that the client provides to be used during initial resource onboarding." + } + }, + "description":"Describes the properties required to reconnect a hybrid machine." + }, + "MachineUpdateProperties":{ + "properties":{ + "physicalLocation":{ + "type":"string", + "description":"Resource's Physical Location" + } + }, + "description":"Describes the ARM updatable properties of a hybrid machine." + }, + "Machine":{ + "properties":{ + "properties":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/MachineProperties", + "description":"Hybrid Compute Machine properties" + } + }, + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ], + "description":"Describes a hybrid machine." + }, + "MachineUpdate":{ + "properties":{ + "identity":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/Identity", + "description":"Hybrid Compute Machine Managed Identity" + }, + "properties":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/MachineUpdateProperties", + "description":"Hybrid Compute Machine properties" + } + }, + "allOf":[ + { + "$ref":"#/definitions/UpdateResource" + } + ], + "description":"Describes a hybrid machine Update." + }, + "MachineReconnect":{ + "properties":{ + "properties":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/MachineReconnectProperties", + "description":"Hybrid Compute Machine properties" + } + }, + "description":"Describes a hybrid machine reconnect." + }, + "MachineListResult":{ + "properties":{ + "value":{ + "type":"array", + "items":{ + "$ref":"#/definitions/Machine" + }, + "description":"The list of hybrid machines." + }, + "nextLink":{ + "type":"string", + "description":"The URI to fetch the next page of Machines. Call ListNext() with this URI to fetch the next page of hybrid machines." + } + }, + "required":[ + "value" + ], + "description":"The List hybrid machine operation response." + }, + "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", + "x-ms-mutability":[ + "create", + "read" + ] + }, + "tags":{ + "type":"object", + "additionalProperties":{ + "type":"string" + }, + "description":"Resource tags" + }, + "identity":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/Identity", + "description":"Hybrid Compute Machine Managed Identity" + } + }, + "required":[ + "location" + ], + "x-ms-azure-resource":true + }, + "UpdateResource":{ + "description":"The Update Resource model definition.", + "properties":{ + "tags":{ + "type":"object", + "additionalProperties":{ + "type":"string" + }, + "description":"Resource tags" + } + } + }, + "ErrorDetail":{ + "title":"Error details.", + "type":"object", + "properties":{ + "code":{ + "description":"The error's code.", + "type":"string" + }, + "message":{ + "description":"A human readable error message.", + "type":"string" + }, + "target":{ + "description":"Indicates which property in the request is responsible for the error.", + "type":"string" + }, + "details":{ + "description":"Additional error details.", + "type":"array", + "items":{ + "$ref":"#/definitions/ErrorDetail" + } + } + }, + "required":[ + "code", + "message" + ] + }, + "ErrorResponse":{ + "title":"Error response.", + "description":"Contains details when the response code indicates an error.", + "type":"object", + "properties":{ + "error":{ + "description":"The error details.", + "$ref":"#/definitions/ErrorDetail" + } + }, + "required":[ + "error" + ] + }, + "Identity":{ + "title":"Managed Identity.", + "type":"object", + "properties":{ + "type":{ + "description":"The identity type.", + "type":"string" + }, + "principalId":{ + "readOnly":true, + "description":"The identity's principal id.", + "type":"string" + }, + "tenantId":{ + "readOnly":true, + "description":"The identity's tenant id.", + "type":"string" + } + } + }, + "MachineExtension":{ + "properties":{ + "properties":{ + "x-ms-client-flatten":true, + "$ref":"#/definitions/MachineExtensionProperties", + "description":"Describes Machine Extension Properties." + } + }, + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ], + "description":"Describes a Machine Extension." + }, + "MachineExtensionUpdate": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/MachineExtensionUpdateProperties", + "description":"Describes Machine Extension Update Properties." + } + }, + "allOf": [ + { + "$ref": "#/definitions/UpdateResource" + } + ], + "description": "Describes a Machine Extension Update." + }, + "MachineExtensionProperties":{ + "properties":{ + "forceUpdateTag":{ + "type":"string", + "description":"How the extension handler should be forced to update even if the extension configuration has not changed." + }, + "publisher":{ + "type":"string", + "description":"The name of the extension handler publisher." + }, + "type":{ + "type":"string", + "description":"Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion":{ + "type":"string", + "description":"Specifies the version of the script handler." + }, + "autoUpgradeMinorVersion":{ + "type":"boolean", + "description":"Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true." + }, + "settings":{ + "type":"object", + "description":"Json formatted public settings for the extension." + }, + "protectedSettings":{ + "type":"object", + "description":"The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all." + }, + "provisioningState":{ + "readOnly":true, + "type":"string", + "description":"The provisioning state, which only appears in the response." + }, + "instanceView":{ + "$ref":"#/definitions/MachineExtensionInstanceView", + "description":"The machine extension instance view." + } + }, + "description":"Describes the properties of a Machine Extension." + }, + "MachineExtensionUpdateProperties": { + "properties": { + "forceUpdateTag": { + "type": "string", + "description": "How the extension handler should be forced to update even if the extension configuration has not changed." + }, + "publisher": { + "type": "string", + "description": "The name of the extension handler publisher." + }, + "type": { + "type": "string", + "description": "Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion": { + "type": "string", + "description": "Specifies the version of the script handler." + }, + "autoUpgradeMinorVersion": { + "type": "boolean", + "description": "Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true." + }, + "settings": { + "type": "object", + "description": "Json formatted public settings for the extension." + }, + "protectedSettings": { + "type": "object", + "description": "The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all." + } + }, + "description": "Describes the properties of a Machine Extension." + }, + "MachineExtensionInstanceView":{ + "properties":{ + "name":{ + "type":"string", + "description":"The machine extension name." + }, + "type":{ + "type":"string", + "description":"Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion":{ + "type":"string", + "description":"Specifies the version of the script handler." + }, + "status":{ + "properties":{ + "code":{ + "type":"string", + "description":"The status code." + }, + "level":{ + "type":"string", + "description":"The level code.", + "enum":[ + "Info", + "Warning", + "Error" + ], + "x-ms-enum":{ + "name":"StatusLevelTypes", + "modelAsString":false + } + }, + "displayStatus":{ + "type":"string", + "description":"The short localizable label for the status." + }, + "message":{ + "type":"string", + "description":"The detailed status message, including for alerts and error messages." + }, + "time":{ + "type":"string", + "format":"date-time", + "description":"The time of the status." + } + }, + "description":"Instance view status." + } + }, + "description":"Describes the Machine Extension Instance View." + }, + "MachineExtensionsListResult":{ + "properties":{ + "value":{ + "type":"array", + "items":{ + "$ref":"#/definitions/MachineExtension" + }, + "description":"The list of extensions" + }, + "nextLink": { + "type": "string", + "description": "The uri to fetch the next page of machine extensions. Call ListNext() with this to fetch the next page of extensions." + } + }, + "description":"Describes the Machine Extensions List Result." + } + }, + "parameters":{ + "SubscriptionIdParameter":{ + "name":"subscriptionId", + "in":"path", + "required":true, + "type":"string", + "description":"Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter":{ + "name":"api-version", + "in":"query", + "required":true, + "type":"string", + "description":"Client Api Version." + } + } + } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/GETExtension.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/GETExtension.json new file mode 100644 index 000000000000..79cb2c875d27 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/GETExtension.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "extensionName": "MMA", + "api-version": "2019-08-02" + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-08T20:42:10.999Z" + } + } + } + } + } + } + } \ No newline at end of file diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/LISTExtension.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/LISTExtension.json new file mode 100644 index 000000000000..36a2fe4ad836 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/LISTExtension.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-13T17:18:57.405Z" + } + } + } + } + ], + "nextLink": "string" + } + } + } + } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/PUTExtension.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/PUTExtension.json new file mode 100644 index 000000000000..cde51ea1d8cf --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/PUTExtension.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "extensionName": "MMA", + "api-version": "2019-08-02", + "extensionParameters": { + "location": "string", + "properties": { + "forceUpdateTag": "false", + "publisher": "Publisher1", + "type": "string", + "typeHandlerVersion": "1.0", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-08T20:36:46.620Z" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-08T20:42:10.999Z" + } + } + } + } + }, + "202": { + } + } + } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/UpdateExtension.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/UpdateExtension.json new file mode 100644 index 000000000000..a4698159a7e5 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/UpdateExtension.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "extensionName": "MMA", + "api-version": "2019-08-02", + "extensionParameters": { + "properties": { + "forceUpdateTag": "false", + "publisher": "Publisher1", + "type": "string", + "typeHandlerVersion": "1.0", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {} + } + } + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-08T20:42:10.999Z" + } + } + } + } + }, + "202": { + } + } + } diff --git a/specification/hybridcompute/resource-manager/readme.md b/specification/hybridcompute/resource-manager/readme.md new file mode 100644 index 000000000000..d7f5ae97bff8 --- /dev/null +++ b/specification/hybridcompute/resource-manager/readme.md @@ -0,0 +1,177 @@ +# HybridCompute + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for HybridCompute RP. + + + +--- +## Getting Started +To build the SDK for HybridCompute, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` +--- + +## Configuration + +### Basic Information +These are the global settings for the HybridCompute API. + +``` yaml +openapi-type: arm +tag: package-2019-08 +``` + +### Tag: package-2019-03 + +These settings apply only when `--tag=package-2019-03` is specified on the command line. + +``` yaml $(tag) == 'package-2019-03' +input-file: +- Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json +``` + +### Tag: package-2019-08 + +These settings apply only when `--tag=package-2019-08` is specified on the command line. + +``` yaml $(tag) == 'package-2019-08' +input-file: +- Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json +``` + +--- +# Code Generation + + +--- +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.Azure.Management.HybridCompute + output-folder: $(csharp-sdks-folder)/HybridCompute/Microsoft.Azure.Management.HybridCompute/src/Generated + clear-output-folder: true +directive: + - remove-operation: + - Machines_Reconnect + - Machines_CreateOrUpdate + - Machines_Update + - Machines_Delete +``` + +## PowerShell + +``` yaml $(powershell) +powershell: + namespace: Microsoft.Azure.Management.HybridCompute + output-folder: generated + clear-output-folder: true +directive: + - remove-operation: + - Machines_Reconnect + - Machines_CreateOrUpdate + - Machines_Update + - Machines_Delete +``` + + +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. +Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. + +``` yaml $(python) +python-mode: create +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: azure.mgmt.hybridcompute + package-name: azure-mgmt-hybridcompute + clear-output-folder: true +``` +``` yaml $(python) && $(python-mode) == 'update' +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/azure-mgmt-hybridcompute/azure/mgmt/hybridcompute +``` +``` yaml $(python) && $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/azure-mgmt-hybridcompute +``` + +## Go + +These settings apply only when `--go` is specified on the command line. + +``` yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + clear-output-folder: true + namespace: hybridcompute +``` + + +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2019-03 +``` + +### Tag: package-2019-03 and go + +These settings apply only when `--tag=package-2019-03 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2019-03' && $(go) +output-folder: $(go-sdk-folder)/services/preview/hybridcompute/mgmt/2019-03-18/hybridcompute +``` + +## Java + +These settings apply only when `--java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(java) +azure-arm: true +fluent: true +namespace: com.microsoft.azure.management.hybridcompute +license-header: MICROSOFT_MIT_NO_CODEGEN +payload-flattening-threshold: 1 +output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-hybridcompute +``` + +### Java multi-api + +``` yaml $(java) && $(multiapi) +batch: + - tag: package-2019-03 +``` + +### Tag: package-2019-03 and java + +These settings apply only when `--tag=package-2019-03 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2019-03' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.hybridcompute.v2019_03_18 + output-folder: $(azure-libraries-for-java-folder)/hybridcompute/resource-manager/v2019_03_18 + +regenerate-manager: true +generate-interface: true +``` From 8d55757fd8acdf602345dbb87ea23066bad0d424 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 13:45:03 -0700 Subject: [PATCH 02/21] Addressed feedback --- .../preview/2019-03-18/HybridCompute.json | 2 +- .../preview/2019-08-02/HybridCompute.json | 53 +++++++++----- .../examples/Machines_CreateOrUpdate.json | 50 +++++++++++++ .../2019-08-02/examples/Machines_Delete.json | 14 ++++ .../2019-08-02/examples/Machines_Get.json | 43 +++++++++++ .../Machines_ListByResourceGroup.json | 72 +++++++++++++++++++ .../examples/Machines_ListBySubscription.json | 43 +++++++++++ .../examples/Machines_Reconnect.json | 50 +++++++++++++ .../2019-08-02/examples/Machines_Update.json | 48 +++++++++++++ .../hybridcompute/resource-manager/readme.md | 10 ++- 10 files changed, 366 insertions(+), 19 deletions(-) create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json create mode 100644 specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json index 432eba287151..7243fe2f0b19 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json @@ -3,7 +3,7 @@ "info": { "title": "HybridComputeManagementClient", "description": "The Hybrid Compute Management Client.", - "version": "2019-01-01-preview" + "version": "2019-03-18-preview" }, "host": "management.azure.com", "schemes": [ diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json index 77bb54f4054f..8fa0d4b34901 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json @@ -89,8 +89,11 @@ } } }, - "x-ms-examples":{ - } + "x-ms-examples": { + "Create or Update a Machine": { + "$ref": "./examples/Machines_CreateOrUpdate.json" + } + } }, "patch":{ "tags":[ @@ -146,8 +149,11 @@ } } }, - "x-ms-examples":{ - } + "x-ms-examples": { + "Update a Machine": { + "$ref": "./examples/Machines_Update.json" + } + } }, "delete":{ "tags":[ @@ -191,8 +197,11 @@ } } }, - "x-ms-examples":{ - } + "x-ms-examples": { + "Delete a Machine": { + "$ref": "./examples/Machines_Delete.json" + } + } }, "get":{ "tags":[ @@ -250,8 +259,11 @@ } } }, - "x-ms-examples":{ - } + "x-ms-examples": { + "Get Machine": { + "$ref": "./examples/Machines_Get.json" + } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines/{name}/reconnect":{ @@ -306,8 +318,11 @@ } } }, - "x-ms-examples":{ - } + "x-ms-examples": { + "Reconnect a Machine": { + "$ref": "./examples/Machines_Reconnect.json" + } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HybridCompute/machines":{ @@ -346,8 +361,11 @@ } } }, - "x-ms-examples":{ - }, + "x-ms-examples": { + "List Machines by resource group": { + "$ref": "./examples/Machines_ListByResourceGroup.json" + } + }, "x-ms-pageable":{ "nextLinkName":"nextLink" } @@ -382,8 +400,11 @@ } } }, - "x-ms-examples":{ - }, + "x-ms-examples": { + "List Machines by resource group": { + "$ref": "./examples/Machines_ListBySubscription.json" + } + }, "x-ms-pageable":{ "nextLinkName":"nextLink" } @@ -442,7 +463,7 @@ } }, "202":{ - "description":"Accepted" + "description":"HTTP 202 (Accepted) if the operation was successfully started and will complete asynchronously." } }, "x-ms-examples": { @@ -1252,4 +1273,4 @@ "description":"Client Api Version." } } - } + } \ No newline at end of file diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json new file mode 100644 index 000000000000..8809200ce210 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02", + "location": "eastus2euap", + "properties": { + "vmId": "string", + "physicalLocation": "redmond", + "clientPublicKey": "string" + }, + "identity": { + "Type": "SystemAssigned" + } + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "location": "eastus2euap", + "tags": null, + "identity": { + "type": "SystemAssigned", + "principalId": "string", + "tenantId": "string" + }, + "type": "Microsoft.HybridCompute/machines", + "properties": { + "provisioningState": "Succeeded", + "agentVersion": null, + "status": null, + "lastStatusChange": null, + "errorDetails": null, + "displayName": null, + "machineFqdn": null, + "osName": null, + "osVersion": null, + "osProfile": { + "computerName": null + }, + "vmId": "string", + "physicalLocation": "string", + "clientPublicKey": "string" + } + } + } + } +} diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json new file mode 100644 index 000000000000..a806ea473ca1 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02-preview" + }, + "responses": { + "200": { + "body": { + } + } + } +} diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json new file mode 100644 index 000000000000..5047fcedb3eb --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02-preview" + }, + "responses": { + "200": { + "body": { + { + "id": "string", + "name": "string", + "location": "string", + "tags": { }, + "identity": { + "type": "SystemAssigned", + "principalId": "string", + "tenantId": "string" + }, + "type": "Microsoft.HybridCompute/machines", + "properties": { + "provisioningState": "string", + "agentVersion": null, + "status": null, + "lastStatusChange": null, + "errorDetails": null, + "displayName": null, + "machineFqdn": null, + "osName": null, + "osVersion": null, + "osProfile": { + "computerName": null + }, + "vmId": "string", + "physicalLocation": "", + "clientPublicKey": "string" + } + } + } + } + } +} diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json new file mode 100644 index 000000000000..b2dc39ba4779 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2019-08-02" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": { }, + "protectedSettings": { }, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-13T17:18:57.405Z" + } + } + } + }, + { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-13T17:18:57.405Z" + } + } + } + } + ], + "nextLink": "string" + } + } + } + } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json new file mode 100644 index 000000000000..ebe14e78f882 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2019-08-02" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "location": "string", + "properties": { + "forceUpdateTag": "string", + "publisher": "string", + "type": "string", + "typeHandlerVersion": "string", + "autoUpgradeMinorVersion": true, + "settings": {}, + "protectedSettings": {}, + "provisioningState": "string", + "instanceView": { + "name": "string", + "type": "string", + "typeHandlerVersion": "string", + "status": { + "code": "string", + "level": "Info", + "displayStatus": "string", + "message": "string", + "time": "2019-08-13T17:18:57.405Z" + } + } + } + } + ], + "nextLink": "string" + } + } + } + } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json new file mode 100644 index 000000000000..8809200ce210 --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02", + "location": "eastus2euap", + "properties": { + "vmId": "string", + "physicalLocation": "redmond", + "clientPublicKey": "string" + }, + "identity": { + "Type": "SystemAssigned" + } + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "location": "eastus2euap", + "tags": null, + "identity": { + "type": "SystemAssigned", + "principalId": "string", + "tenantId": "string" + }, + "type": "Microsoft.HybridCompute/machines", + "properties": { + "provisioningState": "Succeeded", + "agentVersion": null, + "status": null, + "lastStatusChange": null, + "errorDetails": null, + "displayName": null, + "machineFqdn": null, + "osName": null, + "osVersion": null, + "osProfile": { + "computerName": null + }, + "vmId": "string", + "physicalLocation": "string", + "clientPublicKey": "string" + } + } + } + } +} diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json new file mode 100644 index 000000000000..c21d4fcc7c2c --- /dev/null +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "name": "myMachine", + "api-version": "2019-08-02", + "location": "eastus2euap", + "properties": { + "physicalLocation": "newLocation", + }, + "identity": { + "Type": "SystemAssigned" + } + }, + "responses": { + "200": { + "body": { + "id": "string", + "name": "string", + "location": "eastus2euap", + "tags": null, + "identity": { + "type": "SystemAssigned", + "principalId": "string", + "tenantId": "string" + }, + "type": "Microsoft.HybridCompute/machines", + "properties": { + "provisioningState": "Succeeded", + "agentVersion": null, + "status": null, + "lastStatusChange": null, + "errorDetails": null, + "displayName": null, + "machineFqdn": null, + "osName": null, + "osVersion": null, + "osProfile": { + "computerName": null + }, + "vmId": "string", + "physicalLocation": "string", + "clientPublicKey": "string" + } + } + } + } +} diff --git a/specification/hybridcompute/resource-manager/readme.md b/specification/hybridcompute/resource-manager/readme.md index d7f5ae97bff8..afaf5eebeb16 100644 --- a/specification/hybridcompute/resource-manager/readme.md +++ b/specification/hybridcompute/resource-manager/readme.md @@ -105,12 +105,18 @@ python: ``` yaml $(python) && $(python-mode) == 'update' python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt-hybridcompute/azure/mgmt/hybridcompute + output-folder: $(python-sdks-folder)/hybridcompute/azure-mgmt-hybridcompute/azure/mgmt/hybridcompute ``` ``` yaml $(python) && $(python-mode) == 'create' python: basic-setup-py: true output-folder: $(python-sdks-folder)/azure-mgmt-hybridcompute +directive: + - remove-operation: + - Machines_Reconnect + - Machines_CreateOrUpdate + - Machines_Update + - Machines_Delete ``` ## Go @@ -138,7 +144,7 @@ These settings apply only when `--tag=package-2019-03 --go` is specified on the Please also specify `--go-sdk-folder=`. ``` yaml $(tag)=='package-2019-03' && $(go) -output-folder: $(go-sdk-folder)/services/preview/hybridcompute/mgmt/2019-03-18/hybridcompute +output-folder: $(go-sdk-folder)/services/preview/hybridcompute/mgmt/2019-03-18-preview/hybridcompute ``` ## Java From 7f636e1e46847bf4db24164705ccf84827045a07 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:22:47 -0700 Subject: [PATCH 03/21] fix typo --- .../preview/2019-08-02/examples/Machines_Get.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json index 5047fcedb3eb..d59ae778ca80 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Get.json @@ -8,7 +8,6 @@ "responses": { "200": { "body": { - { "id": "string", "name": "string", "location": "string", @@ -39,5 +38,4 @@ } } } - } } From 724aabf2e3ed7f8a895799bf8a5934cfb463a0b5 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:29:16 -0700 Subject: [PATCH 04/21] fix build issues --- .../preview/2019-08-02/examples/Machines_Update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index c21d4fcc7c2c..5b6fba4dd168 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -6,7 +6,7 @@ "api-version": "2019-08-02", "location": "eastus2euap", "properties": { - "physicalLocation": "newLocation", + "physicalLocation": "newLocation" }, "identity": { "Type": "SystemAssigned" From f52d2a8dd9f30bfe29b6891ff7acf21dec318c9d Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:48:30 -0700 Subject: [PATCH 05/21] fix validation issues --- .../Machines_ListByResourceGroup.json | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json index b2dc39ba4779..cfee823072bd 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json @@ -35,34 +35,6 @@ } } } - }, - { - "id": "string", - "name": "string", - "type": "string", - "location": "string", - "properties": { - "forceUpdateTag": "string", - "publisher": "string", - "type": "string", - "typeHandlerVersion": "string", - "autoUpgradeMinorVersion": true, - "settings": {}, - "protectedSettings": {}, - "provisioningState": "string", - "instanceView": { - "name": "string", - "type": "string", - "typeHandlerVersion": "string", - "status": { - "code": "string", - "level": "Info", - "displayStatus": "string", - "message": "string", - "time": "2019-08-13T17:18:57.405Z" - } - } - } } ], "nextLink": "string" From 9a2f4c6652b8111a616d2533ab49e2c2be2a740f Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:54:00 -0700 Subject: [PATCH 06/21] fix validation errors --- .../Machines_ListByResourceGroup.json | 24 +------------------ .../examples/Machines_ListBySubscription.json | 24 +------------------ 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json index cfee823072bd..c4b3eccaaacb 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListByResourceGroup.json @@ -12,29 +12,7 @@ "id": "string", "name": "string", "type": "string", - "location": "string", - "properties": { - "forceUpdateTag": "string", - "publisher": "string", - "type": "string", - "typeHandlerVersion": "string", - "autoUpgradeMinorVersion": true, - "settings": { }, - "protectedSettings": { }, - "provisioningState": "string", - "instanceView": { - "name": "string", - "type": "string", - "typeHandlerVersion": "string", - "status": { - "code": "string", - "level": "Info", - "displayStatus": "string", - "message": "string", - "time": "2019-08-13T17:18:57.405Z" - } - } - } + "location": "string" } ], "nextLink": "string" diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json index ebe14e78f882..1358bfc3c944 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_ListBySubscription.json @@ -11,29 +11,7 @@ "id": "string", "name": "string", "type": "string", - "location": "string", - "properties": { - "forceUpdateTag": "string", - "publisher": "string", - "type": "string", - "typeHandlerVersion": "string", - "autoUpgradeMinorVersion": true, - "settings": {}, - "protectedSettings": {}, - "provisioningState": "string", - "instanceView": { - "name": "string", - "type": "string", - "typeHandlerVersion": "string", - "status": { - "code": "string", - "level": "Info", - "displayStatus": "string", - "message": "string", - "time": "2019-08-13T17:18:57.405Z" - } - } - } + "location": "string" } ], "nextLink": "string" From 011bbdb0c97e88939df32ea71dc214070e8ebb3b Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:56:25 -0700 Subject: [PATCH 07/21] fix errors --- .../preview/2019-08-02/examples/Machines_Delete.json | 1 + .../preview/2019-08-02/examples/Machines_Update.json | 1 + 2 files changed, 2 insertions(+) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index a806ea473ca1..fb5ec09106fb 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -10,5 +10,6 @@ "body": { } } + "204": { } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 5b6fba4dd168..1e59a4601e8d 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -44,5 +44,6 @@ } } } + "204": { } } } From 017e2af7f14295f92b7852b50bdbe8f7b48010c6 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 22:01:20 -0700 Subject: [PATCH 08/21] fix errors --- .../preview/2019-08-02/examples/Machines_Delete.json | 2 +- .../preview/2019-08-02/examples/Machines_Update.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index fb5ec09106fb..606118f944b0 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -9,7 +9,7 @@ "200": { "body": { } - } + }, "204": { } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 1e59a4601e8d..0f23fcdcc78b 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -43,7 +43,7 @@ "clientPublicKey": "string" } } - } + }, "204": { } } } From f23990ef5d3408837d0837ad06c18dd17891eabb Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 22:09:01 -0700 Subject: [PATCH 09/21] fix errors --- .../preview/2019-08-02/examples/Machines_CreateOrUpdate.json | 4 +++- .../preview/2019-08-02/examples/Machines_Delete.json | 4 +--- .../preview/2019-08-02/examples/Machines_Reconnect.json | 1 + .../preview/2019-08-02/examples/Machines_Update.json | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json index 8809200ce210..d67626272b07 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json @@ -4,6 +4,7 @@ "resourceGroupName": "myResourceGroup", "name": "myMachine", "api-version": "2019-08-02", + "parameters": "string", "location": "eastus2euap", "properties": { "vmId": "string", @@ -45,6 +46,7 @@ "clientPublicKey": "string" } } - } + }, + "204": { } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index 606118f944b0..3f2fb9421e7c 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -6,9 +6,7 @@ "api-version": "2019-08-02-preview" }, "responses": { - "200": { - "body": { - } + "200": { }, "204": { } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json index 8809200ce210..52698205004d 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Reconnect.json @@ -5,6 +5,7 @@ "name": "myMachine", "api-version": "2019-08-02", "location": "eastus2euap", + "parameters": "string", "properties": { "vmId": "string", "physicalLocation": "redmond", diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 0f23fcdcc78b..634b817e3036 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -5,6 +5,7 @@ "name": "myMachine", "api-version": "2019-08-02", "location": "eastus2euap", + "parameters": "string", "properties": { "physicalLocation": "newLocation" }, From 130fe9c72ca2c3afbefcc23a6b1cf0e15fc844ec Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Wed, 16 Oct 2019 15:22:00 -0700 Subject: [PATCH 10/21] remove 204 return codes --- .../preview/2019-08-02/HybridCompute.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json index 8fa0d4b34901..42cdd6fec784 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json @@ -79,9 +79,6 @@ "$ref":"#/definitions/Machine" } }, - "204":{ - "description":"No Content" - }, "default":{ "description":"Error response describing why the operation failed.", "schema":{ @@ -139,9 +136,6 @@ "$ref":"#/definitions/Machine" } }, - "204":{ - "description":"No Content" - }, "default":{ "description":"Error response describing why the operation failed.", "schema":{ From 675c1b3b43f496b4518243cda3d2c7e781baaef1 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 10:52:04 -0700 Subject: [PATCH 11/21] updated examplese --- .../preview/2019-08-02/examples/Machines_CreateOrUpdate.json | 3 +-- .../preview/2019-08-02/examples/Machines_Update.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json index d67626272b07..123cd8f62b98 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json @@ -46,7 +46,6 @@ "clientPublicKey": "string" } } - }, - "204": { } + } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 634b817e3036..b76dae837072 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -44,7 +44,6 @@ "clientPublicKey": "string" } } - }, - "204": { } + } } } From 2cf533cd95966370540965a059e7259e73985bb5 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 19:22:17 -0700 Subject: [PATCH 12/21] enable delete operation --- specification/hybridcompute/resource-manager/readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/hybridcompute/resource-manager/readme.md b/specification/hybridcompute/resource-manager/readme.md index afaf5eebeb16..89d5424180a2 100644 --- a/specification/hybridcompute/resource-manager/readme.md +++ b/specification/hybridcompute/resource-manager/readme.md @@ -67,7 +67,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` ## PowerShell @@ -82,7 +81,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` @@ -116,7 +114,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` ## Go From 5b470d8d88f7896d65f0660d9381c4d7f067711c Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 14 Oct 2019 13:46:43 -0700 Subject: [PATCH 13/21] Hybrid RP swagger --- .../preview/2019-08-02/HybridCompute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json index 42cdd6fec784..d0caeb729036 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json @@ -1267,4 +1267,4 @@ "description":"Client Api Version." } } - } \ No newline at end of file + } From 81c9862e87b1039bedc21f32bba4670be333e138 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 13:45:03 -0700 Subject: [PATCH 14/21] Addressed feedback --- .../preview/2019-08-02/HybridCompute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json index d0caeb729036..42cdd6fec784 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json @@ -1267,4 +1267,4 @@ "description":"Client Api Version." } } - } + } \ No newline at end of file From c29a151305ea422b4478f7fd303f932a0e449b24 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 21:56:25 -0700 Subject: [PATCH 15/21] fix errors --- .../preview/2019-08-02/examples/Machines_Delete.json | 7 +++++++ .../preview/2019-08-02/examples/Machines_Update.json | 1 + 2 files changed, 8 insertions(+) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index 3f2fb9421e7c..453b0155bbd7 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -6,8 +6,15 @@ "api-version": "2019-08-02-preview" }, "responses": { +<<<<<<< HEAD "200": { }, +======= + "200": { + "body": { + } + } +>>>>>>> fix errors "204": { } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index b76dae837072..9ef48ed30062 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -45,5 +45,6 @@ } } } + "204": { } } } From ad1952964a4e65d195d69e93f10741f2afbad64a Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 22:01:20 -0700 Subject: [PATCH 16/21] fix errors --- .../preview/2019-08-02/examples/Machines_Delete.json | 4 ++++ .../preview/2019-08-02/examples/Machines_Update.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index 453b0155bbd7..8cac2ff017f0 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -13,7 +13,11 @@ "200": { "body": { } +<<<<<<< HEAD } +>>>>>>> fix errors +======= + }, >>>>>>> fix errors "204": { } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 9ef48ed30062..634b817e3036 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -44,7 +44,7 @@ "clientPublicKey": "string" } } - } + }, "204": { } } } From 58f4d0b92cef6e24ee24889708de70d645e94267 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Tue, 15 Oct 2019 22:09:01 -0700 Subject: [PATCH 17/21] fix errors --- .../preview/2019-08-02/examples/Machines_CreateOrUpdate.json | 3 ++- .../preview/2019-08-02/examples/Machines_Delete.json | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json index 123cd8f62b98..d67626272b07 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json @@ -46,6 +46,7 @@ "clientPublicKey": "string" } } - } + }, + "204": { } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index 8cac2ff017f0..33bf84cf6700 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -6,6 +6,7 @@ "api-version": "2019-08-02-preview" }, "responses": { +<<<<<<< HEAD <<<<<<< HEAD "200": { }, @@ -17,6 +18,9 @@ } >>>>>>> fix errors ======= +======= + "200": { +>>>>>>> fix errors }, >>>>>>> fix errors "204": { } From 3b0bc25c40f00dac190f3f4fa7f5b5f33f84f109 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 10:52:04 -0700 Subject: [PATCH 18/21] updated examplese --- .../preview/2019-08-02/examples/Machines_CreateOrUpdate.json | 3 +-- .../preview/2019-08-02/examples/Machines_Update.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json index d67626272b07..123cd8f62b98 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_CreateOrUpdate.json @@ -46,7 +46,6 @@ "clientPublicKey": "string" } } - }, - "204": { } + } } } diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json index 634b817e3036..b76dae837072 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Update.json @@ -44,7 +44,6 @@ "clientPublicKey": "string" } } - }, - "204": { } + } } } From b64278de24fdcaf9ef5007d51045b9058296d344 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 19:22:17 -0700 Subject: [PATCH 19/21] enable delete operation --- specification/hybridcompute/resource-manager/readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/hybridcompute/resource-manager/readme.md b/specification/hybridcompute/resource-manager/readme.md index 0e698c02424f..786f8e16c53e 100644 --- a/specification/hybridcompute/resource-manager/readme.md +++ b/specification/hybridcompute/resource-manager/readme.md @@ -67,7 +67,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` ## PowerShell @@ -82,7 +81,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` @@ -116,7 +114,6 @@ directive: - Machines_Reconnect - Machines_CreateOrUpdate - Machines_Update - - Machines_Delete ``` ## Go From e0305ccdf84d0843d578a7a940b05e477a0a2b36 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 19:53:33 -0700 Subject: [PATCH 20/21] fix tyop --- .../2019-08-02/examples/Machines_Delete.json | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index c62769ca9904..d02c31674688 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -6,28 +6,8 @@ "api-version": "2019-08-02-preview" }, "responses": { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "200": { }, -======= - "200": { - "body": { - } -<<<<<<< HEAD - } ->>>>>>> fix errors -======= -======= - "200": { ->>>>>>> fix errors - }, ->>>>>>> fix errors -======= - "200": { - }, ->>>>>>> 2cf533cd95966370540965a059e7259e73985bb5 "204": { } } -} +} \ No newline at end of file From 441b9f2a4ed0042f34acd82eaa9b372c4b874a94 Mon Sep 17 00:00:00 2001 From: Fareha Rashid Date: Mon, 21 Oct 2019 19:54:34 -0700 Subject: [PATCH 21/21] fix spaces --- .../preview/2019-08-02/examples/Machines_Delete.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json index d02c31674688..3f2fb9421e7c 100644 --- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json +++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/preview/2019-08-02/examples/Machines_Delete.json @@ -10,4 +10,4 @@ }, "204": { } } -} \ No newline at end of file +}