Skip to content

Do not provision dns on the webapp interface, and instead return it in interface response #221

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

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Do not provision dns on the webapp interface, and instead return it in interface response #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cns/NetworkContainerContract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,11 @@ type GetInterfaceForContainerRequest struct {

// GetInterfaceForContainerResponse specifies the interface for a given container ID.
type GetInterfaceForContainerResponse struct {
NetworkInterface NetworkInterface
CnetAddressSpace []IPSubnet
Response Response
NetworkContainerVersion string
NetworkInterface NetworkInterface
CnetAddressSpace []IPSubnet
DNSServers []string
Response Response
}

// NetworkInterface specifies the information that can be used to unquely identify an interface.
Expand Down
12 changes: 0 additions & 12 deletions cns/networkcontainers/networkcontainers_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,6 @@ func createOrUpdateWithOperation(createNetworkContainerRequest cns.CreateNetwork
return errors.New("[Azure CNS] IPAddress in IPConfiguration of createNetworkContainerRequest is nil")
}

var dnsServers string

for _, element := range createNetworkContainerRequest.IPConfiguration.DNSServers {
dnsServers += element + ","
}

if dnsServers != "" && dnsServers[len(dnsServers)-1] == ',' {
dnsServers = dnsServers[:len(dnsServers)-1]
}

ipv4AddrCidr := fmt.Sprintf("%v/%d", createNetworkContainerRequest.IPConfiguration.IPSubnet.IPAddress, createNetworkContainerRequest.IPConfiguration.IPSubnet.PrefixLength)
log.Printf("[Azure CNS] Created ipv4Cidr as %v", ipv4AddrCidr)
ipv4Addr, _, err := net.ParseCIDR(ipv4AddrCidr)
Expand All @@ -128,8 +118,6 @@ func createOrUpdateWithOperation(createNetworkContainerRequest cns.CreateNetwork
ipv4NetStr,
"/gateway",
createNetworkContainerRequest.IPConfiguration.GatewayIPAddress,
"/dns",
dnsServers,
"/weakhostsend",
"true",
"/weakhostreceive",
Expand Down
13 changes: 10 additions & 3 deletions cns/restserver/restserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,17 +1194,22 @@ func (service *httpRestService) getInterfaceForContainer(w http.ResponseWriter,
var interfaceName string
var ipaddress string
var cnetSpace []cns.IPSubnet
var dnsServers []string
var version string

if ok {
savedReq := containerDetails.CreateNetworkContainerRequest
interfaceName = savedReq.NetworkContainerid
cnetSpace = savedReq.CnetAddressSpace
ipaddress = savedReq.IPConfiguration.IPSubnet.IPAddress // it has to exist
dnsServers = savedReq.IPConfiguration.DNSServers
version = savedReq.Version
} else {
returnMessage = "[Azure CNS] Never received call to create this container."
returnCode = UnknownContainerID
interfaceName = ""
ipaddress = ""
version = ""
}

resp := cns.Response{
Expand All @@ -1213,9 +1218,11 @@ func (service *httpRestService) getInterfaceForContainer(w http.ResponseWriter,
}

getInterfaceForContainerResponse := cns.GetInterfaceForContainerResponse{
Response: resp,
NetworkInterface: cns.NetworkInterface{Name: interfaceName, IPAddress: ipaddress},
CnetAddressSpace: cnetSpace,
Response: resp,
NetworkInterface: cns.NetworkInterface{Name: interfaceName, IPAddress: ipaddress},
CnetAddressSpace: cnetSpace,
DNSServers: dnsServers,
NetworkContainerVersion: version,
}

err = service.Listener.Encode(w, &getInterfaceForContainerResponse)
Expand Down