Skip to content

Commit

Permalink
Fixing Swagger KPIs and RP request response payloads (Azure#12391)
Browse files Browse the repository at this point in the history
* Swagger changes

* Updates

* Feedback

* Fixed validation errors

* Fixes

* Refactoring + fixes

* Make acls and luns optional for TargetPortalGroupUpdate

* Fixes

* Fixed cred scan

* Prettier check

* Model + linter validation

* Fixes'

* Prettier fix

* updates

* preview changeds

* Contract updates

* Addressing feedback

* Fixes

* FMting

* fixing model validation errors

Co-authored-by: Harshitha Akkaraju <hakkaraj@microsoft.com>
  • Loading branch information
harshitha-akkaraju and Harshitha Akkaraju committed Jan 31, 2021
1 parent 138759b commit c7358a0
Show file tree
Hide file tree
Showing 9 changed files with 707 additions and 211 deletions.
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
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
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
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
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
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
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"
}
}
}
}
}
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

0 comments on commit c7358a0

Please sign in to comment.