From 3591e939388adeadbb417b15683abdf23c2bc8df Mon Sep 17 00:00:00 2001 From: Tamilmani Manoharan Date: Mon, 15 Jul 2019 17:04:15 -0700 Subject: [PATCH 1/2] Fox for cnm issue. Now able to run container using cnm plugin --- network/endpoint_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/endpoint_linux.go b/network/endpoint_linux.go index 0c39d0de15..2533d170f2 100644 --- a/network/endpoint_linux.go +++ b/network/endpoint_linux.go @@ -178,7 +178,7 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) { // Create the endpoint object. ep = &endpoint{ Id: epInfo.Id, - IfName: epInfo.IfName, + IfName: contIfName, HostIfName: hostIfName, MacAddress: containerIf.HardwareAddr, InfraVnetIP: epInfo.InfraVnetIP, From a73adeb9663bf2f6b917ef11ff1648f312b77b2e Mon Sep 17 00:00:00 2001 From: Tamilmani Manoharan Date: Tue, 16 Jul 2019 15:41:23 -0700 Subject: [PATCH 2/2] added comment for the change --- network/endpoint_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/endpoint_linux.go b/network/endpoint_linux.go index 2533d170f2..9675346c4a 100644 --- a/network/endpoint_linux.go +++ b/network/endpoint_linux.go @@ -178,7 +178,7 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) { // Create the endpoint object. ep = &endpoint{ Id: epInfo.Id, - IfName: contIfName, + IfName: contIfName, // container veth pair name. In cnm, we won't rename this and docker expects veth name. HostIfName: hostIfName, MacAddress: containerIf.HardwareAddr, InfraVnetIP: epInfo.InfraVnetIP,