added gpuDesc

Author: martin-kuba

pbsmon/src/main/webapp/WEB-INF/tags/resource.tag

@@ -13,6 +13,12 @@
         <th>RAM</th>
         <td><c:out value='${resource.memory}'/></td>
     </tr>
+    <c:if test="${not empty resource.gpuDesc}">
+    <tr>
+        <th>GPU</th>
+        <td><c:out value='${resource.gpuDesc}'/></td>
+    </tr>
+    </c:if>
     <tr>
         <th>disk</th>
         <td><f:message key="${resource.diskKey}"/></td>

perun_machines/src/main/java/cz/cesnet/meta/perun/api/VypocetniZdroj.java

@@ -14,6 +14,7 @@ public class VypocetniZdroj implements Serializable {
     private String photo;
     private String thumbnail;
     private String cpuDesc;
+    private String gpuDesc;
     private String memory;
 
     private Stroj stroj;
@@ -96,6 +97,7 @@ public String toString() {
                 ", photo='" + photo + '\'' +
                 ", thumbnail='" + thumbnail + '\'' +
                 ", cpuDesc='" + cpuDesc + '\'' +
+                ", gpuDesc='" + gpuDesc + '\'' +
                 ", memory='" + memory + '\'' +
                 ", voNames=" + voNames +
                 '}';
@@ -139,6 +141,14 @@ public void setCpuDesc(String cpuDesc) {
         this.cpuDesc = cpuDesc;
     }
 
+    public String getGpuDesc() {
+        return gpuDesc;
+    }
+
+    public void setGpuDesc(String gpuDesc) {
+        this.gpuDesc = gpuDesc;
+    }
+
     public String getMemory() {
         return memory;
     }

perun_machines/src/main/java/cz/cesnet/meta/perun/impl/PerunJsonImpl.java

@@ -91,8 +91,7 @@ private static String getString(JSONObject jsonObject, String key) {
         JSONValue value = jsonObject.get(key);
         if (value == null || value.isNull()) return "";
         if (value.isString()) {
-            JSONString jsonString = (JSONString) value;
-            return jsonString.getValue();
+            return ((JSONString) value).getValue();
         }
         throw new RuntimeException("value for key " + key + " must be string, it is " + value);
     }
@@ -170,6 +169,7 @@ private VypocetniZdroj nactiVypocetniZdroj(Map<String, Map<String, String>> text
         zdroj.setPhoto(getString(jzdroj, "photo"));
         zdroj.setThumbnail(getString(jzdroj, "thumbnail"));
         zdroj.setCpuDesc(getString(jzdroj, "cpudesc"));
+        zdroj.setGpuDesc(getString(jzdroj, "gpudesc"));
         zdroj.setMemory(getString(jzdroj, "memory"));
         nactiTexty("resource " + zid, texty, jzdroj, zdroj.getDiskKey(), "disk");
         nactiTexty("resource " + zid, texty, jzdroj, zdroj.getNetworkKey(), "network");