Skip to content

Updating swagger and examples for Vnet after adding migration flag + state #1492

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

Merged
sergey-shandar merged 2 commits into from
Jul 31, 2017
Merged

Updating swagger and examples for Vnet after adding migration flag + state #1492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b9a14
Updating swagger and examples for Vnet after adding migration flag + …
NayantaraD Jul 28, 2017
b8e7914
Addressing comments
NayantaraD Jul 29, 2017
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
9 changes: 6 additions & 3 deletions ...-manager/Microsoft.Sql/2015-05-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"api-version": "2015-05-01-preview",
"parameters": {
"properties": {
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
"ignoreVnetPrivateAccessConfiguration": false,
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
},
Expand All @@ -18,7 +19,8 @@
"name": "vnet-firewall-rule",
"type": "Microsoft.Sql/servers/virtualNetworkRules",
"properties": {
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
"ignoreVnetPrivateAccessConfiguration": false,
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
},
Expand All @@ -28,7 +30,8 @@
"name": "vnet-firewall-rule",
"type": "Microsoft.Sql/servers/virtualNetworkRules",
"properties": {
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
"ignoreVnetPrivateAccessConfiguration": false,
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"

@jaredmoo jaredmoo Jul 29, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

"state" is missing from these responses

@dnayantara dnayantara Jul 29, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This will just be there in GET and LIST responses.

}
}
},
Expand Down
2 changes: 2 additions & 0 deletions ...ql/resource-manager/Microsoft.Sql/2015-05-01-preview/examples/VirtualNetworkRulesGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"name": "vnet-firewall-rule",
"type": "Microsoft.Sql/servers/virtualNetworkRules",
"properties": {
"ignoreVnetPrivateAccessConfiguration": false,
"state": "Ready",
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...l/resource-manager/Microsoft.Sql/2015-05-01-preview/examples/VirtualNetworkRulesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"name": "vnet-firewall-rule",
"type": "Microsoft.Sql/servers/virtualNetworkRules",
"properties": {
"ignoreVnetPrivateAccessConfiguration": false,
"state": "Ready",
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
},
Expand All @@ -23,6 +25,8 @@
"name": "vnet-firewall-rule",
"type": "Microsoft.Sql/servers/virtualNetworkRules",
"properties": {
"ignoreVnetPrivateAccessConfiguration": false,
"state": "Ready",
"virtualNetworkSubnetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
}
}
Expand Down
29 changes: 26 additions & 3 deletions specification/sql/resource-manager/Microsoft.Sql/2015-05-01-preview/virtualNetworkRules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "2015-05-01-preview",
"version": "2.0",

@jaredmoo jaredmoo Jul 29, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Undo

"title": "SqlManagementClient",
"description": "The Azure SQL Database management API provides a RESTful set of web APIs that interact with Azure SQL Database services to manage your databases. The API enables users to create, retrieve, update, and delete databases, servers, and other entities."
},
Expand Down Expand Up @@ -219,11 +219,34 @@
"definitions": {
"VirtualNetworkRuleProperties": {
"description": "Properties of a virtual network rule.",
"required": [
"virtualNetworkSubnetId"
],
"type": "object",
"properties": {
"virtualNetworkSubnetId": {
"description": "The resource ID of the virtual network subnet",
"description": "The ARM resource id of the virtual network subnet.",
"type": "string"
},
"ignoreVnetPrivateAccessConfiguration": {
"description": "Create firewall rule before the virtual network has private access enabled.",
"type": "boolean"
},
"state": {
"description": "Virtual Network Rule State",

@jaredmoo jaredmoo Jul 29, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: don't use title casing, ie. change to Virtual network rule state

"enum": [
"Initializing",
"InProgress",
"Ready",
"Deleting",
"Unknown"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "VirtualNetworkRuleState",
"modelAsString": true
}
}
}
},
Expand Down Expand Up @@ -348,4 +371,4 @@
}
}
}
}
}