diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index 843c28a282..45865e6c4b 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -1999,6 +1999,19 @@ if (class_exists('SANSwitch')) { $aRels['SANSwitch'] = array("sQuery"=>"SELECT SANSwitch AS san JOIN lnkSanToDatacenterDevice AS l1 ON l1.san_id = san.id WHERE l1.datacenterdevice_id = :this->id", "bPropagate"=>true, "iDistance"=>10); + } + if (class_exists('PowerConnection')) + { + $aRels['PowerA'] = array( + "sQuery"=>"SELECT PowerConnection WHERE id = :this->powerA_id", + "bPropagate"=>true, + "iDistance"=>10 + ); + $aRels['PowerB'] = array( + "sQuery"=>"SELECT PowerConnection WHERE id = :this->powerB_id", + "bPropagate"=>true, + "iDistance"=>10 + ); } return array_merge($aRels, parent::GetRelationQueries($sRelCode)); break; diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml index 48dae29911..eba9f40528 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml +++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml @@ -428,15 +428,12 @@ $aRels = array( "DatacenterDevice" => array("sQuery"=>"SELECT DatacenterDevice WHERE powerA_id = :this->id OR powerB_id = :this->id", "bPropagate"=>true, "iDistance"=>10), "pdu" => array("sQuery"=>"SELECT PDU WHERE powerstart_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - ); return array_merge($aRels, parent::GetRelationQueries($sRelCode)); break; case 'depends on': - $aRels = array( - ); return array_merge($aRels, parent::GetRelationQueries($sRelCode)); break; @@ -788,7 +785,34 @@ name - + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT PowerConnection WHERE id = :this->powerstart_id", "bPropagate"=>true, "iDistance"=>10), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + +