Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Status DHCP Leases show CID and other enhancements #3273

Closed
wants to merge 1 commit into from
Closed

Status DHCP Leases show CID and other enhancements #3273

wants to merge 1 commit into from

Conversation

phil-davis
Copy link
Contributor

  1. If there is a Client Id specified then show it (otherwise it is possible to define a Static Mapping that has only Cliwent Id and all other fields empty, which would look like an empty row in the displayed table).
  2. Ignore empty static lease entries - when an interface has no static mappings the "static" section of the DHCP server settings can be "" which was resulting in a single-element that was empty being displayed as an empty row.
  3. If there are no leases to display, then make a row with the message "No leases to display" so the user knows the system at least tried.
  4. If there are no leases in use, then make a row with the message "No leases are in use" so the user knows the system at least tried.

Status DHCP Leases show CID and other enhancements
01266a6 
1) If there is a Client Id specified then show it (otherwise it is possible to define a Static Mapping that has only Cliwent Id and all other fields empty, which would look like an empty row in the displayed table).
2) Ignore empty static lease entries - when an interface has no static mappings the "static" section of the DHCP server settings can be "<static></static>" which was resulting in a single-element that was empty being displayed as an empty row.
3) If there are no leases to display, then make a row with the message "No leases to display" so the user knows the system at least tried.
4) If there are no leases in use, then make a row with the message "No leases are in use" so the user knows the system at least tried.
@phil-davis
Copy link
Contributor Author

Note: This also includes the fix in #3272
Whatever I do, it will conflict with that. So please commit #3272 and I can then sort this out, including any comments/suggestions people may have.

@rbgarga
Copy link
Member

rbgarga commented Dec 13, 2016

@phil-davis #3272 was merged, please rebase

@rbgarga rbgarga self-assigned this Dec 13, 2016
@phil-davis
Copy link
Contributor Author

New PR #3277
That was easier, because this is just an online branch so I am not sure if I can do rebase... online in GitHub yet.

@phil-davis phil-davis closed this Dec 13, 2016
@phil-davis phil-davis deleted the patch-8 branch December 13, 2016 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rbgarga rbgarga

Labels
Conflicts
Projects
None yet
Milestone
No milestone
3 participants
@phil-davis @rbgarga @netgate-git-updates