Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inc/relation.constant.php
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@
'_glpi_networkportaggregates' => 'networkports_id',
'_glpi_networkportaliases' => 'networkports_id',
'glpi_networkportaliases' => 'networkports_id_alias',
'glpi_networkportconnectionlogs' => [
'_glpi_networkportconnectionlogs' => [
'networkports_id_destination',
'networkports_id_source',
],
Expand Down
2 changes: 1 addition & 1 deletion src/CommonDBChild.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ abstract class CommonDBChild extends CommonDBConnexity


/**
* Get request cirteria to search for an item
* Get request criteria to search for an item
*
* @since 9.4
*
Expand Down
14 changes: 6 additions & 8 deletions src/NetworkPortConnectionLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@

/**
* Store ports connections log
*
* FIXME This class should inherit from CommonDBRelation, as it is linked
* to both 'networkports_id_source' and 'networkports_id_destination'
*/
class NetworkPortConnectionLog extends CommonDBChild
class NetworkPortConnectionLog extends CommonDBRelation
{
public static $itemtype = 'NetworkPort';
public static $items_id = 'networkports_id';
public $dohistory = false;
public static $itemtype_1 = NetworkPort::class;
public static $items_id_1 = 'networkports_id_source';
public static $itemtype_2 = NetworkPort::class;
public static $items_id_2 = 'networkports_id_destination';

public static function getTypeName($nb = 0)
{
Expand Down Expand Up @@ -116,7 +114,7 @@ public function showForItem(NetworkPort $netport, $user_filters = [])
htmlescape(trim($cport->fields['name']) === '' ? __('Without name') : $cport->fields['name'])
);

$entries = [
$entries[] = [
'status' => '<i class="ti ' . $co_class . '" title="' . $title . '"></i>',
'date' => $row['date'],
'connected_item' => sprintf(
Expand Down
110 changes: 110 additions & 0 deletions tests/functional/NetworkPortConnectionLogTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?php

/**
* ---------------------------------------------------------------------
*
* GLPI - Gestionnaire Libre de Parc Informatique
*
* http://glpi-project.org
*
* @copyright 2015-2025 Teclib' and contributors.
* @licence https://www.gnu.org/licenses/gpl-3.0.html
*
* ---------------------------------------------------------------------
*
* LICENSE
*
* This file is part of GLPI.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* ---------------------------------------------------------------------
*/

namespace tests\units;

use DbTestCase;

/* Test for inc/networkport_networkport.class.php */

class NetworkPortConnectionLogTest extends DbTestCase
{
private function createPort(\CommonDBTM $asset, string $mac): \NetworkPort
{
$port = new \NetworkPort();
$nb_log = (int) countElementsInTable('glpi_logs');
$ports_id = $port->add([
'items_id' => $asset->getID(),
'itemtype' => $asset->getType(),
'entities_id' => $asset->fields['entities_id'],
'is_recursive' => 0,
'logical_number' => 1,
'mac' => $mac,
'instantiation_type' => 'NetworkPortEthernet',
'name' => 'eth1',
]);
$this->assertGreaterThan(0, (int) $ports_id);
$this->assertGreaterThan($nb_log, countElementsInTable('glpi_logs'));

return $port;
}

public function testLogs()
{
$this->login();
$neteq1 = getItemByTypeName(\NetworkEquipment::class, '_test_networkequipment_1');
$port_1 = $this->createPort($neteq1, '00:24:81:eb:c6:d3');
$ports_id_1 = $port_1->getID();

$neteq2 = getItemByTypeName(\NetworkEquipment::class, '_test_networkequipment_2');
$port_2 = $this->createPort($neteq2, '00:24:81:eb:c6:d4');
$ports_id_2 = $port_2->getID();

$wired = new \NetworkPort_NetworkPort();
$this->assertGreaterThan(
0,
$wired->add([
'networkports_id_1' => $ports_id_1,
'networkports_id_2' => $ports_id_2,
])
);

$this->assertTrue($wired->getFromDBForNetworkPort($ports_id_1));
$this->assertTrue($wired->getFromDBForNetworkPort($ports_id_2));

$this->assertSame($ports_id_2, $wired->getOppositeContact($ports_id_1));
$this->assertSame($ports_id_1, $wired->getOppositeContact($ports_id_2));


//check connection log has been created
$connection_log = new \NetworkPortConnectionLog();
$logs = $connection_log->find();
$this->assertCount(1, $logs);
$log = array_pop($logs);
$this->assertSame(1, $log['connected']);
$this->assertSame($ports_id_1, $log['networkports_id_source']);
$this->assertSame($ports_id_2, $log['networkports_id_destination']);

//check for display
ob_start();
$connection_log->showForItem($port_1);
$contents = ob_get_clean();
$this->assertStringContainsString($neteq2->getLinkURL(), $contents);

ob_start();
$connection_log->showForItem($port_2);
$contents = ob_get_clean();
$this->assertStringContainsString($neteq1->getLinkURL(), $contents);
}
}