Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iot sites and sensor zones #11296

Merged
merged 12 commits into from
Dec 2, 2020
+411 −13
Merged

Iot sites and sensor zones #11296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ad2b80
iot-sites-and-zones
gamoshe Oct 19, 2020
ea169ec
rename displayName and fix missing params
gamoshe Oct 20, 2020
13d3f1d
change caps mistake
gamoshe Oct 25, 2020
f395fc2
prettier run changes
gamoshe Oct 25, 2020
e4c9602
Delete Get.json
galmoshe Oct 25, 2020
49a5323
Delete Delete.json
galmoshe Oct 25, 2020
d35e73e
Delete Put.json
galmoshe Oct 25, 2020
b9f5bfd
Delete List.json
galmoshe Oct 25, 2020
355d96b
Merge branch 'master' into iot-sites-and-zones
galmoshe Nov 5, 2020
14bec96
remove required tags
gamoshe Nov 23, 2020
2762185
Merge branch 'master' into iot-sites-and-zones
galmoshe Nov 30, 2020
fcdac1c
fix merge
Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...source-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSensors/Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"name": "mySensor",
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSensors/mySensor",
"type": "Microsoft.Security/iotSensors",
"properties": {}
"properties": {
"zone": "Zone Name"
}
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...ource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSensors/List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
"name": "mySensor",
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSensors/mySensor",
"type": "Microsoft.Security/iotSensors",
"properties": {}
"properties": {
"zone": "Zone Name"
}
},
{
"name": "otherSensor",
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSensors/otherSensor",
"type": "Microsoft.Security/iotSensors",
"properties": {}
"properties": {
"zone": "Zone Name"
}
}
]
}
Expand Down
15 changes: 12 additions & 3 deletions ...source-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSensors/Put.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,32 @@
"parameters": {
"api-version": "2020-08-06-preview",
"scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub",
"iotSensorName": "mySensor"
"iotSensorName": "mySensor",
"iotSensorsModel": {
"properties": {
"zone": "Zone Name"
}
}
},
"responses": {
"200": {
"body": {
"name": "mySensor",
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSensors/mySensor",
"type": "Microsoft.Security/iotSensors",
"properties": {}
"properties": {
"zone": "Zone Name"
}
}
},
"201": {
"body": {
"name": "mySensor",
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSensors/mySensor",
"type": "Microsoft.Security/iotSensors",
"properties": {}
"properties": {
"zone": "Zone Name"
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions ...ource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSites/Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"parameters": {
"api-version": "2020-08-06-preview",
"scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub"
},
"responses": {
"200": {},
"204": {}
}
}
22 changes: 22 additions & 0 deletions ...resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSites/Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"api-version": "2020-08-06-preview",
"scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSites/default",
"type": "Microsoft.Security/iotSites",
"name": "default",
"properties": {
"displayName": "IoT site name",
"tags": {
"key1": "value1",
"key2": "value2"
}
}
}
}
}
}
26 changes: 26 additions & 0 deletions ...esource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSites/List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parameters": {
"api-version": "2020-08-06-preview",
"scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/iotSites"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "default",
"id": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSites/default",
"type": "Microsoft.Security/iotSites",
"properties": {
"displayName": "IoT site name",
"tags": {
"key1": "value1",
"key2": "value2"
}
}
}
]
}
}
}
}
45 changes: 45 additions & 0 deletions ...resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotSites/Put.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"api-version": "2020-08-06-preview",
"scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub",
"iotSitesModel": {
"properties": {
"displayName": "IoT site name",
"tags": {
"key1": "value1",
"key2": "value2"
}
}
}
},
"responses": {
"200": {
"body": {
"name": "default",
"id": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSites/default",
"type": "Microsoft.Security/iotSites",
"properties": {
"displayName": "IoT site name",
"tags": {
"key1": "value1",
"key2": "value2"
}
}
}
},
"201": {
"body": {
"name": "default",
"id": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/myHub/providers/Microsoft.Security/iotSites/default",
"type": "Microsoft.Security/iotSites",
"properties": {
"displayName": "IoT site name",
"tags": {
"key1": "value1",
"key2": "value2"
}
}
}
}
}
}
32 changes: 25 additions & 7 deletions ...n/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotSensors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/IotSensor"
"$ref": "#/definitions/IotSensorsModel"
}
},
"default": {
Expand Down Expand Up @@ -128,19 +128,22 @@
},
{
"$ref": "#/parameters/IotSensorName"
},
{
"$ref": "#/parameters/IotSensorsModel"
}
],
"responses": {
"200": {
"description": "Updated IoT sensor",
"schema": {
"$ref": "#/definitions/IotSensor"
"$ref": "#/definitions/IotSensorsModel"
}
},
"201": {
"description": "Created IoT sensor",
"schema": {
"$ref": "#/definitions/IotSensor"
"$ref": "#/definitions/IotSensorsModel"
}
},
"default": {
Expand Down Expand Up @@ -296,14 +299,14 @@
"readOnly": true,
"type": "array",
"items": {
"$ref": "#/definitions/IotSensor"
"$ref": "#/definitions/IotSensorsModel"
}
}
}
},
"IotSensor": {
"IotSensorsModel": {
"type": "object",
"description": "IoT sensor",
"description": "IoT sensor model",
"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand All @@ -320,7 +323,12 @@
"IotSensorProperties": {
"type": "object",
"description": "IoT sensor properties",
"properties": {}
"properties": {
"zone": {
"type": "string",
"description": "Display name of the IoT zone"
}
}
},
"ResetPasswordInput": {
"type": "object",
Expand Down Expand Up @@ -350,6 +358,16 @@
"type": "string",
"description": "Name of the IoT sensor",
"x-ms-parameter-location": "method"
},
"IotSensorsModel": {
"name": "iotSensorsModel",
"in": "body",
"required": true,
"description": "The IoT sensor model",
"schema": {
"$ref": "#/definitions/IotSensorsModel"
},
"x-ms-parameter-location": "method"
}
}
}
Loading