Skip to content

Fix adding virtual DSM system in synology_dsm#42523

Merged
Quentame merged 1 commit intohome-assistant:devfrom
mib1185:synology-dsm_fix_for_vdsm
Oct 29, 2020
Merged

Fix adding virtual DSM system in synology_dsm#42523
Quentame merged 1 commit intohome-assistant:devfrom
mib1185:synology-dsm_fix_for_vdsm

Conversation

@mib1185
Copy link
Copy Markdown
Member

@mib1185 mib1185 commented Oct 28, 2020

Proposed change

This PR fixes an issue where virtual DSM systems can`t be added, because there are nor disks available on vDSM systems.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • The code has been formatted using Black (black --fast homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • Untested files have been added to .coveragerc.

The integration reached or maintains the following Integration Quality Scale:

  • No score or internal
  • 🥈 Silver
  • 🥇 Gold
  • 🏆 Platinum

To help with the load of incoming pull requests:

@probot-home-assistant
Copy link
Copy Markdown

Hey there @hacf-fr, @Quentame, mind taking a look at this pull request as its been labeled with an integration (synology_dsm) you are listed as a codeowner for? Thanks!
(message by CodeOwnersMention)

@Quentame
Copy link
Copy Markdown
Member

Can you rebase since #42378 has been merged ?

Thanks 😊

@mib1185
Copy link
Copy Markdown
Member Author

mib1185 commented Oct 28, 2020

grmmml ... I´m not sure, what is wrong or what happens :/ This git magic is still to new to me 😢
if you have any hints for me, how to solve this and how to perform the rebase properly, I would be very grateful 😃

@Quentame
Copy link
Copy Markdown
Member

Actually you should interactive rebase and keep only the commit of this PR, and drop other commits.

Or easier : rename your branch (add -old) at the end, create a new branch from dev with the same name, and cherry pick the commits of the PR from your -old branch.

Courage 😉

@Quentame
Copy link
Copy Markdown
Member

Please avoid merge.
With that, it integrates commits that are not your own, into the PR.

@Quentame Quentame self-assigned this Oct 28, 2020
@mib1185 mib1185 force-pushed the synology-dsm_fix_for_vdsm branch from 3f10bd9 to 10a3afc Compare October 28, 2020 22:37
@mib1185
Copy link
Copy Markdown
Member Author

mib1185 commented Oct 28, 2020

ok ... I think I get it now 😃
The previous merge was not on purpose done by me 🙈

Copy link
Copy Markdown
Member

@Quentame Quentame left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙏 Thanks for the help on this issue 🤩

Comment thread tests/components/synology_dsm/test_config_flow.py
Comment thread tests/components/synology_dsm/test_config_flow.py Outdated
@mib1185
Copy link
Copy Markdown
Member Author

mib1185 commented Oct 28, 2020

🙏 Thanks for the help on this issue 🤩

you are welcome 😃

@mib1185 mib1185 force-pushed the synology-dsm_fix_for_vdsm branch from 10a3afc to 448318d Compare October 28, 2020 23:38
@mib1185 mib1185 requested a review from Quentame October 28, 2020 23:40
Copy link
Copy Markdown
Member

@Quentame Quentame left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your help 👍

Merged !

@Quentame Quentame added this to the 0.117.1 milestone Oct 29, 2020
@Quentame Quentame merged commit a2f2a42 into home-assistant:dev Oct 29, 2020
tschamm pushed a commit to tschamm/core that referenced this pull request Oct 29, 2020
@balloob balloob mentioned this pull request Oct 30, 2020
@mib1185 mib1185 deleted the synology-dsm_fix_for_vdsm branch October 31, 2020 19:41
@mib1185 mib1185 mentioned this pull request Nov 15, 2020
21 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to add second Synology DSM instance to HomeAssistant

4 participants