probe-list/detail modified

@overflow/probe/component/probe-host.component.html

@@ -4,35 +4,52 @@
 <p-panel #content [showHeader]="false" class="block-panel">
 
   <div class="ui-g">
-      <div class="ui-g-6 ui-nopad">
-        <h3>Host</h3>
-      </div>
-  
-      <div class="ui-g-6 nopad" dir="rtl" style="padding-top: 15px">
-      </div>
+    <div class="ui-g-6 ui-nopad">
+      <h3>Host</h3>
     </div>
-  
-    <!-- Host info -->
+
+    <div class="ui-g-6 nopad" dir="rtl" style="padding-top: 15px">
+    </div>
+  </div>
+
+  <!-- Host info -->
   <div class="ui-g ui-bottom-space-10">
     <div class="ui-g-12 ui-nopad">
       <p-panel [showHeader]="false">
         <div *ngIf="infraHost">
           <div class="ui-g">
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'IPv4'" [value]="infraHost.ipv4"></of-key-value>
+              <of-key-value [key]="'IP ver'" [value]="infraHost.infraZone.metaIPType.value"></of-key-value>
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'IPv6'" [value]="infraHost.ipv6 | uppercase"></of-key-value>
+              <of-key-value [key]="'CIDR'" [value]="infraHost.infraZone.network"></of-key-value>
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'Mac Address'" [value]="infraHost.mac"></of-key-value>
+              <of-key-value [key]="'Interface'" [value]="infraHost.infraZone.iface"></of-key-value>
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'OS'" [value]="infraHost.infraOS.metaInfraVendor.name"></of-key-value>
+              <of-key-value [key]="'Host Type'" [value]="infraHost.metaTargetHostType.value"></of-key-value>
             </div>
+
+            <div class="ui-g-12 ui-md-6 ui-key-value">
+              <of-key-value [key]="'Host IP'" [value]="infraHost.infraZone.address"></of-key-value>
+            </div>
+
+            <div class="ui-g-12 ui-md-6 ui-key-value">
+              <of-key-value [key]="'Host Mac'" [value]="infraHost.infraZone.mac"></of-key-value>
+            </div>
+
+            <div class="ui-g-12 ui-md-6 ui-key-value">
+              <of-key-value [key]="'Host OS'" [value]="infraHost.infraHostOS.name"></of-key-value>
+            </div>
+
+            <div class="ui-g-12 ui-md-6 ui-key-value">
+              <of-host-ips-overlay [infraHostIPs]="infraHost.infraHostIPs"></of-host-ips-overlay>
+            </div>
+
           </div>
         </div>
       </p-panel>

@overflow/probe/component/probe-list.component.html

@@ -8,9 +8,10 @@
       <tr>
         <th>Probe Name</th>
         <th>Uptime</th>
-        <th style="width:10em">IP</th>
-        <th style="width:8em">OS</th>
         <th style="width:10em">CIDR</th>
+        <th style="width:10em">Host IP</th>
+        <th style="width:8em">OS</th>
+        <th style="width:10em">Iface</th>
         <th pResizableColumn>Targets</th>
         <th style="width:8em">Authroized at</th>
         <th style="width:9em">Authroized by</th>
@@ -20,9 +21,10 @@
       <tr [pSelectableRow]="probeHost">
         <td>{{probeHost.probe.name}}</td>
         <td>{{getUptime(probeHost.probe)}}</td>
-        <td></td>
-        <td></td>
         <td>{{probeHost.probe.cidr}}</td>
+        <td>{{probeHost.infraHost.infraHostIP[0].address}}</td>
+        <td>{{probeHost.infraHost.infraHostOS.name}}</td>
+        <td>{{probeHost.infraHost.infraZone.iface}}</td>
         <td>{{probeHost.probe.targetCount}}</td>
         <td>{{probeHost.probe.authorizeDate | date: 'dd.MM.yyyy'}}</td>
         <td>{{probeHost.probe.authorizeMember.name}}</td>