Fixing Swagger KPIs and RP request response payloads (#12391)

harshitha-akkaraju · Harshitha Akkaraju · web-flow · commit c7358a077a37 · 2021-01-31T12:26:47.000+08:00
* 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 &lt;hakkaraj@microsoft.com&gt;
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Get.json
@@ -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",
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListByResourceGroup.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListByResourceGroup.json
@@ -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",
@@ -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",
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListBySubscription.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_ListBySubscription.json
@@ -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",
@@ -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",
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Patch.json
@@ -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"
@@ -26,7 +21,7 @@
     }
   },
   "responses": {
-    "200": {
+    "202": {
       "body": {
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool",
         "name": "myDiskPool",
@@ -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"
         }
       }
     }
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/DiskPools_Put.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "diskPoolName": "myDiskPool",
-    "diskPoolPayload": {
+    "diskPoolCreatePayload": {
       "location": "westus",
       "tags": {
         "key": "value"
@@ -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"
       }
     }
   },
@@ -60,7 +58,8 @@
           ],
           "availabilityZones": [
             "1"
-          ]
+          ],
+          "tier": "Basic"
         }
       }
     },
@@ -95,7 +94,8 @@
           ],
           "availabilityZones": [
             "1"
-          ]
+          ],
+          "tier": "Basic"
         }
       }
     }
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Get.json
@@ -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",
@@ -38,7 +36,9 @@
               },
               "endpoints": [
                 "10.0.0.1:3260"
-              ]
+              ],
+              "tag": 1,
+              "port": 3260
             }
           ],
           "provisioningState": "Succeeded",
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Patch.json
@@ -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"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/examples/IscsiTargets_Put.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "diskPoolName": "myDiskPool",
     "iscsiTargetName": "myIscsiTarget",
-    "iscsiTargetPayload": {
+    "iscsiTargetCreatePayload": {
       "properties": {
         "targetIqn": "iqn.2005-03.org.iscsi:server1",
         "tpgs": [
@@ -24,7 +24,7 @@
                 ],
                 "credentials": {
                   "username": "some_username",
-                  "password": "<password>"
+                  "password": "some_password"
                 }
               }
             ],
@@ -64,7 +64,12 @@
               "attributes": {
                 "authentication": true,
                 "prodModeWriteProtect": false
-              }
+              },
+              "endpoints": [
+                "10.0.0.1:3260"
+              ],
+              "tag": 1,
+              "port": 3260
             }
           ],
           "provisioningState": "Pending",
@@ -98,7 +103,12 @@
               "attributes": {
                 "authentication": true,
                 "prodModeWriteProtect": false
-              }
+              },
+              "endpoints": [
+                "10.0.0.1:3260"
+              ],
+              "tag": 1,
+              "port": 3260
             }
           ],
           "provisioningState": "Pending",
diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2020-03-15-preview/storagepool.json

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`{`
`24`	`24`	`"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"`
`25`	`25`	`}`
`26`		`- ]`
	`26`	`+ ],`
	`27`	`+ "tier": "Basic"`
`27`	`28`	`},`
`28`	`29`	`"systemData": {`
`29`	`30`	`"createdAt": "2020-06-24T06:53:57+00:00",`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	`{`
`23`	`23`	`"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"`
`24`	`24`	`}`
`25`		`- ]`
	`25`	`+ ],`
	`26`	`+ "tier": "Basic"`
`26`	`27`	`},`
`27`	`28`	`"systemData": {`
`28`	`29`	`"createdAt": "2020-06-24T06:53:57+00:00",`
`@@ -52,7 +53,8 @@`
`52`	`53`	`{`
`53`	`54`	`"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0"`
`54`	`55`	`}`
`55`		`- ]`
	`56`	`+ ],`
	`57`	`+ "tier": "Basic"`
`56`	`58`	`},`
`57`	`59`	`"systemData": {`
`58`	`60`	`"createdAt": "2020-06-24T06:53:57+00:00",`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"subscriptionId": "00000000-0000-0000-0000-000000000000",`
`5`	`5`	`"resourceGroupName": "myResourceGroup",`
`6`	`6`	`"diskPoolName": "myDiskPool",`
`7`		`- "diskPoolPayload": {`
	`7`	`+ "diskPoolCreatePayload": {`
`8`	`8`	`"location": "westus",`
`9`	`9`	`"tags": {`
`10`	`10`	`"key": "value"`
`@@ -21,10 +21,8 @@`
`21`	`21`	`{`
`22`	`22`	`"id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"`
`23`	`23`	`}`
`24`		`- ]`
`25`		`- },`
`26`		`- "sku": {`
`27`		`- "name": "Standard_ABC"`
	`24`	`+ ],`
	`25`	`+ "tier": "Basic"`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`	`},`
`@@ -60,7 +58,8 @@`
`60`	`58`	`],`
`61`	`59`	`"availabilityZones": [`
`62`	`60`	`"1"`
`63`		`- ]`
	`61`	`+ ],`
	`62`	`+ "tier": "Basic"`
`64`	`63`	`}`
`65`	`64`	`}`
`66`	`65`	`},`
`@@ -95,7 +94,8 @@`
`95`	`94`	`],`
`96`	`95`	`"availabilityZones": [`
`97`	`96`	`"1"`
`98`		`- ]`
	`97`	`+ ],`
	`98`	`+ "tier": "Basic"`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`"targetIqn": "iqn.2005-03.org.iscsi:server1",`
`17`	`17`	`"tpgs": [`
`18`	`18`	`{`
`19`		`- "tag": 1,`
`20`		`- "port": 3260,`
`21`	`19`	`"luns": [`
`22`	`20`	`{`
`23`	`21`	`"managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1",`
`@@ -38,7 +36,9 @@`
`38`	`36`	`},`
`39`	`37`	`"endpoints": [`
`40`	`38`	`"10.0.0.1:3260"`
`41`		`- ]`
	`39`	`+ ],`
	`40`	`+ "tag": 1,`
	`41`	`+ "port": 3260`
`42`	`42`	`}`
`43`	`43`	`],`
`44`	`44`	`"provisioningState": "Succeeded",`