Add localonly domain option to libvirt-network #376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eparis
force-pushed
the
localonly-domain
branch
3 times, most recently
from
f9ede62 to
633494e
Compare
MalloZup
requested changes
Aug 30, 2018
There was a problem hiding this comment.
https://github.com/dmacvicar/terraform-provider-libvirt/pull/288/files#diff-042e2374df248e4277a3506b065eb28aR512
in this patch we miss the resource.SET and (we lack on real test for this)
MalloZup
reviewed
Aug 30, 2018
eparis
force-pushed
the
localonly-domain
branch
2 times, most recently
from
3862d25 to
10d86c4
Compare
|
Hopefully I sufficiently ripped off your test code :) It seems to work. |
eparis
force-pushed
the
localonly-domain
branch
2 times, most recently
from
4317ca2 to
7ede8e9
Compare
Repository owner
deleted a comment from
eparis
Sep 3, 2018
Repository owner
deleted a comment from
Bischoff
Sep 3, 2018
Repository owner
deleted a comment from
eparis
Sep 3, 2018
MalloZup
reviewed
Sep 3, 2018
| return &networkDef, nil | ||
| } | ||
|
|
||
| func testAccCheckLibvirtNetworkLocalOnlyStatus(name string, LocalOnlyStatus bool) resource.TestCheckFunc { |
There was a problem hiding this comment.
small nitpick testAccCheckLibvirtNetworkLocalOnlyStatus should be called:
ModuleTest_ + Testname
TestAccCheckLibvirtNetwork_LocalOnlyStatus
I know that this not documented so you coud not know it but we are trying to move all the testnames in this direction.
So when we run Acceptance test we get more the debug context and more ordered output/results
MalloZup
reviewed
Sep 3, 2018
| } | ||
| } | ||
|
|
||
| func testAccCheckLibvirtNetworkDNSForwarders(name string, expected []libvirtxml.NetworkDNSForwarder) resource.TestCheckFunc { |
There was a problem hiding this comment.
nitpick: testAccCheckLibvirtNetworkDNSForwarders -> TestAccCheckLibvirtNetwork_DNSForwarders
MalloZup
reviewed
Sep 3, 2018
| resource.TestCheckResourceAttr("libvirt_network.test_net", "dns.0.forwarders.1.address", "10.10.0.67"), | ||
| resource.TestCheckResourceAttr("libvirt_network.test_net", "dns.0.forwarders.1.domain", "my.domain.com"), | ||
| resource.TestCheckResourceAttr("libvirt_network.test_net", "dns.0.forwarders.2.domain", "hello.com"), | ||
| testAccCheckLibvirtNetworkDNSForwarders("libvirt_network.test_net", []libvirtxml.NetworkDNSForwarder{ |
MalloZup
reviewed
Sep 3, 2018
libvirt/resource_libvirt_network.go
Outdated
| @@ -161,6 +177,7 @@ func resourceLibvirtNetworkUpdate(d *schema.ResourceData, meta interface{}) erro | |||
| } | |||
|
|
|||
| func resourceLibvirtNetworkCreate(d *schema.ResourceData, meta interface{}) error { | |||
| dnsPrefix := "dns.0" | |||
There was a problem hiding this comment.
nitpick: i would enforce here this to be a const since will should never change
MalloZup
reviewed
Sep 3, 2018
libvirt/resource_libvirt_network.go
Outdated
| @@ -341,6 +367,8 @@ func resourceLibvirtNetworkCreate(d *schema.ResourceData, meta interface{}) erro | |||
| } | |||
|
|
|||
| func resourceLibvirtNetworkRead(d *schema.ResourceData, meta interface{}) error { | |||
| dnsPrefix := "dns.0" | |||
There was a problem hiding this comment.
afaik const is better here
MalloZup
approved these changes
Sep 3, 2018
eparis
force-pushed
the
localonly-domain
branch
2 times, most recently
from
e4705df to
dc4a9a5
Compare
I make a new DNS a sectrion of network, more like the upstream xml. Inside that new DNS section I include forwarders, which were under the main object, so this is a breaking change. But one that aligns with the upstream xml and one which allows much easier future growth of DNS management. I add 'localOnly' which tells dnsmasq to own all of the domain in question. Instead of forwarding unknown names. This way you can point your local DNS at the libvirt DNS for the domain in question, and the domain in question will not forward unknown hosts back to your local DNS.
eparis
force-pushed
the
localonly-domain
branch
from
dc4a9a5 to
7651ee5
Compare
Repository owner
deleted a comment from
Bischoff
Sep 4, 2018
Repository owner
deleted a comment from
Bischoff
Sep 4, 2018
|
@dmacvicar feel free to have a look, to me looks good. |
MalloZup
added a commit
to MalloZup/terraform-provider-libvirt
that referenced
this pull request
Sep 5, 2018
PR dmacvicar#393 has introduced a new function name. ( merged). PR dmacvicar#376 was using the old name, which we merged after pr dmacvicar#393 and the review was done before merging dmacvicar#393. This commit just fix the name of function
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows one to tell dnsmasq to own all of the domain in question.
Instead of forwarding unknown names. This way you can point your local
DNS at the libvirt DNS for the domain in question, and the domain in
question will not forward unknown hosts back to your local DNS.