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

Fix mysql sku values #4994

Merged
merged 4 commits into from
Jan 16, 2019
Merged

Fix mysql sku values #4994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bb8b99
fixed some invalid values in dl account examples
Nov 7, 2018
037cd89
Merge pull request #1 from Azure/master
Dec 3, 2018
a3e5dc6
Merge pull request #2 from Azure/master
Dec 29, 2018
a1d4df1
updated sku as old sku doesn't work any longer
Jan 5, 2019
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
12 changes: 6 additions & 6 deletions ...source-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"createMode": "Default"
},
"sku": {
"name": "B_Gen4_2",
"name": "B_Gen5_2",
Copy link

@praries880 praries880 Jan 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@zikalino Are examples the only places these values appear at? Is there associated documentation or swagger spec that needs to be updated as well?

Copy link
Author

Choose a reason for hiding this comment

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

@praries880 I think examples is the only place where you can find these values in the REST API specs. If examples are wrong the only way to figure out proper values is to go to the portal, or use Azure CLI to create the server and then see what values are correct.

Anyway, thanks for reminding me. I did a search and found out that we could also update response values -- this PR only fixes values in the requests.

Copy link

Choose a reason for hiding this comment

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

@zikalino will you be updating the PR to fix the values in the responses as well?

Copy link
Author

Choose a reason for hiding this comment

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

@praries880 everything is already correct, I haven't found any occurrences of Gen4 anywhere. So I think we can go ahead and merge this PR.

"tier": "Basic",
"capacity": 2,
"family": "Gen4"
"family": "Gen5"
},
"tags": {
"ElasticServer": "1"
Expand All @@ -37,8 +37,8 @@
"location": "eastus",
"sku": {
"capacity": 2,
"family": "Gen4",
"name": "B_Gen4_2",
"family": "Gen5",
"name": "B_Gen5_2",
"size": null,
"tier": "Basic"
},
Expand Down Expand Up @@ -67,8 +67,8 @@
"location": "eastus",
"sku": {
"capacity": 2,
"family": "Gen4",
"name": "B_Gen4_2",
"family": "Gen5",
"name": "B_Gen5_2",
"size": null,
"tier": "Basic"
},
Expand Down
12 changes: 6 additions & 6 deletions .../mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"createMode": "Default"
},
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"capacity": 2,
"family": "Gen4"
"family": "Gen5"
},
"tags": {
"ElasticServer": "1"
Expand All @@ -32,9 +32,9 @@
"201": {
"body": {
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"properties": {
Expand Down Expand Up @@ -66,9 +66,9 @@
"type": "Microsoft.DBforMySQL/servers",
"location": "westus",
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"tags": {
Expand Down
12 changes: 6 additions & 6 deletions ...e-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateGeoRestoreMode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMySQL/servers/sourceserver"
},
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"tags": {
Expand All @@ -25,9 +25,9 @@
"201": {
"body": {
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"properties": {
Expand Down Expand Up @@ -59,9 +59,9 @@
"type": "Microsoft.DBforMySQL/servers",
"location": "westus",
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"tags": {
Expand Down
12 changes: 6 additions & 6 deletions ...nager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreatePointInTimeRestore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMySQL/servers/sourceserver"
},
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"tags": {
Expand All @@ -26,9 +26,9 @@
"201": {
"body": {
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"properties": {
Expand Down Expand Up @@ -60,9 +60,9 @@
"type": "Microsoft.DBforMySQL/servers",
"location": "brazilsouth",
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"tags": {
Expand Down
8 changes: 4 additions & 4 deletions ...urce-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateReplicaMode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"201": {
"body": {
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"properties": {
Expand Down Expand Up @@ -49,9 +49,9 @@
"200": {
"body": {
"sku": {
"name": "GP_Gen4_2",
"name": "GP_Gen5_2",
"tier": "GeneralPurpose",
"family": "Gen4",
"family": "Gen5",
"capacity": 2
},
"properties": {
Expand Down