Merge lp://qastaging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix into lp://qastaging/~cloud-init-dev/cloud-init/trunk
Proposed by
Ryan Harper
| Status: | Merged |
|---|---|
| Merge reported by: | Scott Moser |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix |
| Merge into: | lp://qastaging/~cloud-init-dev/cloud-init/trunk |
| Diff against target: |
246 lines (+187/-12) 2 files modified
cloudinit/sources/DataSourceSmartOS.py (+24/-10) tests/unittests/test_datasource/test_smartos.py (+163/-2) |
| To merge this branch: | bzr merge lp://qastaging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Server Team CI bot | continuous-integration | Approve | |
| Scott Moser | Pending | ||
|
Review via email:
|
|||
Description of the change
smartos: update sdc:nics json conversion to network config
Update sdc:nics json conversion to network yaml.
- 'primary' key is a boolean, when true, the 'gateways' key is to be used
- a nic may not include a 'gateways' key
- 'ips' list may include 'dhcp'
- values in 'ips' are in CIDR notation, drop/ignore netmask values
Add additional test-cases for coverage.
To post a comment you must log in.
Revision history for this message
| Server Team CI bot (server-team-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Scott Moser (smoser) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:1243
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/