Skip to content

Commit

Permalink
Merge branch 'i-doit:main' into condition
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakoitde
rakoitde authored Aug 6, 2023
2 parents d321817 + 94075ed commit 8e762be
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 100 deletions.
16 changes: 0 additions & 16 deletions src/Console/Import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,6 @@ public function triggerJDiscDiscovery(array $options = []): array {
);
}

/**
* Import data from OCS Inventory NG instance
*
* @param array $options Options
*
* @return array Output (one value per line)
*
* @throws Exception on error
*/
public function importFromOCSInventoryNG(array $options = []): array {
return $this->execute(
'console.import.ocs',
$options
);
}

/**
* Import data from syslog
*
Expand Down
2 changes: 1 addition & 1 deletion tests/Idoit/APIClient/CMDBDialogTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public function testCreateWithoutParent() {
$this->assertArrayHasKey('const', $entry['parent']);
$this->assertEmpty($entry['parent']['const']);
$this->assertArrayHasKey('title', $entry['parent']);
$this->assertNull($entry['parent']['title']);
$this->assertEmpty($entry['parent']['title']);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Idoit/APIClient/CMDBObjectTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public function testCreateWithCategories() {
$objectID = $result['id'];
$modelEntryID = (int) $result['categories'][Category::CATG__MODEL][0];
$firstIPEntryID = $result['categories'][Category::CATG__IP][0];
$secondIPEntryID = $result['categories'][Category::CATG__IP][0];
$secondIPEntryID = $result['categories'][Category::CATG__IP][1];

$model = $this->useCMDBCategory()->readOneByID($objectID, Category::CATG__MODEL, $modelEntryID);
$this->assertArrayHasKey('id', $model);
Expand Down
2 changes: 0 additions & 2 deletions tests/Idoit/APIClient/Console/ConsoleTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ public function provideBlacklistedCommands(): array {
'' => ['console.tenant.add'],
'console.tenant.add' => ['console.tenant.disable'],
'console.tenant.enable' => ['console.tenant.enable'],
'console.tenant.list' => ['console.tenant.list'],
];
}

Expand All @@ -116,5 +115,4 @@ public function testExecuteBlacklistedCommand(string $blacklistedCommand) {
$result = $this->console->execute($blacklistedCommand);
$this->assertIsArray($result);
}

}
10 changes: 0 additions & 10 deletions tests/Idoit/APIClient/Console/ImportTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,6 @@ public function testImportFromHInventory() {
// $this->isOutput($result);
// }

/**
* @throws Exception on error
*/
public function testImportFromOCSInventoryNG() {
$result = $this->import->importFromOCSInventoryNG();

$this->assertIsArray($result);
$this->isOutput($result);
}

/**
* @throws Exception on error
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/Idoit/APIClient/Issues/API30Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function testIssue() {
$hostAID,
Category::CATG__CONNECTOR,
[
// … before selecting wich wire is rx/tx:
// … before selecting which wire is rx/tx:
'used_fiber_lead_rx' => $rxID,
'used_fiber_lead_tx' => $txID
],
Expand Down
133 changes: 64 additions & 69 deletions tests/Idoit/APIClient/Issues/API7Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,22 @@ public function testIssue() {
$this->assertSame($portA['connector'], $portsA[0]['connector']);
$this->assertArrayHasKey('assigned_connector', $portsA[0]);
$this->assertIsArray($portsA[0]['assigned_connector']);
$this->assertArrayHasKey(0, $portsA[0]['assigned_connector']);
$this->assertIsArray($portsA[0]['assigned_connector'][0]);
$this->assertArrayHasKey('name', $portsA[0]['assigned_connector'][0]);
$this->assertIsString($portsA[0]['assigned_connector'][0]['name']);
$this->assertSame($portBTitle, $portsA[0]['assigned_connector'][0]['name']);
$this->assertArrayHasKey('id', $portsA[0]['assigned_connector'][0]);
$this->isIDAsString($portsA[0]['assigned_connector'][0]['id']);
$this->assertSame($switchBID, (int) $portsA[0]['assigned_connector'][0]['id']);
$this->assertArrayHasKey('title', $portsA[0]['assigned_connector'][0]);
$this->assertIsString($portsA[0]['assigned_connector'][0]['title']);
$this->assertSame($switchBTitle, $portsA[0]['assigned_connector'][0]['title']);
$this->assertArrayHasKey('type', $portsA[0]['assigned_connector'][0]);
$this->assertIsString($portsA[0]['assigned_connector'][0]['type']);
$this->assertSame($objectType, $portsA[0]['assigned_connector'][0]['type']);
$this->assertArrayHasKey('assigned_category', $portsA[0]['assigned_connector'][0]);
$this->assertIsString($portsA[0]['assigned_connector'][0]['assigned_category']);
$this->assertSame($categoryConstant, $portsA[0]['assigned_connector'][0]['assigned_category']);
$this->assertIsArray($portsA[0]['assigned_connector']);
$this->assertArrayHasKey('name', $portsA[0]['assigned_connector']);
$this->assertIsString($portsA[0]['assigned_connector']['name']);
$this->assertSame($portBTitle, $portsA[0]['assigned_connector']['name']);
$this->assertArrayHasKey('id', $portsA[0]['assigned_connector']);
$this->isIDAsString($portsA[0]['assigned_connector']['id']);
$this->assertSame($switchBID, (int) $portsA[0]['assigned_connector']['id']);
$this->assertArrayHasKey('title', $portsA[0]['assigned_connector']);
$this->assertIsString($portsA[0]['assigned_connector']['title']);
$this->assertSame($switchBTitle, $portsA[0]['assigned_connector']['title']);
$this->assertArrayHasKey('type', $portsA[0]['assigned_connector']);
$this->assertIsString($portsA[0]['assigned_connector']['type']);
$this->assertSame($objectType, $portsA[0]['assigned_connector']['type']);
$this->assertArrayHasKey('assigned_category', $portsA[0]['assigned_connector']);
$this->assertIsString($portsA[0]['assigned_connector']['assigned_category']);
$this->assertSame($categoryConstant, $portsA[0]['assigned_connector']['assigned_category']);

$connectorsA = $this->useCMDBCategory()->read($switchAID, Category::CATG__CONNECTOR);

Expand All @@ -161,23 +160,22 @@ public function testIssue() {
$this->isIDAsString($connectorsA[0]['assigned_category']['value']);
$this->assertArrayHasKey('assigned_connector', $connectorsA[0]);
$this->assertIsArray($connectorsA[0]['assigned_connector']);
$this->assertArrayHasKey(0, $connectorsA[0]['assigned_connector']);
$this->assertIsArray($connectorsA[0]['assigned_connector'][0]);
$this->assertArrayHasKey('name', $connectorsA[0]['assigned_connector'][0]);
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['name']);
$this->assertSame($portBTitle, $connectorsA[0]['assigned_connector'][0]['name']);
$this->assertArrayHasKey('id', $connectorsA[0]['assigned_connector'][0]);
$this->isIDAsString($connectorsA[0]['assigned_connector'][0]['id']);
$this->assertSame($switchBID, (int) $connectorsA[0]['assigned_connector'][0]['id']);
$this->assertArrayHasKey('title', $connectorsA[0]['assigned_connector'][0]);
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['title']);
$this->assertSame($switchBTitle, $connectorsA[0]['assigned_connector'][0]['title']);
$this->assertArrayHasKey('type', $connectorsA[0]['assigned_connector'][0]);
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['type']);
$this->assertSame($objectType, $connectorsA[0]['assigned_connector'][0]['type']);
$this->assertArrayHasKey('assigned_category', $connectorsA[0]['assigned_connector'][0]);
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['assigned_category']);
$this->assertSame($categoryConstant, $connectorsA[0]['assigned_connector'][0]['assigned_category']);
$this->assertIsArray($connectorsA[0]['assigned_connector']);
$this->assertArrayHasKey('name', $connectorsA[0]['assigned_connector']);
$this->assertIsString($connectorsA[0]['assigned_connector']['name']);
$this->assertSame($portBTitle, $connectorsA[0]['assigned_connector']['name']);
$this->assertArrayHasKey('id', $connectorsA[0]['assigned_connector']);
$this->isIDAsString($connectorsA[0]['assigned_connector']['id']);
$this->assertSame($switchBID, (int) $connectorsA[0]['assigned_connector']['id']);
$this->assertArrayHasKey('title', $connectorsA[0]['assigned_connector']);
$this->assertIsString($connectorsA[0]['assigned_connector']['title']);
$this->assertSame($switchBTitle, $connectorsA[0]['assigned_connector']['title']);
$this->assertArrayHasKey('type', $connectorsA[0]['assigned_connector']);
$this->assertIsString($connectorsA[0]['assigned_connector']['type']);
$this->assertSame($objectType, $connectorsA[0]['assigned_connector']['type']);
$this->assertArrayHasKey('assigned_category', $connectorsA[0]['assigned_connector']);
$this->assertIsString($connectorsA[0]['assigned_connector']['assigned_category']);
$this->assertSame($categoryConstant, $connectorsA[0]['assigned_connector']['assigned_category']);

// …and switch B:
$portsB = $this->useCMDBCategory()->read($switchBID, $categoryConstant);
Expand All @@ -199,23 +197,22 @@ public function testIssue() {
$this->assertSame($portB['connector'], $portsB[0]['connector']);
$this->assertArrayHasKey('assigned_connector', $portsB[0]);
$this->assertIsArray($portsB[0]['assigned_connector']);
$this->assertArrayHasKey(0, $portsB[0]['assigned_connector']);
$this->assertIsArray($portsB[0]['assigned_connector'][0]);
$this->assertArrayHasKey('name', $portsB[0]['assigned_connector'][0]);
$this->assertIsString($portsB[0]['assigned_connector'][0]['name']);
$this->assertSame($portATitle, $portsB[0]['assigned_connector'][0]['name']);
$this->assertArrayHasKey('id', $portsB[0]['assigned_connector'][0]);
$this->isIDAsString($portsB[0]['assigned_connector'][0]['id']);
$this->assertSame($switchAID, (int) $portsB[0]['assigned_connector'][0]['id']);
$this->assertArrayHasKey('title', $portsB[0]['assigned_connector'][0]);
$this->assertIsString($portsB[0]['assigned_connector'][0]['title']);
$this->assertSame($switchATitle, $portsB[0]['assigned_connector'][0]['title']);
$this->assertArrayHasKey('type', $portsB[0]['assigned_connector'][0]);
$this->assertIsString($portsB[0]['assigned_connector'][0]['type']);
$this->assertSame($objectType, $portsB[0]['assigned_connector'][0]['type']);
$this->assertArrayHasKey('assigned_category', $portsB[0]['assigned_connector'][0]);
$this->assertIsString($portsB[0]['assigned_connector'][0]['assigned_category']);
$this->assertSame($categoryConstant, $portsB[0]['assigned_connector'][0]['assigned_category']);
$this->assertIsArray($portsB[0]['assigned_connector']);
$this->assertArrayHasKey('name', $portsB[0]['assigned_connector']);
$this->assertIsString($portsB[0]['assigned_connector']['name']);
$this->assertSame($portATitle, $portsB[0]['assigned_connector']['name']);
$this->assertArrayHasKey('id', $portsB[0]['assigned_connector']);
$this->isIDAsString($portsB[0]['assigned_connector']['id']);
$this->assertSame($switchAID, (int) $portsB[0]['assigned_connector']['id']);
$this->assertArrayHasKey('title', $portsB[0]['assigned_connector']);
$this->assertIsString($portsB[0]['assigned_connector']['title']);
$this->assertSame($switchATitle, $portsB[0]['assigned_connector']['title']);
$this->assertArrayHasKey('type', $portsB[0]['assigned_connector']);
$this->assertIsString($portsB[0]['assigned_connector']['type']);
$this->assertSame($objectType, $portsB[0]['assigned_connector']['type']);
$this->assertArrayHasKey('assigned_category', $portsB[0]['assigned_connector']);
$this->assertIsString($portsB[0]['assigned_connector']['assigned_category']);
$this->assertSame($categoryConstant, $portsB[0]['assigned_connector']['assigned_category']);

$connectorsB = $this->useCMDBCategory()->read($switchBID, Category::CATG__CONNECTOR);

Expand All @@ -235,23 +232,21 @@ public function testIssue() {
$this->isIDAsString($connectorsB[0]['assigned_category']['value']);
$this->assertArrayHasKey('assigned_connector', $connectorsB[0]);
$this->assertIsArray($connectorsB[0]['assigned_connector']);
$this->assertArrayHasKey(0, $connectorsB[0]['assigned_connector']);
$this->assertIsArray($connectorsB[0]['assigned_connector'][0]);
$this->assertArrayHasKey('name', $connectorsB[0]['assigned_connector'][0]);
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['name']);
$this->assertSame($portATitle, $connectorsB[0]['assigned_connector'][0]['name']);
$this->assertArrayHasKey('id', $connectorsB[0]['assigned_connector'][0]);
$this->isIDAsString($connectorsB[0]['assigned_connector'][0]['id']);
$this->assertSame($switchAID, (int) $connectorsB[0]['assigned_connector'][0]['id']);
$this->assertArrayHasKey('title', $connectorsB[0]['assigned_connector'][0]);
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['title']);
$this->assertSame($switchATitle, $connectorsB[0]['assigned_connector'][0]['title']);
$this->assertArrayHasKey('type', $connectorsB[0]['assigned_connector'][0]);
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['type']);
$this->assertSame($objectType, $connectorsB[0]['assigned_connector'][0]['type']);
$this->assertArrayHasKey('assigned_category', $connectorsB[0]['assigned_connector'][0]);
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['assigned_category']);
$this->assertSame($categoryConstant, $connectorsB[0]['assigned_connector'][0]['assigned_category']);
$this->assertIsArray($connectorsB[0]['assigned_connector']);
$this->assertArrayHasKey('name', $connectorsB[0]['assigned_connector']);
$this->assertIsString($connectorsB[0]['assigned_connector']['name']);
$this->assertSame($portATitle, $connectorsB[0]['assigned_connector']['name']);
$this->assertArrayHasKey('id', $connectorsB[0]['assigned_connector']);
$this->isIDAsString($connectorsB[0]['assigned_connector']['id']);
$this->assertSame($switchAID, (int) $connectorsB[0]['assigned_connector']['id']);
$this->assertArrayHasKey('title', $connectorsB[0]['assigned_connector']);
$this->assertIsString($connectorsB[0]['assigned_connector']['title']);
$this->assertSame($switchATitle, $connectorsB[0]['assigned_connector']['title']);
$this->assertArrayHasKey('type', $connectorsB[0]['assigned_connector']);
$this->assertIsString($connectorsB[0]['assigned_connector']['type']);
$this->assertSame($objectType, $connectorsB[0]['assigned_connector']['type']);
$this->assertArrayHasKey('assigned_category', $connectorsB[0]['assigned_connector']);
$this->assertIsString($connectorsB[0]['assigned_connector']['assigned_category']);
$this->assertSame($categoryConstant, $connectorsB[0]['assigned_connector']['assigned_category']);
}

}

0 comments on commit 8e762be

Please sign in to comment.