Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pathuang-sia committed Oct 3, 2022
1 parent 9deca35 commit 3d4b0bc
Show file tree
Hide file tree
Showing 34 changed files with 6,108 additions and 3 deletions.
7 changes: 7 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ Fulltext
fullyqualified
functionappsettings
galician
galleryimage
galleryimages
Garda
Gbps
Expand Down Expand Up @@ -915,6 +916,7 @@ hana
hanaonazure
Hani
Hant
harddisk
Hardenings
hbase
hbasephoenix
Expand Down Expand Up @@ -1248,7 +1250,12 @@ Maputnik
mariadb
Marketo
marketplaceagreementsapi
<<<<<<< HEAD
marketplacecatalog
=======
marketplacegalleryimage
marketplacegalleryimages
>>>>>>> 858f624c15... [Microsoft.AzureStackHCI] 2021-09-01-preview update (#7147)
marketplaceordering
maxclients
maxcoordinates
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"galleryimagesName": "test-gallery-image",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/galleryimages/test-gallery-image",
"name": "test-gallery-image",
"type": "Microsoft.AzureStackHCI/galleryimages",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"provisioningState": "Accepted",
"containerName": "Default_Container",
"osType": "Windows",
"cloudInitDataSource": "NoCloud",
"hyperVGeneration": "V1",
"identifier": {
"publisher": "myPublisherName",
"offer": "myOfferName",
"sku": "mySkuName"
},
"version": {
"name": "1.0.0",
"properties": {
"storageProfile": {
"osDiskImage": {
"sizeInMB": 30270
}
}
}
},
"status": {
"provisioningStatus": {
"operationId": "79cfc696-44f5-4a68-a620-21850f7e9fb0",
"status": "Succeeded"
},
"progressPercentage": 100,
"downloadStatus": {
"downloadSizeInMB": 9383
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"virtualharddisksName": "test-vhd",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/virtualharddisks/test-vhd",
"name": "test-vhd",
"type": "Microsoft.AzureStackHCI/virtualharddisks",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"diskSizeBytes": 32,
"blockSizeBytes": 0,
"logicalSectorBytes": 512,
"physicalSectorBytes": 512,
"provisioningState": "Accepted",
"diskFileFormat": "vhdx",
"hyperVGeneration": "V2",
"dynamic": true
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"virtualmachinesName": "test-vm",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/virtualmachines/test-vm",
"name": "test-vm",
"type": "Microsoft.AzureStackHCI/virtualmachines",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"provisioningState": "Accepted",
"storageProfile": {
"imageReference": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/galleryimages/test-gallery-image"
},
"vmConfigContainerName": "Default_Container"
},
"hardwareProfile": {
"vmSize": "Default"
},
"osProfile": {
"computerName": "luamaster",
"adminUsername": "localadmin"
},
"networkProfile": {
"networkInterfaces": [
{
"id": "test-nic"
}
]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/galleryimages/test-gallery-image",
"name": "test-gallery-image",
"type": "Microsoft.AzureStackHCI/galleryimages",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"provisioningState": "Accepted",
"containerName": "Default_Container",
"osType": "Linux",
"cloudInitDataSource": "NoCloud",
"hyperVGeneration": "V2",
"version": {
"properties": {
"storageProfile": {
"osDiskImage": {
"sizeInMB": 30270
}
}
}
},
"status": {
"provisioningStatus": {
"operationId": "79cfc696-44f5-4a68-a620-21850f7e9fb0",
"status": "Succeeded"
},
"progressPercentage": 100,
"downloadStatus": {
"downloadSizeInMB": 9383
}
}
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/galleryimages/test-gallery-image",
"name": "test-gallery-image",
"type": "Microsoft.AzureStackHCI/galleryimages",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"provisioningState": "Accepted",
"containerName": "Default_Container",
"osType": "Linux",
"cloudInitDataSource": "NoCloud",
"hyperVGeneration": "V2",
"version": {
"properties": {
"storageProfile": {
"osDiskImage": {
"sizeInMB": 30270
}
}
}
},
"status": {
"provisioningStatus": {
"operationId": "79cfc696-44f5-4a68-a620-21850f7e9fb0",
"status": "Succeeded"
},
"progressPercentage": 100,
"downloadStatus": {
"downloadSizeInMB": 9383
}
}
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/virtualharddisks/test-vhd",
"name": "test-vhd",
"type": "Microsoft.AzureStackHCI/virtualharddisks",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"diskSizeBytes": 32,
"blockSizeBytes": 0,
"logicalSectorBytes": 512,
"physicalSectorBytes": 512,
"provisioningState": "Accepted",
"diskFileFormat": "vhdx",
"hyperVGeneration": "V2",
"dynamic": true
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/virtualharddisks/test-vhd",
"name": "test-vhd",
"type": "Microsoft.AzureStackHCI/virtualharddisks",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"diskSizeBytes": 32,
"blockSizeBytes": 0,
"logicalSectorBytes": 512,
"physicalSectorBytes": 512,
"provisioningState": "Accepted",
"diskFileFormat": "vhdx",
"hyperVGeneration": "V2",
"dynamic": true
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parameters": {
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
"resourceGroupName": "test-rg",
"api-version": "2021-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/virtualmachines/test-vm",
"name": "test-vm",
"type": "Microsoft.AzureStackHCI/virtualmachines",
"location": "West US2",
"extendedLocation": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.ExtendedLocation/customLocations/dogfood-location",
"type": "CustomLocation"
},
"properties": {
"provisioningState": "Accepted",
"storageProfile": {
"imageReference": {
"name": "/subscriptions/a95612cb-f1fa-4daa-a4fd-272844fa512c/resourceGroups/dogfoodarc/providers/Microsoft.AzureStackHCI/galleryimages/test-gallery-image"
},
"vmConfigContainerName": "Default_Container"
},
"hardwareProfile": {
"vmSize": "Default"
},
"osProfile": {
"computerName": "luamaster",
"adminUsername": "localadmin"
},
"networkProfile": {
"networkInterfaces": [
{
"id": "test-nic"
}
]
}
}
}
]
}
}
}
}
Loading

0 comments on commit 3d4b0bc

Please sign in to comment.