Added choreography name on EE virtual machines list

choremocks/src/main/java/eu/chorevolution/idm/choremocks/ee/MonitoringResource.java

@@ -42,6 +42,8 @@ public class MonitoringResource implements MonitoringApi {
 	public Response getEngineVirtualMachines() {
             VirtualMachineInfoTO info1 = new VirtualMachineInfoTO();
             info1.setKey("vm001");
+            info1.setChorId("xx45671");
+            info1.setChorDisplay("In-store Marketing and Sales");
             info1.setSysOp("Ubuntu 16.10");
             info1.setIp("192.168.0.11");
             info1.setHostname("localhost");
@@ -56,6 +58,8 @@ public class MonitoringResource implements MonitoringApi {
 
             VirtualMachineInfoTO info2 = new VirtualMachineInfoTO();
             info2.setKey("vm002");
+            info2.setChorId("xx45671");
+            info2.setChorDisplay("In-store Marketing and Sales");
             info2.setSysOp("Ubuntu 16.10");
             info2.setIp("192.168.0.12");
             info2.setHostname("localhost");
@@ -70,6 +74,8 @@ public class MonitoringResource implements MonitoringApi {
 
             VirtualMachineInfoTO info3 = new VirtualMachineInfoTO();
             info3.setKey("vm003");
+            info3.setChorId("ww45672");
+            info3.setChorDisplay("Smart Mobility and Tourism");
             info3.setSysOp("Ubuntu 16.10");
             info3.setIp("192.168.0.13");
             info3.setHostname("localhost");
@@ -84,6 +90,8 @@ public class MonitoringResource implements MonitoringApi {
 
             VirtualMachineInfoTO info4 = new VirtualMachineInfoTO();
             info4.setKey("vm004");
+            info4.setChorId("ww45672");
+            info4.setChorDisplay("Smart Mobility and Tourism");
             info4.setSysOp("Ubuntu 16.10");
             info4.setIp("192.168.0.14");
             info4.setHostname("localhost");
@@ -140,6 +148,8 @@ public class MonitoringResource implements MonitoringApi {
 
             VirtualMachineInfoTO info1 = new VirtualMachineInfoTO();
             info1.setKey("vm001");
+            info1.setChorId(choreographyId);
+            info1.setChorDisplay("In-store Marketing and Sales");
             info1.setSysOp("Ubuntu 16.10");
             info1.setIp("192.168.0.11");
             info1.setHostname("localhost");
@@ -154,6 +164,8 @@ public class MonitoringResource implements MonitoringApi {
 
             VirtualMachineInfoTO info2 = new VirtualMachineInfoTO();
             info2.setKey("vm002");
+            info2.setChorId(choreographyId);
+            info2.setChorDisplay("In-store Marketing and Sales");
             info2.setSysOp("Ubuntu 16.10");
             info2.setIp("192.168.0.12");
             info2.setHostname("localhost");

ext/choreography/common-lib/src/main/java/eu/chorevolution/idm/common/to/VirtualMachineInfoTO.java

@@ -23,6 +23,10 @@ public class VirtualMachineInfoTO extends AbstractBaseBean {
 
     private String key;
 
+    private String chorId;
+
+    private String chorDisplay;
+
     private String ip;
 
     private String hostname;
@@ -55,6 +59,22 @@ public class VirtualMachineInfoTO extends AbstractBaseBean {
         this.key = key;
     }
 
+    public String getChorId() {
+        return chorId;
+    }
+
+    public void setChorId(final String chorId) {
+        this.chorId = chorId;
+    }
+
+    public String getChorDisplay() {
+        return chorDisplay;
+    }
+
+    public void setChorDisplay(final String chorDisplay) {
+        this.chorDisplay = chorDisplay;
+    }
+
     public String getIp() {
         return ip;
     }

ext/ee/client-console/src/main/java/org/apache/syncope/client/console/panels/EEVMDirectoryPanel.java

@@ -117,8 +117,8 @@ public class EEVMDirectoryPanel extends DirectoryPanel<
             }
         });
 
-        //columns.add(new PropertyColumn<>(new ResourceModel(
-        //        "choreography", "Deployed Choreography"), "Deployed Choreography", "choreography"));
+        columns.add(new PropertyColumn<>(new ResourceModel(
+                "chorDisplay", "Choreography"), "Choreography", "chorDisplay"));
         columns.add(new PropertyColumn<>(new ResourceModel("sysOp", "OS"), "OS", "sysOp"));
         columns.add(new PropertyColumn<>(new ResourceModel("ip", "IP Address"), "IP Address", "ip"));
         columns.add(new PropertyColumn<>(new ResourceModel("hostname", "Hostname"), "Hostname", "hostname"));