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

Swagger Changes to Add DnsZonePartner and Collation into Managed Instance #3875

Merged
merged 9 commits into from
Sep 18, 2018
Merged

Swagger Changes to Add DnsZonePartner and Collation into Managed Instance #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c17486
rebasing
ziwa-msft Sep 12, 2018
6b1e4c3
Adding DnsZonePartner and Collation to Managed Instance
ziwa-msft Sep 12, 2018
d2e5203
Merge branch 'master' of https://github.com/ziwa-msft/azure-rest-api-…
ziwa-msft Sep 12, 2018
d06fc48
Regenerating Swagger based on latest REST API
ziwa-msft Sep 12, 2018
999c870
Adding Dns Zone to all examples
ziwa-msft Sep 13, 2018
746a9c6
Manually changing reference to types.json for SKU and ResourceIdentity
ziwa-msft Sep 13, 2018
c4ce7b1
Manually removing specific definations for SKU and ResourceIdentity
ziwa-msft Sep 13, 2018
9ed45e1
Adding DnsZone into FQDN for MI Examples
ziwa-msft Sep 13, 2018
4e408cf
Fix indentations and misspel
ziwa-msft Sep 18, 2018
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
17 changes: 11 additions & 6 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 @@ -15,13 +15,14 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.database.windows.net",
"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",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance"
}
}
},
Expand All @@ -41,10 +42,12 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.database.windows.net",
"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"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand All @@ -63,10 +66,12 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.database.windows.net",
"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"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand Down
12 changes: 8 additions & 4 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
Expand Up @@ -25,9 +25,11 @@
"capacity" : 1
},
"properties": {
"fullyQualifiedDomainName": "testinstance.database.windows.net",
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"state": "Ready"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand All @@ -43,9 +45,11 @@
"capacity" : 1
},
"properties": {
"fullyQualifiedDomainName": "testinstance.database.windows.net",
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"state": "Ready"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand Down
6 changes: 4 additions & 2 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 @@ -15,12 +15,14 @@
"family":"Gen4"
},
"properties" : {
"fullyQualifiedDomainName" : "testcl.database.windows.net",
"fullyQualifiedDomainName" : "testcl.1b4e2caff2530.database.windows.net",
"administratorLogin": "cloudSA",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"

},
"location" : "onebox",
Expand Down
12 changes: 8 additions & 4 deletions ...source-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testcl.database.windows.net",
"fullyQualifiedDomainName" : "testcl.1b4e2caff2530.database.windows.net",
"administratorLogin" : "cloudSA",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}, {
"location" : "onebox",
Expand All @@ -35,12 +37,14 @@
"capacity" : 22
},
"properties" : {
"fullyQualifiedDomainName" : "testcl2.database.windows.net",
"fullyQualifiedDomainName" : "testcl2.1b4e2caff2530.database.windows.net",
"administratorLogin" : "cloudSA",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
]
Expand Down
12 changes: 8 additions & 4 deletions ...Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
"family":"Gen5"
},
"properties" : {
"fullyQualifiedDomainName" : "testcl.database.windows.net",
"fullyQualifiedDomainName" : "testcl.1b4e2caff2530.database.windows.net",
"administratorLogin" : "cloudSA",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}, {
"location" : "onebox",
Expand All @@ -38,12 +40,14 @@
"family":"Gen4"
},
"properties" : {
"fullyQualifiedDomainName" : "testcl2.database.windows.net",
"fullyQualifiedDomainName" : "testcl2.1b4e2caff2530.database.windows.net",
"administratorLogin" : "cloudSA",
"state": "Ready",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "Full"
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
]
Expand Down
8 changes: 5 additions & 3 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceUpdateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.database.windows.net",
"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"
Expand All @@ -37,10 +37,12 @@
"capacity" : 1
},
"properties" : {
"fullyQualifiedDomainName" : "testinstance.database.windows.net",
"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"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceUpdateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
"capacity" : 1
},
"properties": {
"fullyQualifiedDomainName": "testinstance.database.windows.net",
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"state": "Ready"
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
}
}
},
Expand Down
Loading