From fe549c1c05ef5419842bff9aea4567a1bbd64f1e Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Sun, 29 May 2011 11:41:36 +1000
Subject: [PATCH] Additional info for node display

---
 application/classes/model/node.php            | 26 +++++++++++++++----
 application/classes/model/volumeusage.php     |  1 +
 application/views/nodes/detail_filesystem.php | 15 +++++++++--
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/application/classes/model/node.php b/application/classes/model/node.php
index a5a311b..d543222 100644
--- a/application/classes/model/node.php
+++ b/application/classes/model/node.php
@@ -132,8 +132,12 @@ class Model_NODE extends ORMTSM {
 		return $this->pools[$dtype];
 	}
 
+	public function getAllStoragePoolsType($ptype) {
+		return array_merge($this->getStoragePoolsType('Bkup',$ptype),$this->getStoragePoolsType('Arch',$ptype));
+	}
+
 	// Return the storage pools used for a backup type
-	// $dtype is BACKUP or ARCHIVE
+	// $dtype is BACKUP (Bkup) or ARCHIVE (Arch)
 	// $ptype is pool type (PRIMARY,ACTIVE,COPY)
 	public function getStoragePoolsType($dtype,$ptype) {
 		if (! isset($this->pools[$dtype]))
@@ -143,24 +147,36 @@ class Model_NODE extends ORMTSM {
 	}
 
 	// @todo This routine should be cached.
-	public function getStorageTypeFiles($type) {
+	public function getStorageTypeVols($type,$spo='') {
+		$count = array();
+
+		foreach ($this->VOLUMEUSAGE->find_all() as $vo)
+			if ((! $spo OR $vo->STGPOOL_NAME == $spo) AND $vo->STGPOOL->POOLTYPE == $type)
+				if (! in_array($vo->VOLUME_NAME,$count))
+					array_push($count,$vo->VOLUME_NAME);
+
+		return count($count);
+	}
+
+	// @todo This routine should be cached.
+	public function getStorageTypeFiles($type,$spo='') {
 		$count = 0;
 
 		foreach ($this->FILESPACE->find_all() as $fo)
 			foreach ($fo->OCCUPANCY->find_all() as $oa)
-				if ($oa->STGPOOL->POOLTYPE == $type)
+				if ((! $spo OR $oa->STGPOOL_NAME == $spo) AND $oa->STGPOOL->POOLTYPE == $type)
 					$count += $oa->NUM_FILES;
 
 		return $count;
 	}
 
 	// @todo This routine should be cached.
-	public function getStorageTypeData($type) {
+	public function getStorageTypeData($type,$spo='') {
 		$count = 0;
 
 		foreach ($this->FILESPACE->find_all() as $fo)
 			foreach ($fo->OCCUPANCY->find_all() as $oa)
-				if ($oa->STGPOOL->POOLTYPE == $type)
+				if ((! $spo OR $oa->STGPOOL_NAME == $spo) AND $oa->STGPOOL->POOLTYPE == $type)
 					$count += $oa->LOGICAL_MB;
 
 		return $count;
diff --git a/application/classes/model/volumeusage.php b/application/classes/model/volumeusage.php
index 039e80e..dd763de 100644
--- a/application/classes/model/volumeusage.php
+++ b/application/classes/model/volumeusage.php
@@ -19,6 +19,7 @@ class Model_VOLUMEUSAGE extends ORMTSM {
 	);
 
 	protected $_has_one = array(
+		'STGPOOL'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'),
 		'VOLUME'=>array('foreign_key'=>'VOLUME_NAME','far_key'=>'VOLUME_NAME'),
 	);
 }
diff --git a/application/views/nodes/detail_filesystem.php b/application/views/nodes/detail_filesystem.php
index 7214754..4eaba4d 100644
--- a/application/views/nodes/detail_filesystem.php
+++ b/application/views/nodes/detail_filesystem.php
@@ -45,16 +45,27 @@
 					<td class="spacer">&nbsp;</td>
 				</tr>
 				<tr>
-					<td>Storage Type</td>
+					<td colspan="2">Storage Type</td>
+					<td class="right">Vols</td>
 					<td class="right">Files</td>
 					<td class="right">MB</td>
 				</tr>
 				<?php $i=0; foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
 				<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
-					<td class="data"><?php echo $type; ?></td>
+					<td class="data" colspan="2"><?php echo $type; ?></td>
+					<td class="data-right"><?php echo $node->getStorageTypeVols($type); ?></td>
 					<td class="data-right"><?php echo $node->getStorageTypeFiles($type); ?></td>
 					<td class="data-right"><?php echo $node->getStorageTypeData($type); ?></td>
 				</tr>
+				<?php foreach ($node->getAllStoragePoolsType($type) as $spo) { ?>
+				<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
+					<td>&nbsp;</td>
+					<td><?php echo $spo; ?></td>
+					<td class="right"><?php echo $node->getStorageTypeVols($type,$spo); ?></td>
+					<td class="right"><?php echo $node->getStorageTypeFiles($type,$spo); ?></td>
+					<td class="right"><?php echo $node->getStorageTypeData($type,$spo); ?></td>
+				</tr>
+				<?php } ?>
 				<?php } ?>
 			</table>
 		</td>