Create legacy links during endpoint Join

Legacy links were set up by ProgramExternalConnectivity, but
removed by Leave (rather than RevokeExternalConnectivity). The
options needed by legacy links are all available in Join, and
Join will only be called once per Endpoint. So, create legacy
links there.

Signed-off-by: Rob Murray <rob.murray@docker.com>

Author: robmry

libnetwork/drivers/bridge/bridge_linux.go

@@ -1470,6 +1470,10 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
 		}
 	}
 
+	if !network.config.EnableICC {
+		return d.link(network, endpoint, true)
+	}
+
 	return nil
 }
 
@@ -1578,10 +1582,6 @@ func (d *driver) ProgramExternalConnectivity(ctx context.Context, nid, eid strin
 		return fmt.Errorf("failed to update bridge endpoint %.7s to store: %v", endpoint.id, err)
 	}
 
-	if !network.config.EnableICC {
-		return d.link(network, endpoint, true)
-	}
-
 	return nil
 }
 

libnetwork/drivers/bridge/bridge_linux_test.go

@@ -1014,10 +1014,6 @@ func TestLinkContainers(t *testing.T) {
 	}
 
 	err = d.Join(context.Background(), "net1", "ep2", "", te2, nil, sbOptions)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = d.ProgramExternalConnectivity(context.Background(), "net1", "ep2", "ep2", "ep2")
 	assert.Check(t, err != nil, "Expected Join to fail given link conditions are not satisfied")
 	checkLink(false)
 }