Updated resource properties in hpcworkbench resource provider (#5174)

* Updated properties in hpcworkbench resource provider * Fixing spellcheck error * Updated consortium properties * Resolved comments * Resolved validation errors * Removed sku from hpcworkbench * fixed prettier * Fixed validation errors and created a sku object * Removed FileUploadParameter from chamber * Added file upload parameters definition * Updated examples * Added sku in instance properties
Azure · Nov 3, 2021 · cc722e2 · cc722e2
1 parent 0b90d38
commit cc722e2
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 124 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1664,6 +1664,9 @@ sesparse
 cadl
 graphservice
 lmhostid
+OTDS
+Otds
+Oidc
 Burstable
 phpworkloads
 collectiondetails
diff --git a/...ch/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/accessprofiles.json b/...ch/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/accessprofiles.json
@@ -502,12 +502,8 @@
     "AccessProfilePropertiesFormat": {
       "type": "object",
       "properties": {
-        "sku": {
-          "$ref": "./hpcworkbench.json#/definitions/Sku",
-          "description": "Gets or sets the SKU."
-        },
-        "consortiumName": {
-          "description": "Gets or sets the consortium name.",
+        "consortiumId": {
+          "description": "Gets or sets the consortiumId.",
           "type": "string"
         },
         "provisioningState": {

diff --git a/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/chambers.json b/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/chambers.json
@@ -647,18 +647,6 @@
     }
   },
   "definitions": {
-    "FileUploadParameters": {
-      "description": "File Upload Parameters DTO.",
-      "type": "object",
-      "properties": {
-        "fileSize": {
-          "format": "int64",
-          "description": "Gets or sets the size of the file being uploaded.",
-          "type": "integer",
-          "example": 1073741824
-        }
-      }
-    },
     "ChamberPageableList": {
       "description": "Microsoft.Sdw.Core.ResourceMetadata.PageableList implementation specific to pageable lists of Microsoft.Sdw.Core.ResourceMetadata.AzureResource`1.",
       "type": "object",
@@ -676,6 +664,18 @@
         }
       }
     },
+    "FileUploadParameters": {
+      "description": "File Upload Parameters DTO.",
+      "type": "object",
+      "properties": {
+        "fileSize": {
+          "format": "int64",
+          "description": "Gets or sets the size of the file being uploaded.",
+          "type": "integer",
+          "example": 1073741824
+        }
+      }
+    },
     "Ansys": {
       "type": "object",
       "description": "Ansys Common Licensing.",
@@ -685,13 +685,10 @@
           "description": "Switch to show if License Service is activated."
         },
         "server": {
-          "type": "array",
-          "description": "License Service server.",
-          "items": {
-            "type": "string"
-          }
+          "type": "string",
+          "description": "License Service server."
         },
-        "lmhostid": {
+        "lmhostId": {
           "type": "array",
           "description": "Unique identifier of HPC Workbench chamber license servers used by FlexNet Licensing Service.",
           "items": {
@@ -709,13 +706,10 @@
           "description": "Switch to show if License Service is activated."
         },
         "server": {
-          "type": "array",
-          "description": "License Service server.",
-          "items": {
-            "type": "string"
-          }
+          "type": "string",
+          "description": "License Service server."
         },
-        "lmhostid": {
+        "lmhostId": {
           "type": "array",
           "description": "Unique identifier of HPC Workbench chamber license servers used by FlexNet Licensing Service.",
           "items": {
@@ -740,13 +734,10 @@
           "description": "Switch to show if License Service is activated"
         },
         "server": {
-          "type": "array",
-          "description": "License Service server.",
-          "items": {
-            "type": "string"
-          }
+          "type": "string",
+          "description": "License Service server."
         },
-        "lmhostid": {
+        "lmhostId": {
           "type": "array",
           "description": "Unique identifier of HPC Workbench chamber license servers used by FlexNet Licensing Service.",
           "items": {
@@ -764,11 +755,8 @@
           "description": "Switch to show if License Service is activated."
         },
         "server": {
-          "type": "array",
-          "description": "License Service server.",
-          "items": {
-            "type": "string"
-          }
+          "type": "string",
+          "description": "License Service server."
         },
         "vmUuid": {
           "type": "array",
@@ -782,17 +770,6 @@
     "ChamberPropertiesFormat": {
       "type": "object",
       "properties": {
-        "sku": {
-          "$ref": "./hpcworkbench.json#/definitions/Sku",
-          "description": "Gets or sets the SKU."
-        },
-        "zones": {
-          "description": "Gets or sets the Zones.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
         "licenseServices": {
           "description": "Gets or sets the license services for each EDA vendor.",
           "type": "object",

diff --git a/...kbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/consortium.json b/...kbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/consortium.json
@@ -614,6 +614,14 @@
         "licenseActivated": {
           "description": "The license activated.",
           "type": "boolean"
+        },
+        "replyUrlEtx": {
+          "description": "The reply URL of ETX Server for Azure AD app.",
+          "type": "string"
+        },
+        "replyUrlOtds": {
+          "description": "The reply URL of OTDS for Azure AD app.",
+          "type": "string"
         }
       },
       "description": "Etx properties."
@@ -662,6 +670,19 @@
         }
       }
     },
+    "NetworkAcls": {
+      "type": "object",
+      "description": "Access configuration properties.",
+      "properties": {
+        "allowedAddressSpaces": {
+          "type": "array",
+          "description": "Gets or sets the AllowedAddressSpaces.",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "ConsortiumPageableList": {
       "description": "Microsoft.Sdw.Core.ResourceMetadata.PageableList implementation specific to pageable lists of Microsoft.Sdw.Core.ResourceMetadata.AzureResource`1.",
       "type": "object",
@@ -682,58 +703,6 @@
     "ConsortiumPropertiesFormat": {
       "type": "object",
       "properties": {
-        "sku": {
-          "description": "Gets or sets the SKU.",
-          "type": "string"
-        },
-        "kind": {
-          "description": "Gets or sets the Kind.",
-          "type": "string"
-        },
-        "managedBy": {
-          "description": "Gets or sets the Managed By value.",
-          "type": "string"
-        },
-        "zones": {
-          "description": "Gets or sets the Zones.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "plan": {
-          "description": "Gets or sets the Plan.",
-          "type": "object"
-        },
-        "identity": {
-          "description": "Gets or sets the Identity.",
-          "type": "object"
-        },
-        "vmSize": {
-          "description": "Gets or sets the VmSize.",
-          "type": "string"
-        },
-        "licenseKey": {
-          "x-ms-secret": true,
-          "description": "Value of License Key",
-          "readOnly": true,
-          "type": "string"
-        },
-        "allowedPublicIps": {
-          "description": "Gets or sets the AllowedPublicIps.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "gatewayVnetId": {
-          "description": "Specifies the resource id of the gateway vnet.",
-          "type": "string"
-        },
-        "userInterfaceMode": {
-          "description": "Gets or sets the UserInterfaceMode.",
-          "type": "string"
-        },
         "accessConfigurations": {
           "type": "object",
           "items": {
@@ -748,6 +717,13 @@
           },
           "description": "Gets or sets the Remote Desktop."
         },
+        "networkAcls": {
+          "type": "object",
+          "items": {
+            "$ref": "#/definitions/NetworkAcls"
+          },
+          "description": "Specifies set of source IP address ranges to allow access the HPC Workbench instance."
+        },
         "provisioningState": {
           "$ref": "./hpcworkbench.json#/definitions/ProvisioningState",
           "description": "Gets the status of the consortium at the time the operation was called"
@@ -777,7 +753,8 @@
       "description": "License Key Parameters",
       "properties": {
         "licenseKey": {
-          "description": "Gets or sets LicenseKey",
+          "x-ms-secret": true,
+          "description": "Value of License Key",
           "type": "string"
         }
       }

diff --git a/...rosoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesCreateOrUpdate.json b/...rosoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesCreateOrUpdate.json
@@ -10,7 +10,7 @@
       "properties": {
         "location": "Central US",
         "properties": {
-          "consortiumName": "test-consortium"
+          "consortiumId": "/subscriptions/d9f252e3-8046-4707-bfbd-e5b9e6011e07/resourceGroups/resourceGroup/providers/Microsoft.HpcWorkbench/instances/test-instance/consortiums/test-consortium"
         }
       }
     }

diff --git a/...nager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesPatch.json b/...nager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesPatch.json
@@ -10,7 +10,7 @@
       "properties": {
         "location": "Central US",
         "properties": {
-          "consortiumName": "test-consortium"
+          "consortiumId": "/subscriptions/d9f252e3-8046-4707-bfbd-e5b9e6011e07/resourceGroups/resourceGroup/providers/Microsoft.HpcWorkbench/instances/test-instance/consortiums/test-consortium"
         }
       }
     }

diff --git a/...anager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesSync.json b/...anager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesSync.json
@@ -10,7 +10,7 @@
       "properties": {
         "location": "Central US",
         "properties": {
-          "consortiumName": "test-consortium"
+          "consortiumId": "/subscriptions/d9f252e3-8046-4707-bfbd-e5b9e6011e07/resourceGroups/resourceGroup/providers/Microsoft.HpcWorkbench/instances/test-instance/consortiums/test-consortium"
         }
       }
     }

diff --git a/...ench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/hpcworkbench.json b/...ench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/hpcworkbench.json
@@ -484,6 +484,8 @@
     },
     "Resource": {
       "type": "object",
+      "description": "Common resource representation.",
+      "x-ms-azure-resource": true,
       "properties": {
         "id": {
           "readOnly": true,
@@ -515,23 +517,26 @@
           "description": "system data",
           "title": "system data",
           "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
+        },
+        "sku": {
+          "type": "string",
+          "description": "Name of SKU.",
+          "$ref": "#/definitions/Sku"
         }
-      },
-      "description": "Common resource representation.",
-      "x-ms-azure-resource": true
+      }
     },
     "CidrBlock": {
       "description": "this is an extension of IPAddress which includes logic related to Classes Interdomain Routing (CIDR) formatted IP Addresses.  \r\nE.g. 192.168.0.0/24, most people's default class C RFC 1918 IP space for their home router",
       "type": "string"
     },
-    "AppOpenIdClient": {
+    "AppOidc": {
       "type": "object",
       "properties": {
         "clientId": {
           "type": "string",
           "description": "Client Id"
         },
-        "clientSecret": {
+        "secretUri": {
           "type": "string",
           "description": "Client secret"
         }
@@ -540,19 +545,16 @@
     "InstancePropertiesFormat": {
       "type": "object",
       "properties": {
-        "sku": {
-          "type": "string",
-          "description": "Sku of the instance."
-        },
-        "environment": {
-          "type": "string",
-          "description": "Environment of the instance."
-        },
-        "instanceAddressSpace": {
+        "addressSpace": {
           "$ref": "#/definitions/CidrBlock"
         },
-        "appOpenIdClient": {
-          "$ref": "#/definitions/AppOpenIdClient"
+        "appOidc": {
+          "$ref": "#/definitions/AppOidc"
+        },
+        "sku": {
+          "type": "string",
+          "description": "Name of SKU.",
+          "$ref": "#/definitions/Sku"
         },
         "provisioningState": {
           "$ref": "#/definitions/ProvisioningState",

diff --git a/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/workload.json b/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/workload.json
@@ -633,6 +633,10 @@
         "status": {
           "description": "Gets or sets the status.",
           "type": "string"
+        },
+        "privateIP": {
+          "description": "Gets or sets the private IpAddress of workload.",
+          "type": "string"
         }
       }
     },