From ad406723eb48d6dc2c80268c0159c51ab05c9195 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 4 Jul 2010 18:47:55 +0000
Subject: [PATCH] cleanups

git-svn-id: http://www.observium.org/svn/observer/trunk@1289 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/cisco-vrf.inc.php | 8 +++-----
 includes/discovery/ups.inc.php       | 5 ++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/includes/discovery/cisco-vrf.inc.php b/includes/discovery/cisco-vrf.inc.php
index 8a1895996..b068d67b6 100755
--- a/includes/discovery/cisco-vrf.inc.php
+++ b/includes/discovery/cisco-vrf.inc.php
@@ -1,7 +1,7 @@
 <?php
 
-#if($device['os_group'] == "ios") 
-#{
+if($device['os_group'] == "ios" || $device['os_group'] == "junos" || $device['os'] == "ironware") 
+{
 
   unset( $vrf_count );
 
@@ -53,8 +53,6 @@
    }
   }
 
-  echo("\n");
-
   $sql   = "SELECT * FROM ports WHERE device_id = '" . $device['device_id'] . "'";
     $data = mysql_query($sql);
     while($row = mysql_fetch_array($data)) {
@@ -81,6 +79,6 @@
 
   echo("\n");
 
-#}
+}
 
 ?>
diff --git a/includes/discovery/ups.inc.php b/includes/discovery/ups.inc.php
index e55befb6e..351eff93a 100644
--- a/includes/discovery/ups.inc.php
+++ b/includes/discovery/ups.inc.php
@@ -6,5 +6,8 @@ $community = $device['community'];
 $snmpver = $device['snmpver'];
 $port = $device['port'];
 
-echo("UPS : ");
+#echo("UPS : ");
+
+
+
 ?>