Merge "Use CNI_IFNAME environment variable"

kuryr_cni/main.go

@@ -112,7 +112,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 
 	iface := current.Interface{}
-	iface.Name = vif.VifName
+	iface.Name = args.IfName
 	iface.Mac = vif.Address
 	iface.Sandbox = args.ContainerID
 

kuryr_kubernetes/cni/api.py

@@ -100,7 +100,7 @@ class CNIRunner(object):
         cni_routes_list = result.setdefault("routes", [])
         result["interfaces"] = [
             {
-                "name": vif.vif_name,
+                "name": params["CNI_IFNAME"],
                 "mac": vif.address,
                 "sandbox": self.get_container_id(params)}]
         for subnet in vif.network.subnets.objects:

kuryr_kubernetes/tests/unit/cni/test_api.py

@@ -64,6 +64,7 @@ class TestCNIDaemonizedRunner(test_base.TestCase, TestCNIRunnerMixin):
             'CNI_COMMAND': cni_cmd,
             'CNI_CONTAINERID': 'a4181c680a39',
             'CNI_ARGS': 'foo=bar',
+            'CNI_IFNAME': 'eth0',
         }
         result = self.runner.run(env, m_fin, m_fout)
         m_post.assert_called_with(