Skip to content

Commit

Permalink
feat: rename scheduler/resource to scheduler/resource/standard (#…
Browse files Browse the repository at this point in the history 
…3542)

Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
@gaius-qi
gaius-qi authored Sep 29, 2024
1 parent 9cd6f41 commit 688b9d7
Show file tree
Hide file tree
Showing 56 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion client/daemon/rpcserver/rpcserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import (
schedulerclient "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client"
"d7y.io/dragonfly/v2/pkg/safe"
"d7y.io/dragonfly/v2/pkg/source"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

type Server interface {
Expand Down
2 changes: 1 addition & 1 deletion client/daemon/rpcserver/rpcserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
dfdaemonclient "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client"
dfdaemonserver "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/server"
schedulerclientmocks "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client/mocks"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

func TestServer_New(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion manager/job/sync_peers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"d7y.io/dragonfly/v2/manager/config"
"d7y.io/dragonfly/v2/manager/models"
"d7y.io/dragonfly/v2/pkg/idgen"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

// SyncPeers is an interface for sync peers.
Expand Down
2 changes: 1 addition & 1 deletion scheduler/job/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import (
"d7y.io/dragonfly/v2/pkg/idgen"
dfdaemonclient "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client"
"d7y.io/dragonfly/v2/scheduler/config"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

// Job is an interface for job.
Expand Down
10 changes: 5 additions & 5 deletions scheduler/networktopology/mocks/network_topology_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/networktopology/network_topology.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"d7y.io/dragonfly/v2/pkg/container/set"
pkgredis "d7y.io/dragonfly/v2/pkg/redis"
"d7y.io/dragonfly/v2/scheduler/config"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
"d7y.io/dragonfly/v2/scheduler/storage"
)

Expand Down
2 changes: 1 addition & 1 deletion scheduler/networktopology/network_topology_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"d7y.io/dragonfly/v2/pkg/cache"
"d7y.io/dragonfly/v2/pkg/container/set"
pkgredis "d7y.io/dragonfly/v2/pkg/redis"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
storagemocks "d7y.io/dragonfly/v2/scheduler/storage/mocks"
)

Expand Down
2 changes: 1 addition & 1 deletion scheduler/networktopology/probes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"d7y.io/dragonfly/v2/pkg/cache"
pkgredis "d7y.io/dragonfly/v2/pkg/redis"
"d7y.io/dragonfly/v2/scheduler/config"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion scheduler/networktopology/probes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
pkgredis "d7y.io/dragonfly/v2/pkg/redis"
"d7y.io/dragonfly/v2/pkg/types"
"d7y.io/dragonfly/v2/scheduler/config"
"d7y.io/dragonfly/v2/scheduler/resource"
resource "d7y.io/dragonfly/v2/scheduler/resource/standard"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/host.go → scheduler/resource/standard/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"context"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/host_manager.go → scheduler/resource/standard/host_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination host_manager_mock.go -source host_manager.go -package resource
//go:generate mockgen -destination host_manager_mock.go -source host_manager.go -package standard

package resource
package standard

import (
"sync"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/host_manager_mock.go → ...er/resource/standard/host_manager_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/host_manager_test.go → ...er/resource/standard/host_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/host_test.go → scheduler/resource/standard/host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/peer.go → scheduler/resource/standard/peer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"context"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/peer_manager.go → scheduler/resource/standard/peer_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination peer_manager_mock.go -source peer_manager.go -package resource
//go:generate mockgen -destination peer_manager_mock.go -source peer_manager.go -package standard

package resource
package standard

import (
"context"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/peer_manager_mock.go → ...er/resource/standard/peer_manager_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/peer_manager_test.go → ...er/resource/standard/peer_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/peer_test.go → scheduler/resource/standard/peer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/piece.go → scheduler/resource/standard/piece.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"time"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/piece_test.go → scheduler/resource/standard/piece_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"testing"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/resource.go → scheduler/resource/standard/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination resource_mock.go -source resource.go -package resource
//go:generate mockgen -destination resource_mock.go -source resource.go -package standard

package resource
package standard

import (
"github.com/redis/go-redis/v9"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/resource_mock.go → scheduler/resource/standard/resource_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/resource_test.go → scheduler/resource/standard/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/seed_peer.go → scheduler/resource/standard/seed_peer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination seed_peer_mock.go -source seed_peer.go -package resource
//go:generate mockgen -destination seed_peer_mock.go -source seed_peer.go -package standard

package resource
package standard

import (
"context"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/seed_peer_client.go → ...ler/resource/standard/seed_peer_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination seed_peer_client_mock.go -source seed_peer_client.go -package resource
//go:generate mockgen -destination seed_peer_client_mock.go -source seed_peer_client.go -package standard

package resource
package standard

import (
"context"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/seed_peer_client_mock.go → ...esource/standard/seed_peer_client_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/seed_peer_client_test.go → ...esource/standard/seed_peer_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/seed_peer_mock.go → ...duler/resource/standard/seed_peer_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/seed_peer_test.go → ...duler/resource/standard/seed_peer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/task.go → scheduler/resource/standard/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"context"
Expand Down
4 changes: 2 additions & 2 deletions scheduler/resource/task_manager.go → scheduler/resource/standard/task_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

//go:generate mockgen -destination task_manager_mock.go -source task_manager.go -package resource
//go:generate mockgen -destination task_manager_mock.go -source task_manager.go -package standard

package resource
package standard

import (
"sync"
Expand Down
6 changes: 3 additions & 3 deletions scheduler/resource/task_manager_mock.go → ...er/resource/standard/task_manager_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scheduler/resource/task_manager_test.go → ...er/resource/standard/task_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/resource/task_test.go → scheduler/resource/standard/task_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package resource
package standard

import (
"errors"
Expand Down
Loading

0 comments on commit 688b9d7

Please sign in to comment.