Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Vnet resource for Microsoft.DBforMariaDB #4337

Merged
merged 1 commit into from
Oct 26, 2018
Merged

Add Vnet resource for Microsoft.DBforMariaDB #4337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions ...t.DBforMariaDB/preview/2018-06-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parameters": {
"subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff",
"resourceGroupName": "TestGroup",
"serverName": "vnet-test-svr",
"virtualNetworkRuleName": "vnet-firewall-rule",
"api-version": "2018-06-01-preview",
"parameters": {
"properties": {
"ignoreMissingVnetServiceEndpoint": false,
"virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule",
"name": "vnet-firewall-rule",
"type": "Microsoft.DBforMariaDB/servers/virtualNetworkRules",
"properties": {
"ignoreMissingVnetServiceEndpoint": false,
"virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
},
"201": {
"body": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule",
"name": "vnet-firewall-rule",
"type": "Microsoft.DBforMariaDB/servers/virtualNetworkRules",
"properties": {
"ignoreMissingVnetServiceEndpoint": false,
"virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
},
"202": {}
}
}
20 changes: 20 additions & 0 deletions ...Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/VirtualNetworkRulesDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff",
"resourceGroupName": "TestGroup",
"serverName": "vnet-test-svr",
"virtualNetworkRuleName": "vnet-firewall-rule",
"api-version": "2018-06-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
}
}
267 changes: 265 additions & 2 deletions ...n/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,193 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": {
"get": {
"tags": [
"VirtualNetworkRules"
],
"description": "Gets a virtual network rule.",
"operationId": "VirtualNetworkRules_Get",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/virtualNetworkRuleNameParameter"
}
],
"responses": {
"200": {
"description": "Successfully retrieved a specified virtual network rule.",
"schema": {
"$ref": "#/definitions/VirtualNetworkRule"
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
}
},
"x-ms-examples": {
"Gets a virtual network rule": {
"$ref": "./examples/VirtualNetworkRulesGet.json"
}
}
},
"put": {
"tags": [
"VirtualNetworkRules"
],
"description": "Creates or updates an existing virtual network rule.",
"operationId": "VirtualNetworkRules_CreateOrUpdate",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/virtualNetworkRuleNameParameter"
},
{
"name": "parameters",
"in": "body",
"description": "The requested virtual Network Rule Resource state.",
"required": true,
"schema": {
"$ref": "#/definitions/VirtualNetworkRule"
}
}
],
"responses": {
"200": {
"description": "Successfully updated a virtual network rule.",
"schema": {
"$ref": "#/definitions/VirtualNetworkRule"
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 400 NullVirtualNetworkSubnetId - The Virtual Network Subnet Id is null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 VirtualNetworkRuleNotEnabled - Azure SQL Server Virtual Network Rule feature is not enabled\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation."
},
"202": {
"description": "Accepted"
},
"201": {
"description": "Successfully created a virtual network rule.",
"schema": {
"$ref": "#/definitions/VirtualNetworkRule"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Create or update a virtual network rule": {
"$ref": "./examples/VirtualNetworkRulesCreateOrUpdate.json"
}
}
},
"delete": {
"tags": [
"VirtualNetworkRules"
],
"description": "Deletes the virtual network rule with the given name.",
"operationId": "VirtualNetworkRules_Delete",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"$ref": "#/parameters/virtualNetworkRuleNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully deleted the virtual network rule."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation."
},
"202": {
"description": "Accepted"
},
"204": {
"description": "The specified virtual network rule does not exist."
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Delete a virtual network rule": {
"$ref": "./examples/VirtualNetworkRulesDelete.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules": {
"get": {
"tags": [
"VirtualNetworkRules"
],
"description": "Gets a list of virtual network rules in a server.",
"operationId": "VirtualNetworkRules_ListByServer",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully retrieved the list of virtual network rules.",
"schema": {
"$ref": "#/definitions/VirtualNetworkRuleListResult"
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"List virtual network rules": {
"$ref": "./examples/VirtualNetworkRulesList.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/databases/{databaseName}": {
"put": {
"tags": [
Expand Down Expand Up @@ -1449,7 +1636,75 @@
}
},
"description": "A list of firewall rules."
},
},
"VirtualNetworkRuleProperties": {
"description": "Properties of a virtual network rule.",
"required": [
"virtualNetworkSubnetId"
],
"type": "object",
"properties": {
"virtualNetworkSubnetId": {
"description": "The ARM resource id of the virtual network subnet.",
"type": "string"
},
"ignoreMissingVnetServiceEndpoint": {
"description": "Create firewall rule before the virtual network has vnet service endpoint enabled.",
"type": "boolean"
},
"state": {
"description": "Virtual Network Rule State",
"enum": [
"Initializing",
"InProgress",
"Ready",
"Deleting",
"Unknown"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "VirtualNetworkRuleState",
"modelAsString": true
}
}
}
},
"VirtualNetworkRule": {
"description": "A virtual network rule.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/VirtualNetworkRuleProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
}
}
},
"VirtualNetworkRuleListResult": {
"description": "A list of virtual network rules.",
"type": "object",
"properties": {
"value": {
"description": "Array of results.",
"type": "array",
"items": {
"$ref": "#/definitions/VirtualNetworkRule"
},
"readOnly": true
},
"nextLink": {
"description": "Link to retrieve next page of results.",
"type": "string",
"readOnly": true
}
}
},
"DatabaseProperties": {
"properties": {
"charset": {
Expand Down Expand Up @@ -1895,7 +2150,15 @@
"type": "string",
"description": "The name of the server firewall rule.",
"x-ms-parameter-location": "method"
},
},
"virtualNetworkRuleNameParameter": {
"name": "virtualNetworkRuleName",
"in": "path",
"description": "The name of the virtual network rule.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"DatabaseNameParameter": {
"name": "databaseName",
"in": "path",
Expand Down