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

Managed instance updates plus examples #5730

Merged
merged 10 commits into from
Apr 23, 2019
Merged

Managed instance updates plus examples #5730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5251cc1
Initializing instance pools swagger and examples - no usages / manage…
Feb 19, 2019
df56164
Sync latest
Apr 22, 2019
108f931
updates to mi examples + swagger
Apr 22, 2019
96bb60c
Use common definitions
Apr 22, 2019
55ed369
Remove unused def
Apr 22, 2019
1775fd5
Update specification/sql/resource-manager/Microsoft.Sql/preview/2015-…
nschonni Apr 23, 2019
0c81771
Update specification/sql/resource-manager/Microsoft.Sql/preview/2015-…
nschonni Apr 23, 2019
b7b23d9
Fix managed instance create max public endpoint value
Apr 23, 2019
f758011
Update managed instance update public endpoint example to bool
Apr 23, 2019
b1758f2
Making sub casing match for an example - retriggering build for PR
Apr 23, 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
113 changes: 62 additions & 51 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,77 +10,88 @@
},
"location" : "Japan East",
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity" : 1
"name" : "GP_Gen5",
"tier" : "GeneralPurpose"
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin" : "dummylogin",
"administratorLoginPassword" : "Un53cuRE!",
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"properties": {
"administratorLogin": "dummylogin",
"administratorLoginPassword": "Un53cuRE!",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full",
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Redirect",
"timezoneId" : "UTC"
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1"
}
}
},
"responses" : {
"200" : {
"body" : {
"tags" : {
"tagKey1" : "TagValue1"
"200": {
"body": {
"sku": {
"name": "GP_Gen5",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen5"
},
"id" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance1",
"name" : "testinstance1",
"type" : "Microsoft.Sql/managedInstances",
"location" : "japaneast",
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin" : "dummylogin",
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Redirect",
"timezoneId" : "UTC"
}
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1"
},
"location": "japaneast",
"tags": {
"tagKey1": "TagValue1"
},
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
},
"201" : {
"body" : {
"tags" : {
"tagKey1" : "TagValue1"
"body": {
"sku": {
"name": "GP_Gen5",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen5"
},
"id" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance2",
"name" : "testinstance2",
"type" : "Microsoft.Sql/managedInstances",
"location" : "japaneast",
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin" : "dummylogin",
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1"
},
"location": "japaneast",
"tags": {
"tagKey1": "TagValue1"
},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
},
"202" : {}
Expand Down
78 changes: 52 additions & 26 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceCreateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,84 @@
{
"parameters": {
"subscriptionId" : "20D7082A-0FC7-4468-82BD-542694D5042B",
"resourceGroupName" : "testrg",
"managedInstanceName" : "testinstance",
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
"resourceGroupName": "testrg",
"managedInstanceName": "testinstance",
"api-version": "2015-05-01-preview",
"parameters": {
"sku": {
"name": "GP_Gen4",
"tier": "GeneralPurpose"
},
"properties": {
"administratorLogin": "dummylogin",
"administratorLoginPassword": "Un53cuRE!"
"administratorLoginPassword": "Un53cuRE!",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded"
},
"location": "Japan East"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances",
"location": "japaneast",
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity" : 1
"sku": {
"name": "GP_Gen4",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen4"
},
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"dnsZone": "1b4e2caff2530"
},
"location": "japaneast",
"tags": {

},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
},
"201": {
"body": {
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances",
"location": "japaneast",
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity" : 1
"sku": {
"name": "GP_Gen4",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen4"
},
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"dnsZone": "1b4e2caff2530"
},
"location": "japaneast",
"tags": {

},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
},
"202": {}
Expand Down
44 changes: 24 additions & 20 deletions ...esource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,40 @@
"parameters" : {
"subscriptionId" : "20d7082a-0fc7-4468-82bd-542694d5042b",
"resourceGroupName" : "testrg",
"managedInstanceName" : "testcl",
"managedInstanceName" : "testinstance",
"api-version" : "2015-05-01-preview"
},
"responses" : {
"200" : {
"body" : {
"sku" : {
"name" : "CLS3",
"tier" : "Standard",
"capacity": 1,
"family":"Gen4"
"body": {
"sku": {
"name": "GP_Gen4",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen4"
},
"properties" : {
"fullyQualifiedDomainName" : "testcl.1b4e2caff2530.database.windows.net",
"administratorLogin": "cloudSA",
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Default",
"timezoneId" : "UTC"
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/instancePool1"
},
"location" : "onebox",
"id" : "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
"name" : "testcl",
"type" : "Microsoft.Sql/managedInstances"
"location": "japaneast",
"tags": {
"key": "value"
},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
}
}
}
}
Loading