Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • forge forge
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 3
    • Merge requests 3
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • ISC Open Source ProjectsISC Open Source Projects
  • forgeforge
  • Merge requests
  • !216

use host scope when inserting options for a reservation

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Andrei Pavel requested to merge host-reservations into master Dec 08, 2021
  • Overview 1
  • Commits 1
  • Pipelines 2
  • Changes 9

This MR changes scope_id from 1 to 3. There should never be a call to option_db_record_reservation() with something other than host because options that belong to reservations always have host scope. If the reviewer so desires, host could also be hardcoded into the function.

Only Postgres tests are impacted by this bug, but this MR changes MySQL so that the tests properly use reservation option-data as intended and not subnet option-data.

Should fix the following tests:

  • test_v6_host_reservation_pgsql_hwaddrr_matching_option
  • test_v6_host_reservation_pgsql_hwaddrr_matching_option_inforequest
  • test_v6_host_reservation_pgsql_hwaddrr_matching_option_no_address
  • test_v6_host_reservation_pgsql_option_multiple
  • test_v6_host_reservation_pgsql_all_values_mac

The database results should be the same as after a reservation-add.

Edited Dec 08, 2021 by Andrei Pavel
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: host-reservations