Skip to content

Commit 554e797

Browse files
author
Jeffrey Robinson
authored
Merge pull request Azure#6 from viananth/AzureStack
Fix spec examples for AzureBridge
2 parents c5da5c2 + 6741896 commit 554e797

4 files changed

Lines changed: 66 additions & 73 deletions

File tree

‎specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/Product.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"get": {
6060
"x-ms-examples": {
6161
"Return product name.": {
62-
"$ref": "./examples/Product/List.json"
62+
"$ref": "./examples/Product/Get.json"
6363
}
6464
},
6565
"description": "Return product name.",

‎specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/Get.json‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,62 @@
22
"parameters": {
33
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
44
"location": "local",
5-
"api-version": "2015-06-01-preview",
65
"resourceGroup": "azurestack",
76
"activationName": "default",
8-
"productName": "Canonical.UbuntuServer1710-ARM.1.0.6"
7+
"productName": "Canonical.UbuntuServer1710-ARM.1.0.6",
8+
"api-version": "2015-06-01-preview"
99
},
1010
"responses": {
11-
"200": {
12-
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/resourceGroups/azurestack-activation/providers/Microsoft.AzureBridge.Admin/activations/default/products/Canonical.UbuntuServer1710-ARM.1.0.6",
13-
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
14-
"type": "Microsoft.AzureBridge.Admin/activations/products",
15-
"properties": {
16-
"displayName": "Ubuntu Server 17.10",
17-
"description": "Ubuntu Server 17.10 amd64 20180109 Public Azure, 20180109 Azure China, 20180109 Azure Germany. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 17.10 will be available until July 2018. Ubuntu Server is the perfect virtual machine (VM) platform for all workloads from web applications to NoSQL databases and Hadoop. For more information see <a href='http://partners.ubuntu.com/microsoft' target='_blank'>Ubuntu on Azure</a> and <a href='http://juju.ubuntu.com' target='_blank'>using Juju to deploy your workloads</a>.<p><h3 class='msportalfx-text-header'>Legal Terms</h3></p><p>By clicking the Create button, I acknowledge that I am getting this software from Canonical and that the <a href='http://www.ubuntu.com/project/about-ubuntu/licensing' target='_blank'>legal terms</a> of Canonical apply to it. Microsoft does not provide rights for third-party software. Also see the <a href='http://www.ubuntu.com/aboutus/privacypolicy' target='_blank'>privacy statement</a> from Canonical.</p>",
18-
"publisherDisplayName": "Canonical",
19-
"publisherIdentifier": "Canonical",
20-
"provisioningState": "Succeeded",
21-
"offer": "UbuntuServer",
22-
"offerVersion": "1.0.6",
23-
"sku": "17.10",
24-
"billingPartNumber": "",
25-
"galleryItemIdentity": "Canonical.UbuntuServer1710-ARM.1.0.6",
26-
"iconUris": {
27-
"large": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Large.png",
28-
"wide": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Wide.png",
29-
"medium": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Medium.png",
30-
"small": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Small.png"
31-
},
32-
"links": [
33-
{
34-
"displayName": "Linux VM Documentation",
35-
"uri": "https://docs.microsoft.com/azure/virtual-machines/linux/"
36-
},
37-
{
38-
"displayName": "Ubuntu Documentation",
39-
"uri": "https://help.ubuntu.com/17.10/index.html"
40-
},
41-
{
42-
"displayName": "FAQ",
43-
"uri": "https://help.ubuntu.com/community/ServerFaq"
44-
},
45-
{
46-
"displayName": "Pricing details",
47-
"uri": "http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#linux"
48-
}
49-
],
50-
"legalTerms": "http://www.ubuntu.com/project/about-ubuntu/licensing",
51-
"privacyPolicy": "http://www.ubuntu.com/aboutus/privacypolicy",
52-
"payloadLength": 32212288186,
53-
"productKind": "VirtualMachine",
54-
"productProperties": {
55-
"version": "17.10.201801090"
56-
}
11+
"200": {
12+
"body": {
13+
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/resourceGroups/azurestack-activation/providers/Microsoft.AzureBridge.Admin/activations/default/products/Canonical.UbuntuServer1710-ARM.1.0.6",
14+
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
15+
"type": "Microsoft.AzureBridge.Admin/activations/products",
16+
"properties": {
17+
"displayName": "Ubuntu Server 17.10",
18+
"description": "Ubuntu Server 17.10 amd64 20180109 Public Azure, 20180109 Azure China, 20180109 Azure Germany. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 17.10 will be available until July 2018. Ubuntu Server is the perfect virtual machine (VM) platform for all workloads from web applications to NoSQL databases and Hadoop. For more information see <a href='http://partners.ubuntu.com/microsoft' target='_blank'>Ubuntu on Azure</a> and <a href='http://juju.ubuntu.com' target='_blank'>using Juju to deploy your workloads</a>.<p><h3 class='msportalfx-text-header'>Legal Terms</h3></p><p>By clicking the Create button, I acknowledge that I am getting this software from Canonical and that the <a href='http://www.ubuntu.com/project/about-ubuntu/licensing' target='_blank'>legal terms</a> of Canonical apply to it. Microsoft does not provide rights for third-party software. Also see the <a href='http://www.ubuntu.com/aboutus/privacypolicy' target='_blank'>privacy statement</a> from Canonical.</p>",
19+
"publisherDisplayName": "Canonical",
20+
"publisherIdentifier": "Canonical",
21+
"provisioningState": "Succeeded",
22+
"offer": "UbuntuServer",
23+
"offerVersion": "1.0.6",
24+
"sku": "17.10",
25+
"billingPartNumber": "",
26+
"galleryItemIdentity": "Canonical.UbuntuServer1710-ARM.1.0.6",
27+
"iconUris": {
28+
"large": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Large.png",
29+
"wide": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Wide.png",
30+
"medium": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Medium.png",
31+
"small": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Small.png"
32+
},
33+
"links": [
34+
{
35+
"displayName": "Linux VM Documentation",
36+
"uri": "https://docs.microsoft.com/azure/virtual-machines/linux/"
37+
},
38+
{
39+
"displayName": "Ubuntu Documentation",
40+
"uri": "https://help.ubuntu.com/17.10/index.html"
41+
},
42+
{
43+
"displayName": "FAQ",
44+
"uri": "https://help.ubuntu.com/community/ServerFaq"
45+
},
46+
{
47+
"displayName": "Pricing details",
48+
"uri": "http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#linux"
49+
}
50+
],
51+
"legalTerms": "http://www.ubuntu.com/project/about-ubuntu/licensing",
52+
"privacyPolicy": "http://www.ubuntu.com/aboutus/privacypolicy",
53+
"payloadLength": 32212288186,
54+
"productKind": "VirtualMachine",
55+
"productProperties": {
56+
"version": "17.10.201801090"
57+
}
58+
}
5759
}
5860
},
59-
"404": {
60-
61-
}
61+
"404": {}
6262
}
6363
}

‎specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/List.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"offer": "",
2222
"offerVersion": "",
2323
"sku": "",
24-
"vmExtesnionType": "AcronisBackupLinux",
24+
"vmExtensionType": "AcronisBackupLinux",
2525
"galleryItemIdentity": "Acronis.acronis-backup-lin-arm.0.0.36",
2626
"iconUris": {
2727
"large": "https://azstmktprod001.azureedge.net/Acronis.acronis-backup-linux-arm/icons/Large.png",
@@ -47,7 +47,7 @@
4747
"offer": "",
4848
"offerVersion": "",
4949
"sku": "",
50-
"vmExtesnionType": "AcronisBackup",
50+
"vmExtensionType": "AcronisBackup",
5151
"galleryItemIdentity": "Acronis.acronis-backup-win-arm.0.0.36",
5252
"iconUris": {
5353
"large": "https://azstmktprod001.azureedge.net/Acronis.acronis-backup-win-arm/icons/Large.png",
@@ -250,7 +250,7 @@
250250
"offer": "",
251251
"offerVersion": "",
252252
"sku": "",
253-
"vmExtesnionType": "CustomScript",
253+
"vmExtensionType": "CustomScript",
254254
"galleryItemIdentity": "microsoft.custom-script-linux-arm.2.0.50",
255255
"iconUris": {
256256
"large": "https://azstmktprod001.azureedge.net/Microsoft.Azure.Extensions.CustomScript/icons/Large.png",
@@ -276,7 +276,7 @@
276276
"offer": "",
277277
"offerVersion": "",
278278
"sku": "",
279-
"vmExtesnionType": "CustomScriptExtension",
279+
"vmExtensionType": "CustomScriptExtension",
280280
"galleryItemIdentity": "Microsoft.CustomScriptExtension-arm.2.0.50",
281281
"iconUris": {
282282
"large": "https://azstmktprod001.azureedge.net/Microsoft.CustomScriptExtension-arm.2.0.50/icons/Large.png",
@@ -302,7 +302,7 @@
302302
"offer": "",
303303
"offerVersion": "",
304304
"sku": "",
305-
"vmExtesnionType": "DSC",
305+
"vmExtensionType": "DSC",
306306
"galleryItemIdentity": "Microsoft.DSC-arm.2.0.8",
307307
"iconUris": {
308308
"large": "https://azstmktprod001.azureedge.net/Microsoft.DSC-arm.2.0.8/icons/Large.png",
@@ -559,7 +559,7 @@
559559
"offer": "",
560560
"offerVersion": "",
561561
"sku": "",
562-
"vmExtesnionType": "VMAccessForLinux",
562+
"vmExtensionType": "VMAccessForLinux",
563563
"galleryItemIdentity": "Microsoft.VMAccessForLinux.1.4.7",
564564
"iconUris": {
565565
"large": "https://azstmktprod001.azureedge.net/Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1/icons/Large.png",
@@ -610,7 +610,7 @@
610610
"offer": "",
611611
"offerVersion": "",
612612
"sku": "",
613-
"vmExtesnionType": "SqlIaaSAgent",
613+
"vmExtensionType": "SqlIaaSAgent",
614614
"galleryItemIdentity": "Microsoft.SqlIaaSExtension.1.2.24",
615615
"iconUris": {
616616
"large": "https://azstmktprod001.azureedge.net/Microsoft.SQLIaaSExtension.1.2.24/icons/Large.png",
@@ -4493,7 +4493,7 @@
44934493
"offer": "",
44944494
"offerVersion": "",
44954495
"sku": "",
4496-
"vmExtesnionType": "IaaSAntimalware",
4496+
"vmExtensionType": "IaaSAntimalware",
44974497
"galleryItemIdentity": "microsoft.antimalware-windows-arm.1.0.0",
44984498
"iconUris": {
44994499
"large": "https://azstmktprod001.azureedge.net/microsoft.antimalware-windows-arm.1.0.0/icons/Large.png",
@@ -4519,7 +4519,7 @@
45194519
"offer": "",
45204520
"offerVersion": "",
45214521
"sku": "",
4522-
"vmExtesnionType": "CustomScriptForLinux",
4522+
"vmExtensionType": "CustomScriptForLinux",
45234523
"galleryItemIdentity": "microsoft.custom-script-linux-arm.2.0.50",
45244524
"iconUris": {
45254525
"large": "https://azstmktprod001.azureedge.net/microsoft.custom-script-linux-arm.2.0.50/icons/Large.png",
@@ -4545,7 +4545,7 @@
45454545
"offer": "",
45464546
"offerVersion": "",
45474547
"sku": "",
4548-
"vmExtesnionType": "DockerExtension",
4548+
"vmExtensionType": "DockerExtension",
45494549
"galleryItemIdentity": "microsoft.docker-arm.1.1.0",
45504550
"iconUris": {
45514551
"large": "https://azstmktprod001.azureedge.net/microsoft.docker-arm.1.1.0/icons/Large.png",

‎specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/download.json‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,10 @@
99
},
1010
"responses": {
1111
"202": {
12-
"body": {
13-
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/providers/Microsoft.AzureBridge.Admin/locations/local/operationResults/052b0e07-2f5d-47e9-a273-9ad311736c6b",
14-
"name": "052b0e07-2f5d-47e9-a273-9ad311736c6b",
15-
"status": "Succeeded",
16-
"startTime": "0001-01-01T08:00:00Z",
17-
"endTime": "0001-01-01T08:00:00Z",
18-
"percentComplete": 0.0,
19-
"properties": {
20-
"productDisplayName": "Ubuntu Server 17.10"
21-
}
22-
}
12+
13+
},
14+
"404": {
15+
2316
}
2417
}
2518
}

0 commit comments

Comments
 (0)
⚡