From 13f3ff15bd78ec596a2e8d451f48f8f7ee742270 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 8 Apr 2016 15:18:08 +0100
Subject: [PATCH] Sanity-check ipam args to make diagnosis easier

---
 plugin/ipam/cni.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin/ipam/cni.go b/plugin/ipam/cni.go
index a5d407b8..4c9a45a8 100644
--- a/plugin/ipam/cni.go
+++ b/plugin/ipam/cni.go
@@ -27,6 +27,9 @@ func (i *Ipam) Allocate(args *skel.CmdArgs) (*types.Result, error) {
 		conf = &ipamConf{}
 	}
 	containerID := args.ContainerID
+	if containerID == "" {
+		return nil, fmt.Errorf("Weave CNI Allocate: blank container name")
+	}
 	var ipnet *net.IPNet
 
 	if conf.Subnet == "" {