deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistency updates

Browse Source
This commit is contained in:
Deon George
2012-12-06 16:19:30 +11:00
parent 528a83a4fd
commit df498a76a7
9 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/classes/Model/DOMAIN.php
View File

@@ -154,7 +154,7 @@ class Model_DOMAIN extends ORM_TSM {
/**
* Return the STORAGE POOLS that NODES in this DOMAIN uses by BACKUP TYPE
* @param $type is BACKUP/ARCHIVE/SPACE MANAGED
* @param $type is Bkup/Arch/SpMg
*/
public function stgpools_bybtype($type) {
$k = sprintf('%s-%s-%s',__METHOD__,$this->DOMAIN_NAME,$type);
@@ -228,7 +228,7 @@ class Model_DOMAIN extends ORM_TSM {
* Return the VOLUMES that NODES in this DOMAIN uses by BACKUP TYPE
* @param $type is BACKUP/ARCHIVE/SPACE MANAGED
*/
public function vols_bybtype($type) {
public function vols_byctype($type) {
$k = sprintf('%s-%s-%s',__METHOD__,$this->DOMAIN_NAME,$type);
$c = Kohana::$config->load('config')->cache;
@@ -236,7 +236,7 @@ class Model_DOMAIN extends ORM_TSM {
$x = $result = array();
foreach ($this->_nodes() as $no)
foreach ($no->vols_bybtype($type) as $vuo)
foreach ($no->vols_byctype($type) as $vuo)
if (! in_array($vuo->VOLUME_NAME,$x)) {
array_push($result,$vuo);
array_push($x,$vuo->VOLUME_NAME);
@@ -254,7 +254,7 @@ class Model_DOMAIN extends ORM_TSM {
* @param $pool is STORAGE POOL NAME
* @param $type is BACKUP/ARCHIVE/SPACE MANAGED
*/
public function vols_bypoolbybtype($pool,$type) {
public function vols_bypoolbyctype($pool,$type) {
$x = $result = array();
foreach ($this->vols_bypool($pool) as $vuo)