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

Fixing Swagger KPIs and RP request response payloads #12391

Merged
merged 20 commits into from
Jan 31, 2021
Merged

Fixing Swagger KPIs and RP request response payloads #12391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
74619f2
Swagger changes
Dec 3, 2020
f87cf7c
Updates
Dec 15, 2020
2f7786b
Feedback
Dec 15, 2020
625c72f
Fixed validation errors
Dec 16, 2020
6ab37c1
Fixes
Dec 18, 2020
a5d612d
Refactoring + fixes
Dec 22, 2020
45b2a35
Make acls and luns optional for TargetPortalGroupUpdate
Dec 22, 2020
760af10
Fixes
Dec 30, 2020
6babfe3
Fixed cred scan
Jan 12, 2021
b678bb0
Prettier check
Jan 12, 2021
12b60f6
Model + linter validation
Jan 12, 2021
51ae093
Fixes'
Jan 12, 2021
36d34e0
Prettier fix
Jan 12, 2021
efdc449
updates
Jan 12, 2021
95c950a
preview changeds
Jan 25, 2021
c47290e
Contract updates
Jan 25, 2021
f95d8bd
Addressing feedback
Jan 26, 2021
5ae5f4f
Fixes
Jan 26, 2021
9b22ac5
FMting
Jan 26, 2021
48e87c9
fixing model validation errors
Jan 28, 2021
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
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"
}
]
],
"tier": "Basic"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
Expand Down
6 changes: 4 additions & 2 deletions ...rosoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"
}
]
],
"tier": "Basic"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
Expand Down Expand Up @@ -53,7 +54,8 @@
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"
}
]
],
"tier": "Basic"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
Expand Down
6 changes: 4 additions & 2 deletions ...crosoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"
}
]
],
"tier": "Basic"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
Expand Down Expand Up @@ -52,7 +53,8 @@
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"
}
]
],
"tier": "Basic"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
Expand Down
52 changes: 42 additions & 10 deletions ...ce-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"diskPoolName": "myDiskPool",
"diskPoolPayload": {
"location": "westus",
"diskPoolUpdatePayload": {
"tags": {
"key": "value"
},
"properties": {
"availabilityZones": [
"1"
],
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet",
"disks": [
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0"
Expand All @@ -26,7 +21,7 @@
}
},
"responses": {
"200": {
"202": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool",
"name": "myDiskPool",
Expand All @@ -44,20 +39,57 @@
"lastModifiedByType": "User"
},
"properties": {
"provisioningState": "Pending",
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet",
"status": "Unknown",
"disks": [
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0"
},
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
}
],
"availabilityZones": [
"1"
],
"tier": "Basic"
}
}
},
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool",
"name": "myDiskPool",
"type": "Microsoft.StoragePool/diskPools",
"location": "westus2",
"tags": {
"env": "int"
},
"systemData": {
"createdAt": "2020-06-24T06:53:57+00:00",
"createdBy": "alias",
"createdByType": "User",
"lastModifiedAt": "2020-06-24T06:53:57+00:00",
"lastModifiedBy": "alias",
"lastModifiedByType": "User"
},
"properties": {
"provisioningState": "Pending",
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet",
"provisioningState": "Succeeded",
"status": "Healthy",
"status": "Unknown",
"disks": [
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0"
},
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
}
]
],
"availabilityZones": [
"1"
],
"tier": "Basic"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions ...urce-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Put.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"diskPoolName": "myDiskPool",
"diskPoolPayload": {
"diskPoolCreatePayload": {
"location": "westus",
"tags": {
"key": "value"
Expand All @@ -21,10 +21,8 @@
{
"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
}
]
},
"sku": {
"name": "Standard_ABC"
],
"tier": "Basic"
}
}
},
Expand Down Expand Up @@ -60,7 +58,8 @@
],
"availabilityZones": [
"1"
]
],
"tier": "Basic"
}
}
},
Expand Down Expand Up @@ -95,7 +94,8 @@
],
"availabilityZones": [
"1"
]
],
"tier": "Basic"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...e-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"targetIqn": "iqn.2005-03.org.iscsi:server1",
"tpgs": [
{
"tag": 1,
"port": 3260,
"luns": [
{
"managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1",
Expand All @@ -38,7 +36,9 @@
},
"endpoints": [
"10.0.0.1:3260"
]
],
"tag": 1,
"port": 3260
}
],
"provisioningState": "Succeeded",
Expand Down
115 changes: 115 additions & 0 deletions ...manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"parameters": {
"api-version": "2020-03-15-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"diskPoolName": "myDiskPool",
"iscsiTargetName": "myIscsiTarget",
"iscsiTargetUpdatePayload": {
"properties": {
"tpgs": [
{
"luns": [
{
"managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1",
"name": "lun0"
}
],
"acls": [
{
"initiatorIqn": "iqn.2005-03.org.iscsi:client",
"mappedLuns": [
"lun0"
],
"credentials": {
"username": "some_username",
"password": "some_password"
}
}
]
}
]
}
}
},
"responses": {
"202": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget",
"name": "myIscsiTarget",
"type": "Microsoft.StoragePool/diskPools/iscsiTargets",
"properties": {
"targetIqn": "iqn.2005-03.org.iscsi:server1",
"tpgs": [
{
"luns": [
{
"managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1",
"name": "lun0"
}
],
"acls": [
{
"initiatorIqn": "iqn.2005-03.org.iscsi:client",
"mappedLuns": [
"lun0"
]
}
],
"attributes": {
"authentication": true,
"prodModeWriteProtect": false
},
"endpoints": [
"10.0.0.1:3260"
],
"tag": 1,
"port": 3260
}
],
"provisioningState": "Pending",
"status": "Unknown"
}
}
},
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget",
"name": "myIscsiTarget",
"type": "Microsoft.StoragePool/diskPools/iscsiTargets",
"properties": {
"targetIqn": "iqn.2005-03.org.iscsi:server1",
"tpgs": [
{
"luns": [
{
"managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1",
"name": "lun0"
}
],
"acls": [
{
"initiatorIqn": "iqn.2005-03.org.iscsi:client",
"mappedLuns": [
"lun0"
]
}
],
"attributes": {
"authentication": true,
"prodModeWriteProtect": false
},
"endpoints": [
"10.0.0.1:3260"
],
"tag": 1,
"port": 3260
}
],
"provisioningState": "Pending",
"status": "Unknown"
}
}
}
}
}
18 changes: 14 additions & 4 deletions ...e-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Put.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"resourceGroupName": "myResourceGroup",
"diskPoolName": "myDiskPool",
"iscsiTargetName": "myIscsiTarget",
"iscsiTargetPayload": {
"iscsiTargetCreatePayload": {
"properties": {
"targetIqn": "iqn.2005-03.org.iscsi:server1",
"tpgs": [
Expand All @@ -24,7 +24,7 @@
],
"credentials": {
"username": "some_username",
"password": "<password>"
"password": "some_password"
}
}
],
Expand Down Expand Up @@ -64,7 +64,12 @@
"attributes": {
"authentication": true,
"prodModeWriteProtect": false
}
},
"endpoints": [
"10.0.0.1:3260"
],
"tag": 1,
"port": 3260
}
],
"provisioningState": "Pending",
Expand Down Expand Up @@ -98,7 +103,12 @@
"attributes": {
"authentication": true,
"prodModeWriteProtect": false
}
},
"endpoints": [
"10.0.0.1:3260"
],
"tag": 1,
"port": 3260
}
],
"provisioningState": "Pending",
Expand Down
Loading