Skip to content
Snippets Groups Projects

Nat 185

Merged JORGE SASIAIN requested to merge NAT-185 into develop
3 files
+ 15
5
Compare changes
  • Side-by-side
  • Inline
Files
3
  • 4e5878d5
    NAT-198: add dns_view option during allocate host · 4e5878d5
    JORGE SASIAIN authored
+ 8
2
@@ -240,6 +240,7 @@ def _allocate_host(hostname=None,
addrs=None,
networks=None,
cname_aliases=None,
dns_view="default",
extattrs={}
) -> Union[HostAddresses, str]:
"""
@@ -303,7 +304,7 @@ def _allocate_host(hostname=None,
],
"name": hostname,
"configure_for_dns": True,
"view": "default",
"view": dns_view,
"extattrs": extattrs
}
@@ -324,7 +325,7 @@ def _allocate_host(hostname=None,
cname_req_payload = {
"name": "",
"canonical": hostname,
"view": "default",
"view": dns_view,
"extattrs": extattrs
}
@@ -380,11 +381,13 @@ def allocate_service_host(hostname=None,
oss_ipv4_networks = getattr(ipam_params, service_type).V4.networks
oss_ipv6_networks = getattr(ipam_params, service_type).V6.networks
domain_name = getattr(ipam_params, service_type).domain_name
dns_view = getattr(ipam_params, service_type).dns_view
assert (oss_ipv4_containers and oss_ipv6_containers) \
or (oss_ipv4_networks and oss_ipv6_networks), \
"This service is missing either containers or networks configuration."
assert domain_name, "This service is missing domain_name configuration."
assert dns_view, "This service is missing dns_view configuration."
if cname_aliases:
cname_aliases = [alias + domain_name for alias in cname_aliases]
@@ -419,6 +422,7 @@ def allocate_service_host(hostname=None,
host = _allocate_host(hostname=hostname+domain_name,
networks=network_tuple,
cname_aliases=cname_aliases,
dns_view=dns_view,
extattrs=extattrs)
if "NETWORK_FULL" not in host:
@@ -455,6 +459,7 @@ def allocate_service_host(hostname=None,
hostname=hostname+domain_name,
networks=(str(ipv4_network), str(ipv6_network)),
cname_aliases=cname_aliases,
dns_view=dns_view,
extattrs=extattrs
)
assert "NETWORK_FULL" not in host
@@ -482,6 +487,7 @@ def allocate_service_host(hostname=None,
hostname=hostname+domain_name,
addrs=(str(ipv4_addr), str(ipv6_addr)),
cname_aliases=cname_aliases,
dns_view=dns_view,
extattrs=extattrs
)
assert "NETWORK_FULL" not in host
Loading