Merge lp://staging/~gmdduf/lava-dispatcher/gauss-support into lp://staging/lava-dispatcher

Proposed by Bernard Park
Status: Rejected
Rejected by: Neil Williams
Proposed branch: lp://staging/~gmdduf/lava-dispatcher/gauss-support
Merge into: lp://staging/lava-dispatcher
Diff against target: 393 lines (+323/-13)
5 files modified
lava_dispatcher/client/base.py (+3/-3)
lava_dispatcher/client/lmc_utils.py (+15/-8)
lava_dispatcher/config.py (+1/-1)
lava_dispatcher/device/gauss.py (+300/-0)
lava_dispatcher/ipmi.py (+4/-1)
To merge this branch: bzr merge lp://staging/~gmdduf/lava-dispatcher/gauss-support
Reviewer Review Type Date Requested Status
Antonio Terceiro Needs Fixing
Review via email: mp+164074@code.staging.launchpad.net

Description of the change

+ Add Gauss platform
+ Customized ipmi.py for gauss platform
+ fix couple of syntax error on 603

To post a comment you must log in.
605. By Bernard Park

support gauss when create img file by running l-m-c

606. By Bernard Park

hwpack + rootfs for gauss platform support

Revision history for this message
Antonio Terceiro (terceiro) wrote :
Download full text (3.9 KiB)

Hello Bernard,

Thanks for this submission. I have just reviewed it and found a few
problems, which have to be addressed before we merge this code.

 review needs-fixing

> === modified file 'lava_dispatcher/client/base.py'
> --- lava_dispatcher/client/base.py 2013-05-15 23:15:31 +0000
> +++ lava_dispatcher/client/base.py 2013-05-16 07:03:30 +0000
> @@ -426,7 +426,7 @@
> attempts = 0
> in_linaro_image = False
> while (attempts < boot_attempts) and (not in_linaro_image):
> - logging.info("Booting the test image. Attempt: %d" % attempts + 1)
> + logging.info("Booting the test image. Attempt: %d" % int(attempts + 1))
> try:
> self._boot_linaro_image()
> except (OperationFailed, pexpect.TIMEOUT) as e:

This is not needed, as attempts is already an integer.

> @@ -435,8 +435,8 @@
> attempts += 1
> continue
>
> - timeout = self.config.boot_linaro_timeout
> - TESTER_PS1_PATTERN = self.target_device.deployment_data['TESTER_PS1_PATTERN']
> + TESTER_PS1_PATTERN = self.target_device.deployment_data['TESTER_PS1_PATTERN']
> + timeout = self.config.boot_linaro_timeout
> try:
> wait_for_prompt(self.proc, TESTER_PS1_PATTERN, timeout=timeout)
> except (pexpect.TIMEOUT) as e:

This change does not apply anymore, please undo it.

> === modified file 'lava_dispatcher/config.py'
> --- lava_dispatcher/config.py 2013-05-16 01:53:21 +0000
> +++ lava_dispatcher/config.py 2013-05-16 07:03:30 +0000
> @@ -192,7 +192,7 @@
> if os.path.exists(path):
> config_files.append(path)
> if not config_files:
> - raise Exception("no config files named %r found" % (name + ".conf"))
> + raise Exception("no config files named %r found on %s" % (name + ".conf", config_dir))
> config_files.reverse()
> logging.debug("About to read %s", str(config_files))
> for path in config_files:

The dispatcher will look for config file in several directories, not
only in `config_dir`. So saying that the file was not found in
`config_dir` is not correct.

> === added file 'lava_dispatcher/device/gauss.py'

gauss.py is an exact copy of highbank.py

This is good because it means you could make it work without any change
there.

But it is bad from a maintaince point of view because we don't want to
maintain two copies of the same code.

So, I created a new merge proposal generalizing highbank.py to
ipmi_pxe.py, which basically only changes a couple of names:
https://code.launchpad.net/~terceiro/lava-dispatcher/generalize-ipmi-pxe/+merge/164781

This code will be merged in trunk in a few days, after one of the other
LAVA team members reviews it, and you should be able to use it then.

> === modified file 'lava_dispatcher/ipmi.py'
> --- lava_dispatcher/ipmi.py 2013-04-12 10:01:48 +0000
> +++ lava_dispatcher/ipmi.py 2013-05-16 07:03:30 +0000
> @@ -53,7 +53,10 @@
> self.__ipmi("chassis power on")
>
> def reset(self):
> - self.__ipmi("chassis power reset")
> + if self.host.find('gauss') == -1:
> + ...

Read more...

review: Needs Fixing

Unmerged revisions

606. By Bernard Park

hwpack + rootfs for gauss platform support

605. By Bernard Park

support gauss when create img file by running l-m-c

604. By Bernard Park

fix couple of syntax error

603. By Bernard Park

Tyler Baker's fix boot_retries

602. By Bernard Park

Add Samsung Gauss SDDK support

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches