New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import simcards, and factorize code #2393

Merged
merged 6 commits into from Jan 8, 2018

Conversation

Projects
None yet
2 participants
@wawax
Member

wawax commented Dec 27, 2017

Import simcard and firmwares for network devices and printers.

@wawax wawax added feature wip labels Dec 27, 2017

@wawax wawax self-assigned this Dec 27, 2017

@wawax wawax requested a review from ddurieux Dec 27, 2017

@wawax wawax removed the wip label Dec 27, 2017

@wawax wawax requested review from trasher and orthagh Jan 4, 2018

@wawax wawax added this to the 9.1+2.0 milestone Jan 4, 2018

@@ -253,7 +257,7 @@ function internalPorts($a_ips, $networkequipments_id, $mac, $networkname_name) {
* @param array $a_inventory
* @param integer $items_id
*/
function importPorts($a_inventory, $items_id) {
function importPorts($itemtype, $a_inventory, $items_id) {

This comment has been minimized.

@trasher

trasher Jan 4, 2018

Collaborator

Should not this one be replaced with PluginFusioninventoryInventoryCommon::importPorts?

This comment has been minimized.

@wawax

wawax Jan 4, 2018

Member

I decided not to do it, because the code of a networkequipment import is much more complex than the rest and it would take much more time.
What I can do it adding a todo not to forget

This comment has been minimized.

@trasher

trasher Jan 4, 2018

Collaborator

OK for me, and OK to add a comment :)

This comment has been minimized.

@wawax

wawax Jan 4, 2018

Member

done

@@ -9,7 +9,7 @@
<target name="phpunit.unit.custom" depends='plugin-fusioninventory.prepare' description="Run unit tests with PHPUnit">
<phpunit.run type="custom" configuration='${fusioninventory.directory}/phpunit/testsuites_integration.xml'>
<testfile>
<arg path='${tests.directory}/2_Integration/Tasks/CronTaskTest.php' />
<arg path='${tests.directory}/1_Unit/PrinterTransformationTest.php' />

This comment has been minimized.

@trasher

trasher Jan 4, 2018

Collaborator

Do not commit this one to prevent conflicts

@trasher

trasher approved these changes Jan 4, 2018

LGTM

@trasher

trasher approved these changes Jan 8, 2018

Try to avoid changes on custom-build.xml ;)
Still OK for me

@wawax wawax merged commit e1b326a into fusioninventory:glpi9.2 Jan 8, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@trasher trasher deleted the TECLIB:import_simcards branch Jan 8, 2018

wawax pushed a commit that referenced this pull request Jan 8, 2018

mohierf added a commit to mohierf/fusioninventory-for-glpi that referenced this pull request Jan 19, 2018

@wawax wawax modified the milestones: 9.1+2.0, 9.2+2.0 Jan 29, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment