Merge branch 'etcd' of github.com:Metaswitch/calico-docker into etcd

calicoctl.py

@@ -125,12 +125,16 @@ def get_group_id(self, name):
         :param name:
         :return: string UUID for the group, or None if the name was not found.
         """
-        groups = self.client.read(GROUPS_PATH, recursive=True,).children
-        for child in groups:
-            (_, _, _, _, group_id, final_key) = child.key.split("/", 5)
-            if final_key == "name":
-                if child.value == name:
-                    return group_id
+        try:
+            groups = self.client.read(GROUPS_PATH, recursive=True,).children
+            for child in groups:
+                (_, _, _, _, group_id, final_key) = child.key.split("/", 5)
+                if final_key == "name":
+                    if child.value == name:
+                        return group_id
+        except KeyError as e:
+            # Means the GROUPS_PATH was not set up.  So, group does not exist.
+            pass
         return None
 
     def add_container_to_group(self, container_id, group_name):

node/adapter/netns.py

@@ -96,5 +96,5 @@ def set_up_endpoint(ip, cpid, in_container=False):
                        (cpid, VETH_NAME), shell=True).strip()
 
     # Return an Endpoint
-    return Endpoint(id=ep_id, addrs=[ip], state="enabled", mac=mac)
+    return Endpoint(id=ep_id, addrs=[{"addr":ip}], state="enabled", mac=mac)