Add Device Model Name field

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse · Oct 11, 2018 · 5e82b84 · 5e82b84
1 parent cc4d5b3
commit 5e82b84
Show file tree

Hide file tree

Showing 17 changed files with 139 additions and 3 deletions.
diff --git a/...rc/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceServiceImpl.java b/...rc/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceServiceImpl.java
@@ -238,8 +238,8 @@ public User call() throws Exception {
                 pairs.add(new GwtGroupedNVPair("devAttributesInfo", "devCustomAttribute4", device.getCustomAttribute4()));
                 pairs.add(new GwtGroupedNVPair("devAttributesInfo", "devCustomAttribute5", device.getCustomAttribute5()));
 
-                pairs.add(new GwtGroupedNVPair("devHw", "devModelName", device.getModelId()));
                 pairs.add(new GwtGroupedNVPair("devHw", "devModelId", device.getModelId()));
+                pairs.add(new GwtGroupedNVPair("devHw", "devModelName", device.getModelName()));
                 pairs.add(new GwtGroupedNVPair("devHw", "devSerialNumber", device.getSerialNumber()));
 
                 pairs.add(new GwtGroupedNVPair("devSw", "devFirmwareVersion", device.getFirmwareVersion()));

diff --git a/...ice/src/main/java/org/eclipse/kapua/app/console/module/device/servlet/DeviceExporter.java b/...ice/src/main/java/org/eclipse/kapua/app/console/module/device/servlet/DeviceExporter.java
@@ -42,6 +42,7 @@ public abstract class DeviceExporter {
             "IMSI",
             "ICCID",
             "Model ID",
+            "Model Name",
             "Bios Version",
             "Firmware Version",
             "OS Version",

diff --git a/.../src/main/java/org/eclipse/kapua/app/console/module/device/servlet/DeviceExporterCsv.java b/.../src/main/java/org/eclipse/kapua/app/console/module/device/servlet/DeviceExporterCsv.java
@@ -129,6 +129,9 @@ public Account call() throws Exception {
             // Model Id
             cols.add(device.getModelId() != null ? device.getModelId() : BLANK);
 
+            // Model Name
+            cols.add(device.getModelName() != null ? device.getModelName() : BLANK);
+
             // Bios version
             cols.add(device.getBiosVersion() != null ? device.getBiosVersion() : BLANK);
 

diff --git a/...org/eclipse/kapua/app/console/module/device/shared/util/KapuaGwtDeviceModelConverter.java b/...org/eclipse/kapua/app/console/module/device/shared/util/KapuaGwtDeviceModelConverter.java
@@ -53,6 +53,7 @@ public static GwtDevice convertDevice(Device device)
         gwtDevice.setClientId(device.getClientId());
         gwtDevice.setDisplayName(device.getDisplayName());
         gwtDevice.setModelId(device.getModelId());
+        gwtDevice.setModelName(device.getModelName());
         gwtDevice.setSerialNumber(device.getSerialNumber());
         if (device.getGroupId() != null) {
             gwtDevice.setGroupDevice(GwtGroupDevice.NO_GROUP.name());

diff --git a/qa-steps/src/main/java/org/eclipse/kapua/service/device/steps/SimulatorSteps.java b/qa-steps/src/main/java/org/eclipse/kapua/service/device/steps/SimulatorSteps.java
@@ -213,7 +213,7 @@ public void checkDeviceInformation() throws Exception {
                     Assert.assertNotNull(device);
 
                     Assert.assertEquals("Kura Simulator (Display Name)", device.getDisplayName());
-                    // Assert.assertEquals("Kura Simulator (Model Name)", device.getModelName());
+                    Assert.assertEquals("Kura Simulator (Model Name)", device.getModelName());
                     Assert.assertEquals("kura-simulator-" + clientId, device.getModelId());
                     // Assert.assertEquals("ksim-part-123456-" + clientId, device.getPartNumber());
                     Assert.assertEquals("ksim-serial-123456-" + clientId, device.getSerialNumber());

diff --git a/...e/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java b/...e/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java
@@ -47,6 +47,7 @@
         "lastEvent",
         "serialNumber",
         "modelId",
+        "modelName",
         "imei",
         "imsi",
         "iccid",
@@ -238,6 +239,21 @@ default String getType() {
      */
     void setModelId(String modelId);
 
+    /**
+     * Get the model name
+     *
+     * @return
+     */
+    @XmlElement(name = "modelName")
+    String getModelName();
+
+    /**
+     * Set the model name
+     *
+     * @param modelName
+     */
+    void setModelName(String modelName);
+
     /**
      * Get the imei
      *

diff --git a/...e/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java b/...e/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java
@@ -45,6 +45,7 @@
         "displayName",
         "serialNumber",
         "modelId",
+        "modelName",
         "imei",
         "imsi",
         "iccid",
@@ -193,6 +194,21 @@ public interface DeviceCreator extends KapuaUpdatableEntityCreator<Device> {
      */
     void setModelId(String modelId);
 
+    /**
+     * Get the model name
+     *
+     * @return
+     */
+    @XmlElement(name = "modelName")
+    String getModelName();
+
+    /**
+     * Set the model name
+     *
+     * @param modelName
+     */
+    void setModelName(String modelName);
+
     /**
      * Get the imei
      *

diff --git a/...l/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceCreatorImpl.java b/...l/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceCreatorImpl.java
@@ -34,6 +34,7 @@ public class DeviceCreatorImpl extends AbstractKapuaUpdatableEntityCreator<Devic
     private String displayName;
     private String serialNumber;
     private String modelId;
+    private String modelName;
     private String imei;
     private String imsi;
     private String iccid;
@@ -143,6 +144,16 @@ public void setModelId(String modelId) {
         this.modelId = modelId;
     }
 
+    @Override
+    public String getModelName() {
+        return modelName;
+    }
+
+    @Override
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
     @Override
     public String getImei() {
         return imei;

diff --git a/.../internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceDAO.java b/.../internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceDAO.java
@@ -48,6 +48,7 @@ public static Device create(EntityManager em, DeviceCreator deviceCreator) {
         device.setDisplayName(deviceCreator.getDisplayName());
         device.setSerialNumber(deviceCreator.getSerialNumber());
         device.setModelId(deviceCreator.getModelId());
+        device.setModelName(deviceCreator.getModelName());
         device.setImei(deviceCreator.getImei());
         device.setImsi(deviceCreator.getImsi());
         device.setIccid(deviceCreator.getIccid());

diff --git a/...internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImpl.java b/...internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImpl.java
@@ -107,6 +107,10 @@ public class DeviceImpl extends AbstractKapuaUpdatableEntity implements Device,
     @Column(name = "model_id")
     private String modelId;
 
+    @Basic
+    @Column(name = "model_name")
+    private String modelName;
+
     @Basic
     @Column(name = "imei")
     private String imei;
@@ -317,6 +321,16 @@ public void setModelId(String modelId) {
         this.modelId = modelId;
     }
 
+    @Override
+    public String getModelName() {
+        return modelName;
+    }
+
+    @Override
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
     @Override
     public String getImei() {
         return imei;

diff --git a/.../eclipse/kapua/service/device/registry/lifecycle/internal/DeviceLifeCycleServiceImpl.java b/.../eclipse/kapua/service/device/registry/lifecycle/internal/DeviceLifeCycleServiceImpl.java
@@ -64,6 +64,7 @@ public void birth(KapuaId connectionId, KapuaBirthMessage message)
             deviceCreator.setDisplayName(payload.getDisplayName());
             deviceCreator.setSerialNumber(payload.getSerialNumber());
             deviceCreator.setModelId(payload.getModelId());
+            deviceCreator.setModelName(payload.getModelName());
             deviceCreator.setImei(payload.getModemImei());
             deviceCreator.setImsi(payload.getModemImsi());
             deviceCreator.setIccid(payload.getModemIccid());
@@ -87,6 +88,7 @@ public void birth(KapuaId connectionId, KapuaBirthMessage message)
             device.setDisplayName(payload.getDisplayName());
             device.setSerialNumber(payload.getSerialNumber());
             device.setModelId(payload.getModelId());
+            device.setModelName(payload.getModelName());
             device.setImei(payload.getModemImei());
             device.setImsi(payload.getModemImsi());
             device.setIccid(payload.getModemIccid());

diff --git a/...ce/device/registry/internal/src/main/resources/liquibase/1.1.0/changelog-device-1.1.0.xml b/...ce/device/registry/internal/src/main/resources/liquibase/1.1.0/changelog-device-1.1.0.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2018 Eurotech and/or its affiliates and others
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+        Eurotech - initial API and implementation
+ -->
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd"
+        logicalFilePath="KapuaDB/changelog-device-1.1.0.xml">
+
+    <include relativeToChangelogFile="true" file="./device-add-model-name.xml"/>
+
+</databaseChangeLog>
diff --git a/...ice/device/registry/internal/src/main/resources/liquibase/1.1.0/device-add-model-name.xml b/...ice/device/registry/internal/src/main/resources/liquibase/1.1.0/device-add-model-name.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2018 Eurotech and/or its affiliates and others
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+        Eurotech - initial API and implementation
+ -->
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd"
+  logicalFilePath="KapuaDB/device-add-model-name.xml">
+
+    <changeSet id="device-add-model-name" author="eurotech">
+        <addColumn tableName="dvc_device">
+            <column name="model_name" type="varchar(255)" />
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml b/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml
@@ -19,5 +19,6 @@
     <include relativeToChangelogFile="true" file="./0.3.0/changelog-device-0.3.0.xml"/>
     <include relativeToChangelogFile="true" file="./0.3.1/changelog-device-0.3.1.xml"/>
     <include relativeToChangelogFile="true" file="./1.0.0/changelog-device-1.0.0.xml"/>
+    <include relativeToChangelogFile="true" file="./1.1.0/changelog-device-1.1.0.xml"/>
 
-</databaseChangeLog>
+</databaseChangeLog>
diff --git a/...va/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceTestSteps.java b/...va/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceTestSteps.java
@@ -450,6 +450,7 @@ public void checkCreatedDeviceAgainstCreatorParameters()
         assertEquals(deviceCreator.getDisplayName(), device.getDisplayName());
         assertEquals(deviceCreator.getSerialNumber(), device.getSerialNumber());
         assertEquals(deviceCreator.getModelId(), device.getModelId());
+        assertEquals(deviceCreator.getModelName(), device.getModelName());
         assertEquals(deviceCreator.getImei(), device.getImei());
         assertEquals(deviceCreator.getImsi(), device.getImsi());
         assertEquals(deviceCreator.getIccid(), device.getIccid());
@@ -484,6 +485,7 @@ public void checkUpdatedDeviceAgainstOriginal()
         assertEquals(tmpDevice.getDisplayName(), device.getDisplayName());
         assertEquals(tmpDevice.getSerialNumber(), device.getSerialNumber());
         assertEquals(tmpDevice.getModelId(), device.getModelId());
+        assertEquals(tmpDevice.getModelName(), device.getModelName());
         assertEquals(tmpDevice.getImei(), device.getImei());
         assertEquals(tmpDevice.getImsi(), device.getImsi());
         assertEquals(tmpDevice.getIccid(), device.getIccid());

diff --git a/test/src/main/java/org/eclipse/kapua/test/device/DeviceCreatorMock.java b/test/src/main/java/org/eclipse/kapua/test/device/DeviceCreatorMock.java
@@ -85,6 +85,16 @@ public void setModelId(String modelId) {
 
     }
 
+    @Override
+    public String getModelName() {
+        return null;
+    }
+
+    @Override
+    public void setModelName(String modelName) {
+
+    }
+
     @Override
     public String getImei() {
         // TODO Auto-generated method stub

diff --git a/test/src/main/java/org/eclipse/kapua/test/device/DeviceMock.java b/test/src/main/java/org/eclipse/kapua/test/device/DeviceMock.java
@@ -179,6 +179,16 @@ public void setModelId(String modelId) {
 
     }
 
+    @Override
+    public String getModelName() {
+        return null;
+    }
+
+    @Override
+    public void setModelName(String modelName) {
+
+    }
+
     @Override
     public String getImei() {
         // TODO Auto-generated method stub