Skip to content

Commit

Permalink
Controller code after decoupling
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Apr 9, 2020
1 parent 3f1209e commit 923e120
Show file tree
Hide file tree
Showing 157 changed files with 473 additions and 12,454 deletions.
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Additionally, community organizers are available to help community members engag

If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify OpenSDS with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.

[Policy](https://github.com/opensds/opensds/blob/master/LICENSE)
[Policy](https://github.com/sodafoundation/controller/blob/master/LICENSE)

## 8. Scope

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# OpenSDS

[![Go Report Card](https://goreportcard.com/badge/github.com/opensds/opensds?branch=master)](https://goreportcard.com/report/github.com/opensds/opensds)
[![Build Status](https://travis-ci.org/opensds/opensds.svg?branch=master)](https://travis-ci.org/opensds/opensds)
[![Coverage Status](https://coveralls.io/repos/github/opensds/opensds/badge.svg?branch=master)](https://coveralls.io/github/opensds/opensds?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/sodafoundation/controller?branch=master)](https://goreportcard.com/report/github.com/sodafoundation/controller)
[![Build Status](https://travis-ci.org/sodafoundation/controller.svg?branch=master)](https://travis-ci.org/sodafoundation/controller)
[![Coverage Status](https://coveralls.io/repos/github/sodafoundation/controller/badge.svg?branch=master)](https://coveralls.io/github/sodafoundation/controller?branch=master)

<img src="https://www.opensds.io/wp-content/uploads/sites/18/2016/11/logo_opensds.png" width="100">

Expand Down Expand Up @@ -48,10 +48,10 @@ When reporting issues, refer to this format:

### Propose PRs

- Raise your idea as an [issue](https://github.com/opensds/opensds/issues)
- Raise your idea as an [issue](https://github.com/sodafoundation/controller/issues)
- If it is a new feature that needs lots of design details, a design proposal should also be submitted [here](https://github.com/opensds/design-specs/pulls).
- After reaching consensus in the issue discussions and design proposal reviews, complete the development on the forked repo and submit a PR.
Here are the [PRs](https://github.com/opensds/opensds/pulls?q=is%3Apr+is%3Aclosed) that are already closed.
Here are the [PRs](https://github.com/sodafoundation/controller/pulls?q=is%3Apr+is%3Aclosed) that are already closed.
- If a PR is submitted by one of the core members, it has to be merged by a different core member.
- After PR is sufficiently discussed, it will get merged, abondoned or rejected depending on the outcome of the discussion.

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The installation documents have been moved into: [https://github.com/opensds/opensds/wiki](https://github.com/opensds/opensds/wiki)
The installation documents have been moved into: [https://github.com/sodafoundation/controller/wiki](https://github.com/sodafoundation/controller/wiki)
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ ubuntu-dev-setup:
sudo apt-get update && sudo apt-get install -y \
build-essential gcc librados-dev librbd-dev

build: prebuild osdsdock osdslet osdsapiserver osdsctl metricexporter
build: prebuild osdslet

prebuild:
mkdir -p $(BUILD_DIR)

.PHONY: osdsdock osdslet osdsapiserver osdsctl docker test protoc goimports

osdsdock:
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsdock github.com/opensds/opensds/cmd/osdsdock
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsdock github.com/sodafoundation/controller/cmd/osdsdock

osdslet:
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdslet github.com/opensds/opensds/cmd/osdslet
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdslet github.com/sodafoundation/controller/cmd/osdslet

osdsapiserver:
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsapiserver github.com/opensds/opensds/cmd/osdsapiserver
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsapiserver github.com/sodafoundation/controller/cmd/osdsapiserver

osdsctl:
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsctl github.com/opensds/opensds/osdsctl
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/osdsctl github.com/sodafoundation/controller/osdsctl

metricexporter:
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/lvm_exporter github.com/opensds/opensds/contrib/exporters/lvm_exporter
go build -ldflags '-w -s' -o $(BUILD_DIR)/bin/lvm_exporter github.com/sodafoundation/controller/contrib/exporters/lvm_exporter

docker: build
cp $(BUILD_DIR)/bin/osdsdock ./cmd/osdsdock
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# OpenSDS

[![Go Report Card](https://goreportcard.com/badge/github.com/opensds/opensds?branch=master)](https://goreportcard.com/report/github.com/opensds/opensds)
[![Build Status](https://travis-ci.org/opensds/opensds.svg?branch=master)](https://travis-ci.org/opensds/opensds)
[![codecov.io](https://codecov.io/github/opensds/opensds/coverage.svg?branch=master)](https://codecov.io/github/opensds/opensds?branch=master)
[![Releases](https://img.shields.io/github/release/opensds/opensds/all.svg?style=flat-square)](https://github.com/opensds/opensds/releases)
[![LICENSE](https://img.shields.io/github/license/opensds/opensds.svg?style=flat-square)](https://github.com/opensds/opensds/blob/master/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/sodafoundation/controller?branch=master)](https://goreportcard.com/report/github.com/sodafoundation/controller)
[![Build Status](https://travis-ci.org/sodafoundation/controller.svg?branch=master)](https://travis-ci.org/sodafoundation/controller)
[![codecov.io](https://codecov.io/github/sodafoundation/controller/coverage.svg?branch=master)](https://codecov.io/github/sodafoundation/controller?branch=master)
[![Releases](https://img.shields.io/github/release/sodafoundation/controller/all.svg?style=flat-square)](https://github.com/sodafoundation/controller/releases)
[![LICENSE](https://img.shields.io/github/license/sodafoundation/controller.svg?style=flat-square)](https://github.com/sodafoundation/controller/blob/master/LICENSE)

<img src="https://www.opensds.io/wp-content/uploads/sites/18/2016/11/logo_opensds.png" width="100">

## Latest Release: v0.10.1 Daito

[OpenAPI doc](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.10.1/openapi-spec/swagger.yaml)
[OpenAPI doc](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/sodafoundation/controller/v0.10.1/openapi-spec/swagger.yaml)

[Release notes](https://github.com/opensds/opensds/releases/tag/v0.10.1)
[Release notes](https://github.com/sodafoundation/controller/releases/tag/v0.10.1)

## Introduction

Expand Down
6 changes: 3 additions & 3 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package main
import (
"fmt"

"github.com/opensds/opensds/client"
"github.com/sodafoundation/controller/client"
)

func main() {
Expand All @@ -39,8 +39,8 @@ package main
import (
"fmt"

"github.com/opensds/opensds/client"
"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/client"
"github.com/sodafoundation/controller/pkg/model"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions client/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"os"

"github.com/opensds/opensds/pkg/utils/constants"
"github.com/opensds/opensds/pkg/utils/pwd"
"github.com/sodafoundation/controller/pkg/utils/constants"
"github.com/sodafoundation/controller/pkg/utils/pwd"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"strings"

"github.com/opensds/opensds/pkg/utils/constants"
"github.com/sodafoundation/controller/pkg/utils/constants"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions client/dock.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

func NewDockMgr(r Receiver, edp string, tenantId string) *DockMgr {
Expand Down
2 changes: 1 addition & 1 deletion client/dock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fd = &DockMgr{
Expand Down
4 changes: 2 additions & 2 deletions client/fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"sync"

"github.com/opensds/opensds/pkg/model"
. "github.com/opensds/opensds/testutils/collection"
"github.com/sodafoundation/controller/pkg/model"
. "github.com/sodafoundation/controller/testutils/collection"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions client/fileshare.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

// FileShareBuilder contains request body of handling a fileshare request.
Expand Down
4 changes: 2 additions & 2 deletions client/fileshare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
. "github.com/opensds/opensds/testutils/collection"
"github.com/sodafoundation/controller/pkg/model"
. "github.com/sodafoundation/controller/testutils/collection"
)

var fakeShareMgr = &FileShareMgr{
Expand Down
4 changes: 2 additions & 2 deletions client/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

// HostBuilder contains request body of handling a host request.
Expand Down
2 changes: 1 addition & 1 deletion client/host_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fakeHostMgr = &HostMgr{
Expand Down
4 changes: 2 additions & 2 deletions client/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

// NewPoolMgr
Expand Down
2 changes: 1 addition & 1 deletion client/pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fp = &PoolMgr{
Expand Down
4 changes: 2 additions & 2 deletions client/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

// ProfileBuilder contains request body of handling a profile request.
Expand Down
2 changes: 1 addition & 1 deletion client/profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fpr = &ProfileMgr{
Expand Down
6 changes: 3 additions & 3 deletions client/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
"github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils"
"github.com/opensds/opensds/pkg/utils/constants"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils"
"github.com/sodafoundation/controller/pkg/utils/constants"
)

func NewHttpError(code int, msg string) error {
Expand Down
4 changes: 2 additions & 2 deletions client/replication.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

type ReplicationBuilder *model.ReplicationSpec
Expand Down
2 changes: 1 addition & 1 deletion client/replication_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fr = &ReplicationMgr{
Expand Down
2 changes: 1 addition & 1 deletion client/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

// VersionBuilder contains request body of handling a version request.
Expand Down
2 changes: 1 addition & 1 deletion client/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fakeVersion = &VersionMgr{
Expand Down
4 changes: 2 additions & 2 deletions client/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package client
import (
"strings"

"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/urls"
"github.com/sodafoundation/controller/pkg/model"
"github.com/sodafoundation/controller/pkg/utils/urls"
)

// VolumeBuilder contains request body of handling a volume request.
Expand Down
2 changes: 1 addition & 1 deletion client/volume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/opensds/opensds/pkg/model"
"github.com/sodafoundation/controller/pkg/model"
)

var fv = &VolumeMgr{
Expand Down
14 changes: 0 additions & 14 deletions cmd/osdsapiserver/Autobuildfile

This file was deleted.

12 changes: 0 additions & 12 deletions cmd/osdsapiserver/Dockerfile

This file was deleted.

30 changes: 0 additions & 30 deletions cmd/osdsapiserver/hooks/pre_build

This file was deleted.

Loading

0 comments on commit 923e120

Please sign in to comment.