Fixing UTs to match the new behaviour.

Added Update counter checks to the cnidel / setup TCs. These extra assertation now cover the cases related to the IP leaking bug.
nokia · Aug 8, 2019 · 5e15d4e · 5e15d4e
1 parent 0b9369e
commit 5e15d4e
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 56 deletions.
diff --git a/integration/cni_config/00-danm.conf b/integration/cni_config/00-danm.conf
@@ -1,4 +1,5 @@
 {
+  "cniVersion": "0.3.1",
   "name": "meta_cni",
   "name_comment": "Mandatory parameter, but can be anything",
   "type": "danm",

diff --git a/pkg/cnidel/cnidel.go b/pkg/cnidel/cnidel.go
@@ -57,7 +57,8 @@ func DelegateInterfaceSetup(netConf *datastructs.NetConf, danmClient danmclients
     }
     //As netInfo is only copied to IPAM above, the IP allocation is not refreshed in the original copy.
     //Without re-reading the network body we risk leaking IPs if error happens later on within the same thread!
-    netInfo,_ = netcontrol.GetNetworkFromEp(danmClient, *ep)
+    netInfo,err = netcontrol.GetNetworkFromEp(danmClient, *ep)
+    if err != nil {log.Println("lofasz:" + err.Error())}
     ipamOptions = getCniIpamConfig(netInfo, ep.Spec.Iface.Address, ep.Spec.Iface.AddressIPv6)
   }
   rawConfig, err := getCniPluginConfig(netConf, netInfo, ipamOptions, ep)

diff --git a/test/stubs/danm/netclient_stub.go b/test/stubs/danm/netclient_stub.go
@@ -57,17 +57,20 @@ func (netClient *NetClientStub) Update(obj *danmtypes.DanmNet) (*danmtypes.DanmN
       }
     }
   }
-  if strings.Contains(obj.Spec.NetworkID, "conflict") && obj.ObjectMeta.ResourceVersion != magicVersion {
-    for index, net := range netClient.TestNets {
-      if net.Spec.NetworkID == obj.Spec.NetworkID {
-        netClient.TestNets[index].ObjectMeta.ResourceVersion = magicVersion
-      }
+  var netIndex int
+  for index, net := range netClient.TestNets {
+    if net.ObjectMeta.Name == obj.ObjectMeta.Name {
+      netIndex = index
     }
+  }
+  if strings.Contains(obj.Spec.NetworkID, "conflict") && obj.ObjectMeta.ResourceVersion != magicVersion {
+    netClient.TestNets[netIndex].ObjectMeta.ResourceVersion = magicVersion
     return nil, errors.New(datastructs.OptimisticLockErrorMsg)
   }
   if strings.Contains(obj.Spec.NetworkID, "error") {
     return nil, errors.New("fatal error, don't retry")
   }
+  netClient.TestNets[netIndex] = *obj
   return obj, nil
 }
 
@@ -84,7 +87,7 @@ func (netClient *NetClientStub) Get(netName string, options meta_v1.GetOptions)
     return nil, errors.New("fatal error, don't retry")
   }
   for _, testNet := range netClient.TestNets {
-    if testNet.Spec.NetworkID == netName {
+    if testNet.ObjectMeta.Name == netName {
       return &testNet, nil
     }
   }