RPC changes

Author: jaydeokar

cmd/routed-eni-cni-plugin/cni_test.go

@@ -401,7 +401,7 @@ func TestCmdDel(t *testing.T) {
 		DeviceNumber: devNum,
 		RouteTableId: devNum + 1,
 	}}
-	delNetworkReply := &rpc.DelNetworkReply{Success: true, IPv4Addr: ipAddr, DeviceNumber: devNum, NetworkPolicyMode: "none"}
+	delNetworkReply := &rpc.DelNetworkReply{Success: true, IPAddress: addrs, NetworkPolicyMode: "none"}
 
 	mockC.EXPECT().DelNetwork(gomock.Any(), gomock.Any()).Return(delNetworkReply, nil)
 

pkg/ipamd/ipamd.go

@@ -2679,6 +2679,7 @@ func (c *IPAMContext) SetAPIServerConnectivity(connected bool) {
 		// and we want to keep working with that value
 		log.Info("API server connection lost, continuing with current maxPods value")
 	}
+}
 
 type Decisions struct {
 	Stats *datastore.DataStoreStats

pkg/ipamd/rpc_handler.go

@@ -411,10 +411,10 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 						log.Errorf("Failed to unmarshal PodENIData JSON: %v", err)
 					}
 					return &rpc.DelNetworkReply{
-						Success:   true,
-						PodVlanId: int32(podENIData[0].VlanID),
-						IPAddress: []*rpc.IPAddress{&rpc.IPAddress{IPv4Addr: podENIData[0].PrivateIP}},
-						NetworkPolicyMode: s.ipamContext.networkPolicyMode
+						Success:           true,
+						PodVlanId:         int32(podENIData[0].VlanID),
+						IPAddress:         []*rpc.IPAddress{&rpc.IPAddress{IPv4Addr: podENIData[0].PrivateIP}},
+						NetworkPolicyMode: s.ipamContext.networkPolicyMode,
 					}, err
 				}
 			}
@@ -452,9 +452,9 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 
 	log.Infof("Send DelNetworkReply: IPAddress: %+v, err: %v", ipAddr, errors)
 	return &rpc.DelNetworkReply{
-		Success:   errors == nil,
-		IPAddress: ipAddr,
-		NetworkPolicyMode: s.ipamContext.networkPolicyMode
+		Success:           errors == nil,
+		IPAddress:         ipAddr,
+		NetworkPolicyMode: s.ipamContext.networkPolicyMode,
 	}, errors
 }