浏览代码

Merge pull request #1106 from chenchun/fix_ci

Fix broken CI because of newly introduced NetworkAllocate/NetworkFree…
Alessandro Boch 9 年之前
父节点
当前提交
089c5ab18a
共有 2 个文件被更改,包括 16 次插入0 次删除
  1. 8 0
      libnetwork/drivers/windows/windows.go
  2. 8 0
      libnetwork/drvregistry/drvregistry_test.go

+ 8 - 0
libnetwork/drivers/windows/windows.go

@@ -560,6 +560,14 @@ func (d *driver) RevokeExternalConnectivity(nid, eid string) error {
 	return nil
 	return nil
 }
 }
 
 
+func (d *driver) NetworkAllocate(id string, option map[string]interface{}, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
+	return nil, types.NotImplementedErrorf("not implemented")
+}
+
+func (d *driver) NetworkFree(id string) error {
+	return types.NotImplementedErrorf("not implemented")
+}
+
 func (d *driver) Type() string {
 func (d *driver) Type() string {
 	return d.name
 	return d.name
 }
 }

+ 8 - 0
libnetwork/drvregistry/drvregistry_test.go

@@ -73,6 +73,14 @@ func (m *mockDriver) RevokeExternalConnectivity(nid, eid string) error {
 	return nil
 	return nil
 }
 }
 
 
+func (m *mockDriver) NetworkAllocate(id string, option map[string]interface{}, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
+	return nil, nil
+}
+
+func (m *mockDriver) NetworkFree(id string) error {
+	return nil
+}
+
 func getNew(t *testing.T) *DrvRegistry {
 func getNew(t *testing.T) *DrvRegistry {
 	reg, err := New(nil, nil, nil, nil)
 	reg, err := New(nil, nil, nil, nil)
 	if err != nil {
 	if err != nil {