Skip to content

Commit

Permalink
Merge pull request Azure#6 from viananth/AzureStack
Browse files Browse the repository at this point in the history 
Fix spec examples for AzureBridge
  • Loading branch information
@deathly809
deathly809 authored Mar 15, 2018
2 parents c5da5c2 + 6741896 commit 554e797
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 73 deletions.
2 changes: 1 addition & 1 deletion ...azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/Product.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"get": {
"x-ms-examples": {
"Return product name.": {
"$ref": "./examples/Product/List.json"
"$ref": "./examples/Product/Get.json"
}
},
"description": "Return product name.",
Expand Down
102 changes: 51 additions & 51 deletions ...urce-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/Get.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,62 @@
"parameters": {
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
"location": "local",
"api-version": "2015-06-01-preview",
"resourceGroup": "azurestack",
"activationName": "default",
"productName": "Canonical.UbuntuServer1710-ARM.1.0.6"
"productName": "Canonical.UbuntuServer1710-ARM.1.0.6",
"api-version": "2015-06-01-preview"
},
"responses": {
"200": {
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/resourceGroups/azurestack-activation/providers/Microsoft.AzureBridge.Admin/activations/default/products/Canonical.UbuntuServer1710-ARM.1.0.6",
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
"type": "Microsoft.AzureBridge.Admin/activations/products",
"properties": {
"displayName": "Ubuntu Server 17.10",
"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>",
"publisherDisplayName": "Canonical",
"publisherIdentifier": "Canonical",
"provisioningState": "Succeeded",
"offer": "UbuntuServer",
"offerVersion": "1.0.6",
"sku": "17.10",
"billingPartNumber": "",
"galleryItemIdentity": "Canonical.UbuntuServer1710-ARM.1.0.6",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Large.png",
"wide": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Wide.png",
"medium": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Medium.png",
"small": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Small.png"
},
"links": [
{
"displayName": "Linux VM Documentation",
"uri": "https://docs.microsoft.com/azure/virtual-machines/linux/"
},
{
"displayName": "Ubuntu Documentation",
"uri": "https://help.ubuntu.com/17.10/index.html"
},
{
"displayName": "FAQ",
"uri": "https://help.ubuntu.com/community/ServerFaq"
},
{
"displayName": "Pricing details",
"uri": "http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#linux"
}
],
"legalTerms": "http://www.ubuntu.com/project/about-ubuntu/licensing",
"privacyPolicy": "http://www.ubuntu.com/aboutus/privacypolicy",
"payloadLength": 32212288186,
"productKind": "VirtualMachine",
"productProperties": {
"version": "17.10.201801090"
}
"200": {
"body": {
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/resourceGroups/azurestack-activation/providers/Microsoft.AzureBridge.Admin/activations/default/products/Canonical.UbuntuServer1710-ARM.1.0.6",
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
"type": "Microsoft.AzureBridge.Admin/activations/products",
"properties": {
"displayName": "Ubuntu Server 17.10",
"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>",
"publisherDisplayName": "Canonical",
"publisherIdentifier": "Canonical",
"provisioningState": "Succeeded",
"offer": "UbuntuServer",
"offerVersion": "1.0.6",
"sku": "17.10",
"billingPartNumber": "",
"galleryItemIdentity": "Canonical.UbuntuServer1710-ARM.1.0.6",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Large.png",
"wide": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Wide.png",
"medium": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Medium.png",
"small": "https://azstmktprod001.azureedge.net/Canonical.UbuntuServer1710-ARM.1.0.6/icons/Small.png"
},
"links": [
{
"displayName": "Linux VM Documentation",
"uri": "https://docs.microsoft.com/azure/virtual-machines/linux/"
},
{
"displayName": "Ubuntu Documentation",
"uri": "https://help.ubuntu.com/17.10/index.html"
},
{
"displayName": "FAQ",
"uri": "https://help.ubuntu.com/community/ServerFaq"
},
{
"displayName": "Pricing details",
"uri": "http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#linux"
}
],
"legalTerms": "http://www.ubuntu.com/project/about-ubuntu/licensing",
"privacyPolicy": "http://www.ubuntu.com/aboutus/privacypolicy",
"payloadLength": 32212288186,
"productKind": "VirtualMachine",
"productProperties": {
"version": "17.10.201801090"
}
}
}
},
"404": {

}
"404": {}
}
}
20 changes: 10 additions & 10 deletions ...rce-manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/List.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "AcronisBackupLinux",
"vmExtensionType": "AcronisBackupLinux",
"galleryItemIdentity": "Acronis.acronis-backup-lin-arm.0.0.36",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Acronis.acronis-backup-linux-arm/icons/Large.png",
Expand All @@ -47,7 +47,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "AcronisBackup",
"vmExtensionType": "AcronisBackup",
"galleryItemIdentity": "Acronis.acronis-backup-win-arm.0.0.36",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Acronis.acronis-backup-win-arm/icons/Large.png",
Expand Down Expand Up @@ -250,7 +250,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "CustomScript",
"vmExtensionType": "CustomScript",
"galleryItemIdentity": "microsoft.custom-script-linux-arm.2.0.50",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Microsoft.Azure.Extensions.CustomScript/icons/Large.png",
Expand All @@ -276,7 +276,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "CustomScriptExtension",
"vmExtensionType": "CustomScriptExtension",
"galleryItemIdentity": "Microsoft.CustomScriptExtension-arm.2.0.50",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Microsoft.CustomScriptExtension-arm.2.0.50/icons/Large.png",
Expand All @@ -302,7 +302,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "DSC",
"vmExtensionType": "DSC",
"galleryItemIdentity": "Microsoft.DSC-arm.2.0.8",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Microsoft.DSC-arm.2.0.8/icons/Large.png",
Expand Down Expand Up @@ -559,7 +559,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "VMAccessForLinux",
"vmExtensionType": "VMAccessForLinux",
"galleryItemIdentity": "Microsoft.VMAccessForLinux.1.4.7",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1/icons/Large.png",
Expand Down Expand Up @@ -610,7 +610,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "SqlIaaSAgent",
"vmExtensionType": "SqlIaaSAgent",
"galleryItemIdentity": "Microsoft.SqlIaaSExtension.1.2.24",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/Microsoft.SQLIaaSExtension.1.2.24/icons/Large.png",
Expand Down Expand Up @@ -4493,7 +4493,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "IaaSAntimalware",
"vmExtensionType": "IaaSAntimalware",
"galleryItemIdentity": "microsoft.antimalware-windows-arm.1.0.0",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/microsoft.antimalware-windows-arm.1.0.0/icons/Large.png",
Expand All @@ -4519,7 +4519,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "CustomScriptForLinux",
"vmExtensionType": "CustomScriptForLinux",
"galleryItemIdentity": "microsoft.custom-script-linux-arm.2.0.50",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/microsoft.custom-script-linux-arm.2.0.50/icons/Large.png",
Expand All @@ -4545,7 +4545,7 @@
"offer": "",
"offerVersion": "",
"sku": "",
"vmExtesnionType": "DockerExtension",
"vmExtensionType": "DockerExtension",
"galleryItemIdentity": "microsoft.docker-arm.1.1.0",
"iconUris": {
"large": "https://azstmktprod001.azureedge.net/microsoft.docker-arm.1.1.0/icons/Large.png",
Expand Down
15 changes: 4 additions & 11 deletions ...manager/azurebridge/Microsoft.AzureBridge.Admin/2016-01-01/examples/Product/download.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,10 @@
},
"responses": {
"202": {
"body": {
"id": "/subscriptions/b6a34e73-810f-4564-881a-8434c6c2e5c8/providers/Microsoft.AzureBridge.Admin/locations/local/operationResults/052b0e07-2f5d-47e9-a273-9ad311736c6b",
"name": "052b0e07-2f5d-47e9-a273-9ad311736c6b",
"status": "Succeeded",
"startTime": "0001-01-01T08:00:00Z",
"endTime": "0001-01-01T08:00:00Z",
"percentComplete": 0.0,
"properties": {
"productDisplayName": "Ubuntu Server 17.10"
}
}

},
"404": {

}
}
}

0 comments on commit 554e797

Please sign in to comment.