瀏覽代碼

Merge pull request #46344 from thaJeztah/libnetwork_drivers_remote_cleanup_tests

libnetwork/drivers/remote: tests: cleanup dead code, and return concrete types
Sebastiaan van Stijn 1 年之前
父節點
當前提交
bea39a49bc
共有 2 個文件被更改,包括 2 次插入7 次删除
  1. 1 2
      libnetwork/drivers/remote/driver.go
  2. 1 5
      libnetwork/drivers/remote/driver_test.go

+ 1 - 2
libnetwork/drivers/remote/driver.go

@@ -169,8 +169,7 @@ func (d *driver) CreateNetwork(id string, options map[string]interface{}, nInfo
 }
 }
 
 
 func (d *driver) DeleteNetwork(nid string) error {
 func (d *driver) DeleteNetwork(nid string) error {
-	delete := &api.DeleteNetworkRequest{NetworkID: nid}
-	return d.call("DeleteNetwork", delete, &api.DeleteNetworkResponse{})
+	return d.call("DeleteNetwork", &api.DeleteNetworkRequest{NetworkID: nid}, &api.DeleteNetworkResponse{})
 }
 }
 
 
 func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]interface{}) error {
 func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]interface{}) error {

+ 1 - 5
libnetwork/drivers/remote/driver_test.go

@@ -95,10 +95,6 @@ type testEndpoint struct {
 	disableGatewayService bool
 	disableGatewayService bool
 }
 }
 
 
-func (test *testEndpoint) Interface() driverapi.InterfaceInfo {
-	return test
-}
-
 func (test *testEndpoint) Address() *net.IPNet {
 func (test *testEndpoint) Address() *net.IPNet {
 	if test.address == "" {
 	if test.address == "" {
 		return nil
 		return nil
@@ -550,7 +546,7 @@ func TestMissingValues(t *testing.T) {
 
 
 type rollbackEndpoint struct{}
 type rollbackEndpoint struct{}
 
 
-func (r *rollbackEndpoint) Interface() driverapi.InterfaceInfo {
+func (r *rollbackEndpoint) Interface() *rollbackEndpoint {
 	return r
 	return r
 }
 }