Devinwon update solutions and solutioninstances (#5546)

* update solutions and solution instances schemas

* added x-ms-examples in Operations_Get

* remove status from solution instance schema

* fix Model Validation error

* fix prettier errors

Co-authored-by: Devin Wong <[email protected]>

Author: Devinwong

specification/azurepercept/resource-manager/Microsoft.AzurePercept/preview/2021-09-01-preview/azurepercept.json

@@ -62,6 +62,11 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Operations_Get": {
+            "$ref": "./examples/Operations_Get.json"
+          }
         }
       }
     },
@@ -1968,17 +1973,6 @@
         "properties": {
           "x-ms-client-flatten": true,
           "description": "Azure Percept Solution editable properties.",
-          "$ref": "#/definitions/SolutionEditableProperties"
-        }
-      }
-    },
-    "SolutionEditableProperties": {
-      "description": "Editable properties of a Solution inside the Azure Percept account.",
-      "type": "object",
-      "properties": {
-        "properties": {
-          "description": "The properties of a Solution linked to the Azure Percept account.",
-          "x-ms-client-flatten": true,
           "$ref": "#/definitions/SolutionProperties"
         }
       }
@@ -2027,9 +2021,7 @@
         "capabilities": {
           "description": "Component capabilities.",
           "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
+          "additionalProperties": {}
         },
         "configurations": {
           "description": "Component configurations.",
@@ -2375,6 +2367,10 @@
       "description": "Editable properties of a sensor inside the Azure Percept device.",
       "type": "object",
       "properties": {
+        "sensorLocation": {
+          "description": "The sensor location.",
+          "type": "string"
+        },
         "metadata": {
           "type": "object",
           "additionalProperties": {
@@ -2525,6 +2521,40 @@
       "type": "object",
       "description": "The SolutionInstance object."
     },
+    "SolutionInstanceUpdateProperties": {
+      "description": "The properties of a SolutionInstance within a Azure Percept account.",
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "description": "Provisioning state of solutioninstance resource",
+          "type": "string",
+          "readOnly": true
+        },
+        "target": {
+          "description": "The target resource to deploy the SolutionInstance.",
+          "type": "string"
+        },
+        "solution": {
+          "description": "The solution resource to be deployed.",
+          "type": "string"
+        },
+        "description": {
+          "description": "The user provided description.",
+          "type": "string"
+        },
+        "configurations": {
+          "description": "Component configurations.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SolutionInstanceConfiguration"
+          }
+        }
+      },
+      "required": [
+        "target",
+        "solution"
+      ]
+    },
     "SolutionInstanceProperties": {
       "description": "The properties of a SolutionInstance within a Azure Percept account.",
       "type": "object",
@@ -2578,7 +2608,7 @@
         "properties": {
           "x-ms-client-flatten": true,
           "description": "Azure Percept SolutionInstance editable properties.",
-          "$ref": "#/definitions/SolutionInstanceProperties"
+          "$ref": "#/definitions/SolutionInstanceUpdateProperties"
         }
       }
     },

specification/azurepercept/resource-manager/Microsoft.AzurePercept/preview/2021-09-01-preview/examples/Operations_Get.json

@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "api-version": "2021-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "description": "The list of supported operations has been fetched successfully.",
+      "body": {
+        "value": [
+          {
+            "name": "Microsoft.AzurePercept/accounts/Read",
+            "display": {
+              "provider": "Microsoft.AzurePercept",
+              "resource": "accounts",
+              "operation": "Gets/List Azure Percept accounts",
+              "description": "Read accounts"
+            }
+          },
+          {
+            "name": "Microsoft.AzurePercept/accounts/Write",
+            "display": {
+              "provider": "Microsoft.AzurePercept",
+              "resource": "accounts",
+              "operation": "Create/update Azure Percept accounts",
+              "description": "Writes accounts"
+            }
+          }
+        ]
+      }
+    }
+  }
+}

specification/azurepercept/resource-manager/Microsoft.AzurePercept/preview/2021-09-01-preview/examples/SolutionInstances_Update.json

@@ -10,16 +10,6 @@
         "target": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AzurePercept/accounts/myAccount/targets/myTarget",
         "solution": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AzurePercept/accounts/myAccount/solutions/mySolution",
         "description": "User provided SolutionInstance description",
-        "accounts": [
-          {
-            "kind": "ava",
-            "accountResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso/providers/Microsoft.videoAnalyzers/my-ava-account"
-          },
-          {
-            "kind": "computervision",
-            "accountResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso/providers/Microsoft.CognitiveServices/accounts/my-cv-account"
-          }
-        ],
         "configurations": [
           {
             "operation": "add",

specification/azurepercept/resource-manager/Microsoft.AzurePercept/preview/2021-09-01-preview/examples/Solutions_Update.json

@@ -7,41 +7,39 @@
     "solutionName": "mySolutionName",
     "solution": {
       "properties": {
-        "properties": {
-          "components": [
-            {
-              "componentType": "IoTEdgeModule",
-              "componentName": "avaedge",
-              "capabilities": {},
-              "configurations": {
-                "readOnly": {
-                  "properties.desired": {
-                    "key1": "value1",
-                    "type": "type"
-                  },
-                  "graphTopologies": [
-                    {
-                      "topologyName": "topology1"
-                    },
-                    {
-                      "topologyName": "topology2"
-                    },
-                    {
-                      "topologyName": "topology3"
-                    }
-                  ]
+        "components": [
+          {
+            "componentType": "IoTEdgeModule",
+            "componentName": "avaedge",
+            "capabilities": {},
+            "configurations": {
+              "readOnly": {
+                "properties.desired": {
+                  "key1": "value1",
+                  "type": "type"
                 },
-                "readWrite": {
-                  "edgeAgent.properties.desired": {
-                    "settings": {
-                      "SettingsName": "Settings1"
-                    }
+                "graphTopologies": [
+                  {
+                    "topologyName": "topology1"
+                  },
+                  {
+                    "topologyName": "topology2"
+                  },
+                  {
+                    "topologyName": "topology3"
+                  }
+                ]
+              },
+              "readWrite": {
+                "edgeAgent.properties.desired": {
+                  "settings": {
+                    "SettingsName": "Settings1"
                   }
                 }
               }
             }
-          ]
-        }
+          }
+        ]
       }
     }
   },