# Conflicts: # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java # modules/integration/tests-integration/src/test/resources/automation.xml # modules/integration/tests-integration/src/test/resources/testng.xmlmerge-requests/1/head
Menaka Jayawardena
8 years ago
commit
5d41fe313b
@ -1,45 +1,92 @@
|
||||
{
|
||||
"POST": {
|
||||
"name": "milan",
|
||||
"type": "android",
|
||||
"description": "milan123",
|
||||
"deviceIdentifier": "1234",
|
||||
"enrolmentInfo": {
|
||||
"ownership": "BYOD",
|
||||
"status": "ACTIVE",
|
||||
"owner": "admin"
|
||||
"id": 101234,
|
||||
"name": "androiddevice1234",
|
||||
"type": "android",
|
||||
"description": "this is an android device",
|
||||
"deviceIdentifier": "d24f870f390352a41234",
|
||||
"enrolmentInfo": {
|
||||
"id": 101234,
|
||||
"device": {
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
"name": "IMEI",
|
||||
"value": "123123123"
|
||||
},
|
||||
{
|
||||
"name": "IMSI",
|
||||
"value": "123123123"
|
||||
}
|
||||
]
|
||||
"dateOfEnrolment": 0,
|
||||
"dateOfLastUpdate": 0,
|
||||
"ownership": "BYOD",
|
||||
"status": "CREATED",
|
||||
"owner": "admin"
|
||||
},
|
||||
"PUT": {
|
||||
"name": "milan123",
|
||||
"type": "android",
|
||||
"description": "updatedDescription",
|
||||
"deviceIdentifier": "1234",
|
||||
"enrolmentInfo": {
|
||||
"ownership": "BYOD",
|
||||
"status": "ACTIVE",
|
||||
"owner": "admin",
|
||||
"dateOfEnrolment": "1445438864650"
|
||||
"features": [
|
||||
{
|
||||
"id": 10,
|
||||
"code": "aaaa1111",
|
||||
"name": "newfeature1",
|
||||
"description": "this is the new feature 1",
|
||||
"deviceType": "android",
|
||||
"metadataEntries": [
|
||||
{
|
||||
"id": 10,
|
||||
"value": {
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"properties": [
|
||||
{
|
||||
"name": "property1",
|
||||
"value": "value1"
|
||||
}
|
||||
],
|
||||
"deviceInfo": {
|
||||
"deviceModel": "S8",
|
||||
"vendor": "SAMSUNG",
|
||||
"osVersion": "5.1",
|
||||
"batteryLevel": 1,
|
||||
"internalTotalMemory": 32,
|
||||
"internalAvailableMemory": 24,
|
||||
"externalTotalMemory": 64,
|
||||
"externalAvailableMemory": 60,
|
||||
"operator": "dialog",
|
||||
"connectionType": "GSM",
|
||||
"mobileSignalStrength": 1,
|
||||
"ssid": "picassowifi",
|
||||
"cpuUsage": 0,
|
||||
"totalRAMMemory": 2,
|
||||
"availableRAMMemory": 1,
|
||||
"pluggedIn": false,
|
||||
"location": {
|
||||
"deviceId": 0,
|
||||
"deviceIdentifier": {
|
||||
"id": "string",
|
||||
"type": "string"
|
||||
},
|
||||
"latitude": 0,
|
||||
"longitude": 0,
|
||||
"street1": "string",
|
||||
"street2": "string",
|
||||
"city": "string",
|
||||
"state": "string",
|
||||
"zip": "string",
|
||||
"country": "string"
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
"name": "IMEI",
|
||||
"value": "123123123"
|
||||
"deviceDetailsMap": {
|
||||
},
|
||||
"imei": "string",
|
||||
"imsi": "string"
|
||||
},
|
||||
"applications": [
|
||||
{
|
||||
"id": 0,
|
||||
"platform": "string",
|
||||
"category": "string",
|
||||
"name": "string",
|
||||
"locationUrl": "string",
|
||||
"imageUrl": "string",
|
||||
"version": "string",
|
||||
"type": "string",
|
||||
"appProperties": {
|
||||
},
|
||||
{
|
||||
"name": "IMSI",
|
||||
"value": "123123123"
|
||||
}
|
||||
]
|
||||
}
|
||||
"applicationIdentifier": "string",
|
||||
"memoryUsage": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,18 +1,4 @@
|
||||
{
|
||||
"POST": {
|
||||
"responseCode": "Created",
|
||||
"responseMessage": "Device enrollment succeeded."
|
||||
},
|
||||
"PUT": {
|
||||
"responseCode": "Accepted",
|
||||
"responseMessage": "Device enrollment has updated successfully"
|
||||
},
|
||||
"GET": {
|
||||
"responseCode": "Accepted",
|
||||
"responseMessage": "Device has already enrolled"
|
||||
},
|
||||
"DELETE": {
|
||||
"responseCode": "Accepted",
|
||||
"responseMessage": "Device has removed successfully"
|
||||
}
|
||||
"responseCode": "OK",
|
||||
"responseMessage": "Android device, which carries the id \u0027d24f870f390352a41\u0027 has successfully been enrolled"
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package org.wso2.iot.integration.util;
|
||||
|
||||
public class ServerRestart {
|
||||
}
|
||||
Loading…
Reference in new issue