Merge pull request #3017 from Azure/users/huliu/azureiidt-addproperti…

…es-2020-12-01 Users/huliu/azureiidt addproperties 2020 12 01
Azure · Feb 20, 2021 · ee435d0 · ee435d0
2 parents 2be7431 + c2f2bb9
commit ee435d0
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 13 deletions.
diff --git a/...nager/Microsoft.IntelligentITDigitalTwin/preview/2020-12-01-privatepreview/azureiidt.json b/...nager/Microsoft.IntelligentITDigitalTwin/preview/2020-12-01-privatepreview/azureiidt.json
@@ -2038,6 +2038,60 @@
         "provisioningState": {
           "description": "The provisioning state.",
           "$ref": "#/definitions/ProvisioningState"
+        },
+        "assetImage": {
+          "type": "string",
+          "description": "Image for the device OS."
+        },
+        "assetSku": {
+          "type": "string",
+          "description": "Sku for the device OS."
+        },
+        "assetCpu": {
+          "type": "string",
+          "description": "CPU for the devices."
+        },
+        "assetBuildNumber": {
+          "type": "string",
+          "description": "Build number for the device OS."
+        },
+        "assetEdition": {
+          "description": "Edition for the device OS.",
+          "enum": [
+            "Home",
+            "Education",
+            "Profession",
+            "Enterprise"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "assetEdition",
+            "modelAsString": true
+          }
+        },
+        "adminUserName": {
+          "x-ms-secret": true,
+          "description": "Admin user name for accessing the device.",
+          "type": "string",
+          "x-nullable": true
+        },
+        "adminPassword": {
+          "x-ms-secret": true,
+          "description": "Admin password for accessing the device.",
+          "type": "string",
+          "x-nullable": true
+        },
+        "domainUserName": {
+          "x-ms-secret": true,
+          "description": "Domain user name for accessing the enterprise domain.",
+          "type": "string",
+          "x-nullable": true
+        },
+        "domainPassword": {
+          "x-ms-secret": true,
+          "description": "Domain password for accessing the enterprise domain.",
+          "type": "string",
+          "x-nullable": true
         }
       },
       "description": "Describes the properties of an digitalTwins/assets."
@@ -2294,6 +2348,18 @@
         "provisioningState": {
           "description": "The provisioning state.",
           "$ref": "#/definitions/ProvisioningState"
+        },
+        "logAvailable": {
+          "type": "string",
+          "description": "Whether the log has been generated or not.",
+          "enum": [
+            "True",
+            "False"
+          ],
+          "x-ms-enum": {
+            "name": "logAvailable",
+            "modelAsString": true
+          }
         }
       },
       "description": "Describes the properties of an digitalTwins/executionPlans."

diff --git a/...ntITDigitalTwin/preview/2020-12-01-privatepreview/examples/CreateAITDigitalTwinAsset.json b/...ntITDigitalTwin/preview/2020-12-01-privatepreview/examples/CreateAITDigitalTwinAsset.json
@@ -10,7 +10,12 @@
         "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/Microsoft.Compute/virtualMachines/myAsset",
         "assetRole": "SCCM",
         "assetStatus": "Available",
-        "assetIp": "0.0.0.1"
+        "assetIp": "0.0.0.1",
+        "assetImage": "MicrosoftWindowsServer",
+        "assetSku": "2019-Datacenter",
+        "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+        "assetBuildNumber": "21313",
+        "assetEdition": "Enterprise"
       }
     },
     "api-version": "2020-11-01-privatepreview"
@@ -26,7 +31,12 @@
           "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myAsset",
           "assetRole": "SCCM",
           "assetStatus": "Available",
-          "assetIp": "0.0.0.1"
+          "assetIp": "0.0.0.1",
+          "assetImage": "MicrosoftWindowsServer",
+          "assetSku": "2019-Datacenter",
+          "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+          "assetBuildNumber": "21313",
+          "assetEdition": "Enterprise"
         }
       }
     }

diff --git a/...talTwin/preview/2020-12-01-privatepreview/examples/CreateAITDigitalTwinExecutionPlan.json b/...talTwin/preview/2020-12-01-privatepreview/examples/CreateAITDigitalTwinExecutionPlan.json
@@ -13,7 +13,8 @@
           "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
         ],
         "executionStatus": "Unknown",
-        "result": "Passed"
+        "result": "Passed",
+        "logAvailable": "False"
       }
     },
     "api-version": "2020-12-01-privatepreview"
@@ -32,7 +33,8 @@
             "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
           ],
           "executionStatus": "Unknown",
-          "result": "Passed"
+          "result": "Passed",
+          "logAvailable": "False"
         }
       }
     }

diff --git a/...igentITDigitalTwin/preview/2020-12-01-privatepreview/examples/GetAITDigitalTwinAsset.json b/...igentITDigitalTwin/preview/2020-12-01-privatepreview/examples/GetAITDigitalTwinAsset.json
@@ -18,7 +18,12 @@
           "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myAsset",
           "assetRole": "SCCM",
           "assetStatus": "Available",
-          "assetIp": "0.0.0.1"
+          "assetIp": "0.0.0.1",
+          "assetImage": "MicrosoftWindowsServer",
+          "assetSku": "2019-Datacenter",
+          "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+          "assetBuildNumber": "21313",
+          "assetEdition": "Enterprise"
         }
       }
     }

diff --git a/...igitalTwin/preview/2020-12-01-privatepreview/examples/GetAITDigitalTwinExecutionPlan.json b/...igitalTwin/preview/2020-12-01-privatepreview/examples/GetAITDigitalTwinExecutionPlan.json
@@ -21,7 +21,8 @@
             "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
           ],
           "executionStatus": "Unknown",
-          "result": "Passed"
+          "result": "Passed",
+          "logAvailable": "False"
         }
       }
     }

diff --git a/...ft.IntelligentITDigitalTwin/preview/2020-12-01-privatepreview/examples/ListAllAssets.json b/...ft.IntelligentITDigitalTwin/preview/2020-12-01-privatepreview/examples/ListAllAssets.json
@@ -17,7 +17,12 @@
             "properties": {
               "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/vm1",
               "assetRole": "SCCM",
-              "assetStatus": "Available"
+              "assetStatus": "Available",
+              "assetImage": "MicrosoftWindowsServer",
+              "assetSku": "2019-Datacenter",
+              "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+              "assetBuildNumber": "21313",
+              "assetEdition": "Enterprise"
             }
           },
           {
@@ -28,7 +33,12 @@
             "properties": {
               "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/vm2",
               "assetRole": "SCCM",
-              "assetStatus": "Available"
+              "assetStatus": "Available",
+              "assetImage": "MicrosoftWindowsServer",
+              "assetSku": "2019-Datacenter",
+              "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+              "assetBuildNumber": "21313",
+              "assetEdition": "Enterprise"
             }
           }
         ]

diff --git a/...alTwin/preview/2020-12-01-privatepreview/examples/ListAllITDigitalTwinExecutionPlans.json b/...alTwin/preview/2020-12-01-privatepreview/examples/ListAllITDigitalTwinExecutionPlans.json
@@ -21,7 +21,8 @@
                 "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
               ],
               "executionStatus": "Unknown",
-              "result": "Passed"
+              "result": "Passed",
+              "logAvailable": "False"
             }
           }
         ]

diff --git a/...ntITDigitalTwin/preview/2020-12-01-privatepreview/examples/UpdateAITDigitalTwinAsset.json b/...ntITDigitalTwin/preview/2020-12-01-privatepreview/examples/UpdateAITDigitalTwinAsset.json
@@ -8,7 +8,12 @@
       "properties": {
         "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myAsset",
         "assetRole": "SCCM",
-        "assetStatus": "Available"
+        "assetStatus": "Available",
+        "assetImage": "MicrosoftWindowsServer",
+        "assetSku": "2019-Datacenter",
+        "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+        "assetBuildNumber": "21313",
+        "assetEdition": "Enterprise"
       }
     },
     "api-version": "2020-11-01-privatepreview"
@@ -23,7 +28,12 @@
         "properties": {
           "assetId": "subscriptions/{subscription-id}/resourcegroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myAsset",
           "assetRole": "SCCM",
-          "assetStatus": "Available"
+          "assetStatus": "Available",
+          "assetImage": "MicrosoftWindowsServer",
+          "assetSku": "2019-Datacenter",
+          "assetCpu": "Intel(R) Xeon(R) CPU E5-1650 v4 @ 3.60GHz",
+          "assetBuildNumber": "21313",
+          "assetEdition": "Enterprise"
         }
       }
     }

diff --git a/...talTwin/preview/2020-12-01-privatepreview/examples/UpdateAITDigitalTwinExecutionPlan.json b/...talTwin/preview/2020-12-01-privatepreview/examples/UpdateAITDigitalTwinExecutionPlan.json
@@ -12,7 +12,8 @@
           "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
         ],
         "executionStatus": "Unknown",
-        "result": "Passed"
+        "result": "Passed",
+        "logAvailable": "False"
       }
     },
     "api-version": "2020-12-01-privatepreview"
@@ -31,7 +32,8 @@
             "subscriptions/sub1/resourcegroups/rg1/providers/Microsoft.Compute/virtualMachines/myAsset2"
           ],
           "executionStatus": "Unknown",
-          "result": "Passed"
+          "result": "Passed",
+          "logAvailable": "False"
         }
       }
     }