[SECIOTSRK-658] *Extend Device entity +add new parameter mode to device registration

diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java
index 68c31ec..36446fa 100644 (file)
--- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java
+++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java
@@ -62,6 +62,7 @@ public final class MQPublisherAPI {
     private static final String DEVICE_NAME = "name";
     private static final String DEVICE_TYPE = "type";
     private static final String DEVICE_MODEL = "model";
+    private static final String DEVICE_MODE = "mode";
     private static final String POLICY = "policy";
 
     /**
@@ -114,7 +115,7 @@ public final class MQPublisherAPI {
      * @return boolean boolean
      */
     public static boolean deviceRegistrationInDSM(String duid, String uuid, String name, String type, String model,
-            String parentUuid) {
+            String parentUuid, String mode) {
         Map<String, String> messageMap = new HashMap<>();
         Cbor<HashMap<String, String>> cbor = new Cbor<>();
         messageMap.put(DUID, duid);
@@ -123,6 +124,7 @@ public final class MQPublisherAPI {
         messageMap.put(DEVICE_TYPE, type);
         messageMap.put(DEVICE_MODEL, model);
         messageMap.put(DEVICE_PARENT_UUID, parentUuid);
+        messageMap.put(DEVICE_MODE, mode);
         LOG.info("Device registration: " + messageMap);
         byte[] data = cbor.encodingPayloadToCbor(messageMap);
         return publishMessage(REG_TOPIC, data);

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java
index 4980ab8..814f542 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java
@@ -59,8 +59,8 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs
     private static final String DEVICE_DUID_HUB = "hub-000000-1111-2222-3333-4444444444444";
     private static final String DEVICE_NAME = "TV";
     private static final String DEVICE_TYPE = "tv";
-    private static final String KIND = "standard";
-    private static final String KIND_HUB = "hub";
+    private static final String DEVICE_MODE1 = "standard";
+    private static final String DEVICE_MODE2 = "hub";
     private static final String DEVICE_MODEL = "UE32M5500AUXUA";
     private static final String DEVICE_PARENT_DUID = "55555555-6666-7777-8888-999999999999";
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
@@ -84,13 +84,13 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs
     private void registerDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, KIND+":"+DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE,DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE1));
     }
 
     private void registerHubDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID_HUB, uuid, DEVICE_NAME, DEVICE_TYPE, KIND_HUB+":"+DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID_HUB, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE2));
     }
 
     private void checkDevice() {

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java
index e7e69f3..4b197a9 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java
@@ -63,7 +63,8 @@ public class PolicyWitoutCloudTest extends BasicUserAction {
     private static final String DEVICE_TYPE = "tv";
     private static final String DEVICE_PHONE_NAME = "Phone";
     private static final String DEVICE_PHONE_TYPE = "phone";
-    private static final String DEVICE_MODEL = "standard:UE32M5500AUXUA";
+    private static final String DEVICE_MODEL = "UE32M5500AUXUA";
+    private static final String DEVICE_MODE = "standard";
     private static final String DEVICE_PARENT_DUID = "55555555-6666-7777-8888-999999999999";
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
     private static final String MAIN_TOPIC = ".oic.ps.";
@@ -101,13 +102,13 @@ public class PolicyWitoutCloudTest extends BasicUserAction {
     private void registerDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE));
     }
 
     private void registerPhoneDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_PHONE_NAME, DEVICE_PHONE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_PHONE_NAME, DEVICE_PHONE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE));
     }
 
     private String readChangedPolicy() throws IOException {

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java
index 8be0edc..97707a4 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java
@@ -67,7 +67,8 @@ public class ReportsWithOutCloudTest extends BasicUserAction {
     private static final String DEVICE_DUID = "00000000-1111-2222-3333-4444444444444";
     private static final String DEVICE_NAME = "TV";
     private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODEL = "standard:UE32M5500AUXUA";
+    private static final String DEVICE_MODEL = "UE32M5500AUXUA";
+    private static final String DEVICE_MODE = "standard";
     private static final String DEVICE_PARENT_DUID = "55555555-6666-7777-8888-999999999999";
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
     private static final String MAIN_TOPIC = ".oic.ps.";
@@ -122,7 +123,7 @@ public class ReportsWithOutCloudTest extends BasicUserAction {
     private void registerDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE));
     }
 
     private void checkReports() {

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java
index 57ec114..69617e8 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java
@@ -35,7 +35,8 @@ public class RestRuleReportsTest extends BasicUserAction {
     private static final String DEVICE_DUID = "00000000-1111-2222-3333-4444444444444";
     private static final String DEVICE_NAME = "TV";
     private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODEL = "standard:UE32M5500AUXUA";
+    private static final String DEVICE_MODEL = "UE32M5500AUXUA";
+    private static final String DEVICE_MODE = "standard";
     private static final String DEVICE_PARENT_DUID = "55555555-6666-7777-8888-999999999999";
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
     private static final String MAIN_TOPIC = ".oic.ps.";
@@ -85,7 +86,7 @@ public class RestRuleReportsTest extends BasicUserAction {
     private void registerDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE));
     }
 
     private void checkReports() {

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java
index ef0f279..7d577ad 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java
@@ -74,7 +74,8 @@ public class TIAReportsTest extends BasicUserAction {
 
     private static final String DEVICE_NAME = "TV";
     private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODEL = "standard:UE32M5500AUXUA";
+    private static final String DEVICE_MODEL = "UE32M5500AUXUA";
+    private static final String DEVICE_MODE = "standard";
     private static final String DEVICE_PARENT_DUID = "TIA-55555555-6666-7777-8888-999999999999";
 
     /**
@@ -103,7 +104,7 @@ public class TIAReportsTest extends BasicUserAction {
     private void registerDevice(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE));
     }
 
     private void checkReportSize(Response resp, int size) {

diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java
index aad429f..702779b 100644 (file)
--- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java
+++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java
@@ -41,8 +41,10 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction {
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
     private static final String DEVICE_NAME = "TV";
     private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODEL1 = "standard:old";
-    private static final String DEVICE_MODEL2 = "hub:new";
+    private static final String DEVICE_MODEL1 = "old";
+    private static final String DEVICE_MODEL2 = "new";
+    private static final String DEVICE_MODE1 = "standard";
+    private static final String DEVICE_MODE2 = "hub";
     private static final String DEVICE_PARENT_DUID = "D-55555555-6666-7777-8888-999999999999";
 
     @BeforeAll
@@ -61,9 +63,9 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction {
     private void registerDevices(String uuid) {
         log("Device registration");
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID1, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL1, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID1, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL1, DEVICE_PARENT_DUID, DEVICE_MODE1));
         assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID2, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL2, DEVICE_PARENT_DUID));
+                .deviceRegistrationInDSM(DEVICE_DUID2, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL2, DEVICE_PARENT_DUID, DEVICE_MODE2));
     }
 
     private void unregisterDevices() {

diff --git a/servers/api-integration-tests/src/test/resources/TIAdacReportExpected.json b/servers/api-integration-tests/src/test/resources/TIAdacReportExpected.json
index 54d172a..d7a33f2 100644 (file)
--- a/servers/api-integration-tests/src/test/resources/TIAdacReportExpected.json
+++ b/servers/api-integration-tests/src/test/resources/TIAdacReportExpected.json
@@ -2,31 +2,11 @@
   "1": {
     "date": "12:25 PM; May 08, 2017",
     "syscall": "5",
-    "gid": "100",
-    "fsgid": "100",
-    "pid": "1005",
-    "suid": "5001",
     "type": "dac",
-    "uid": "5001",
-    "egid": "100",
-    "exe": "/usr/bin/ls",
-    "sgid": "100",
     "per": "800000",
-    "subj": "User::Shell",
-    "ses": "4294967295",
-    "auid": "4294967295",
-    "comm": "ls",
-    "euid": "5001",
     "a0": "b7e3c6a0",
-    "ppid": "1001",
-    "a1": "a4800",
-    "fsuid": "5001",
     "exit": "-13",
-    "a2": "b6ef84d0",
-    "a3": "2f",
     "success": "no",
-    "tty": "pts1",
-    "arch": "40000028",
-    "items": "1"
+    "arch": "40000028"
   }
 }
\ No newline at end of file

diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java
index 92d78cc..85a8a22 100644 (file)
--- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java
+++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java
@@ -40,25 +40,16 @@ public class DeviceRegistrationPostDataExtractor implements PostDataExtractor {
             String uid = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.UUID.getKey());
             String name = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.DEVICE_NAME.getKey());
             String type = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.DEVICE_TYPE.getKey());
-            String str = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.DEVICE_MODEL.getKey());
+            String model = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.DEVICE_MODEL.getKey());
+            String mode = MessageQueueUtils.extractDataFromPayload(data, MessageQueueKeys.DEVICE_MODE.getKey());
             String parentUuid = MessageQueueUtils
                     .extractDataFromPayload(data, MessageQueueKeys.DEVICE_PARENT_UUID.getKey());
-            String model;
-            String kind;
-            int hasParts = str.indexOf(":");
-            if (hasParts > -1) {
-                String[] parts = str.split(":");
-                model = parts[1];
-                kind = parts[0];
-            }
-            else {
-                model = str;
-                kind ="";
-            }
             LOG.debug("New device with params : did = " + did + ", uid =  " + uid + ", device type = " + name
-                    + ", model = " + model + ", parentUuid = " + parentUuid);
+                    + ", model = " + model
+                    + ", mode = " + mode
+                    + ", parentUuid = " + parentUuid);
             User user = iotCloudService.findAssociatedUserByUuid(uid);
-            Device device = deviceService.init(did, name, type, model, 1, user, parentUuid, kind);
+            Device device = deviceService.init(did, name, type, model, 1, user, parentUuid, mode);
             // TODO: remove or update after Agent functionality implementation
             // TODO: test Agent registration for all new devices
             String testAgentUuid = did + name.hashCode();

diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java
index 06d0652..92c9be8 100644 (file)
--- a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java
+++ b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java
@@ -57,6 +57,9 @@ public enum MessageQueueKeys {
      * Device model message queue keys.
      */
     DEVICE_MODEL("model"),
+
+    DEVICE_MODE("mode"),
+
     /**
      * Policy message queue keys.
      */