r1439 + read VS name and render it

+ a dragon for a VS :)

diff --git a/inc/database.php b/inc/database.php
index 705181e203bcf51227184e9fe37c3d7683c1f2a4..28cf97c76f4e8820e843f06816c56e40b9f43f05 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -1995,7 +1995,7 @@ function getSLBSummary ()
                if (!isset ($ret[$vsid]))
                {
                        $ret[$vsid] = array();
-                       foreach (array ('vip', 'vport', 'proto') as $cname)
+                       foreach (array ('vip', 'vport', 'proto', 'name') as $cname)
                                $ret[$vsid][$cname] = $row[$cname];
                        $ret[$vsid]['rspools'] = array();
                }

diff --git a/inc/interface.php b/inc/interface.php
index de0a7c682965cf8d7d8a0074555d189a76a476d6..53e181481b4c2f3e3cbf40f0cbd34b68618d7ca2 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -1655,7 +1655,7 @@ function renderAddressspace ()
        else
        {
                echo "<table class='widetable' border=0 cellpadding=5 cellspacing=0 align='center'>\n";
-               echo "<tr><th>&nbsp;</th>";
+               echo "<tr><th>VIP</th><th>Name</th>";
                foreach ($lblist as $lb_object_id)
                        echo "<th><a href='$root?page=object&tab=default&object_id=${lb_object_id}'>" . $lbdname[$lb_object_id]  . "</a></th>";
                echo "</tr>\n";
@@ -1663,6 +1663,7 @@ function renderAddressspace ()
                {
                        echo "<tr><td class=tdleft><a href='$root?page=vservice&tab=default&id=${vsid}'>";
                        echo $vsdata['vip'] . ':' . $vsdata['vport'] . '/' . $vsdata['proto'] . '</a></td>';
+                       echo "<td>${vsdata['name']}</td>";
                        foreach ($lblist as $lb_object_id)
                                echo '<td>' . (isset ($vsdata['rspools'][$lb_object_id]) ? $vsdata['rspools'][$lb_object_id] : '&nbsp;') . '</td>';
                        echo "</tr>";
@@ -3578,4 +3579,9 @@ function renderLVSConfig ($object_id = 0)
        echo '</pre>';
 }
 
+function renderVirtualService ()
+{
+       dragon();
+}
+
 ?>