Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick Fujitsu driver from Master to stable/capri #943

Merged
merged 2 commits into from
Jul 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Gopkg.lock

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

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
name = "github.com/segmentio/kafka-go"
revision = "0b3aacc527812d4040e51211146a43545e82d670"

[[constraint]]
branch = "master"
name = "golang.org/x/crypto"

[prune]
go-tests = true
non-go = true
Expand Down
6 changes: 6 additions & 0 deletions contrib/drivers/drivers.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ package drivers
import (
_ "github.com/opensds/opensds/contrib/backup/multicloud"
"github.com/opensds/opensds/contrib/drivers/ceph"
"github.com/opensds/opensds/contrib/drivers/fujitsu/eternus"
"github.com/opensds/opensds/contrib/drivers/hpe/nimble"
"github.com/opensds/opensds/contrib/drivers/huawei/dorado"
"github.com/opensds/opensds/contrib/drivers/huawei/fusionstorage"
Expand Down Expand Up @@ -103,6 +104,9 @@ func Init(resourceType string) VolumeDriver {
case config.HpeNimbleDriverType:
d = &nimble.Driver{}
break
case config.FujitsuEternusDriverType:
d = &eternus.Driver{}
break
default:
d = &sample.Driver{}
break
Expand All @@ -127,6 +131,8 @@ func Clean(d VolumeDriver) VolumeDriver {
break
case *nimble.Driver:
break
case *eternus.Driver:
break
default:
break
}
Expand Down
Loading