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

Refactor beginning #111

Merged
merged 64 commits into from
Feb 3, 2016
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
75d3e6e
add proto Makefile command
bufdev Dec 21, 2015
8071787
add enum definitions to api.proto
bufdev Dec 21, 2015
4fd55f1
add message definitions to api.proto, remove unused types in cluster.go
bufdev Dec 21, 2015
493b751
comment on FSType
bufdev Dec 21, 2015
92b14f4
ClusterStatus to Status
bufdev Dec 21, 2015
c06e826
*** remove most api public types, add generated protobuf definitions ***
bufdev Dec 21, 2015
140a445
api/client, cluster, volume compiling
bufdev Dec 21, 2015
d0ceb68
start fixing api/server errors
bufdev Dec 21, 2015
2faf10e
restBase.logReq to restBase.logRequest
bufdev Dec 21, 2015
0110e54
clean up cluster init and start logic
bufdev Dec 21, 2015
50d94f0
simple strings and simple value of functions, cleanup for cluster api
bufdev Dec 21, 2015
56f91ae
api/server builds but needs cleanup
bufdev Dec 21, 2015
5d47ee7
graph package updated
bufdev Dec 21, 2015
091263a
start getting volume drivers to compile, volume/drivers/aws compiling
bufdev Dec 21, 2015
0ccc067
start getting volume/drivers/btrfs cleaned up
bufdev Dec 21, 2015
b533dff
volume/drivers/btrfs compiling
bufdev Dec 21, 2015
c043477
add volume/drivers/common/common.go
bufdev Dec 21, 2015
be79eb1
add volume/drivers/common/common.go
bufdev Dec 21, 2015
c8bfc85
start working on volume/drivers/buse
bufdev Dec 21, 2015
ce1d361
merge
bufdev Dec 21, 2015
1e28d9f
merge
bufdev Jan 3, 2016
225de84
add protoeasy.yaml
bufdev Jan 3, 2016
0d81bf9
fix pkg/stats
bufdev Jan 3, 2016
a3f12e8
some cleanup for ./volume
bufdev Jan 3, 2016
c4e5cbd
fix aws, btrfs, buse
bufdev Jan 3, 2016
1f92720
use common.NewVolume in buse
bufdev Jan 3, 2016
27d9bfc
fix fise
bufdev Jan 3, 2016
477caf5
fix nfs
bufdev Jan 3, 2016
5fd0d4e
fix pwx
bufdev Jan 3, 2016
c3dc073
fix volume/drivers/test
bufdev Jan 3, 2016
b3575e7
volume building
bufdev Jan 3, 2016
bfeba02
api, cluster, config, pkg, volume building
bufdev Jan 3, 2016
b32e579
cli building
bufdev Jan 3, 2016
98e07b4
make build passing
bufdev Jan 3, 2016
c9607a7
add github.com/golang/protobuf and go.pedge.io/google-protobuf, go.pe…
bufdev Jan 3, 2016
5c7374e
start fixing tests
bufdev Jan 3, 2016
386f2c1
clean up api/client
bufdev Jan 3, 2016
ff6b325
change assert to require in volume/drivers/test/driver.go
bufdev Jan 3, 2016
19abd94
remove logrus debug print of body in client
bufdev Jan 3, 2016
4654abe
Merge branch 'master' into refactor
bufdev Jan 3, 2016
ec085f8
remove volume action ignore
bufdev Jan 3, 2016
88c7117
fix api/client testing
bufdev Jan 3, 2016
68e6951
change make docker-build to make docker-build-osd-dev, add make docke…
bufdev Jan 3, 2016
1f1f7c3
Merge branch 'master' into refactor
jvinod Jan 16, 2016
be6ff53
refactor coprhd
jvinod Jan 16, 2016
60bf217
cmdMarshalProto
bufdev Jan 18, 2016
292b91f
add jsonpb to vendor
bufdev Jan 18, 2016
7b13b45
merge
bufdev Jan 21, 2016
1e749d5
fix cluster
bufdev Jan 21, 2016
959dd36
proto outputs json etc
bufdev Jan 21, 2016
eda632c
fix volume cos for cli command
bufdev Jan 22, 2016
7b33657
COS back to int, and update vendor
bufdev Jan 22, 2016
a858113
custom jsonpb for cli output
bufdev Jan 22, 2016
27f8ccb
add diff
bufdev Jan 22, 2016
fa57fcf
style guide
bufdev Jan 22, 2016
f0e0502
Update STYLEGUIDE.md
bufdev Jan 22, 2016
467ab17
make config package not depend on other openstorage code, centralize …
bufdev Jan 22, 2016
2a41b1b
delete protoeasy.yaml
bufdev Jan 22, 2016
e073738
readme for protoeasy
bufdev Jan 22, 2016
86471b3
move from logrus to dlog
bufdev Jan 22, 2016
89eec9f
move to dlog register functions from dlog blank imports
bufdev Jan 22, 2016
3201922
make json timestamps readable
bufdev Jan 25, 2016
fbc67d2
Update STYLEGUIDE.md
gourao Jan 29, 2016
502ca77
merge from master
jvinod Feb 3, 2016
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
Prev Previous commit
Next Next commit
fix pwx
  • Loading branch information
bufdev committed Jan 3, 2016
commit 5fd0d4ef3d52a79cf36d48527e2a089b64192812
12 changes: 6 additions & 6 deletions api/client/volume.go
Original file line number Diff line number Diff line change
@@ -140,11 +140,11 @@ func (v *volumeClient) Status() [][2]string {

// Inspect specified volumes.
// Errors ErrEnoEnt may be returned.
func (v *volumeClient) Inspect(ids []string) ([]api.Volume, error) {
func (v *volumeClient) Inspect(ids []string) ([]*api.Volume, error) {
if len(ids) == 0 {
return nil, nil
}
var volumes []api.Volume
var volumes []*api.Volume
request := v.c.Get().Resource(volumePath)
for _, id := range ids {
request.QueryOption(api.OptVolumeID, id)
@@ -216,8 +216,8 @@ func (v *volumeClient) Shutdown() {}

// Enumerate volumes that map to the volumeLocator. Locator fields may be regexp.
// If locator fields are left blank, this will return all volumes.
func (v *volumeClient) Enumerate(locator *api.VolumeLocator, labels map[string]string) ([]api.Volume, error) {
var volumes []api.Volume
func (v *volumeClient) Enumerate(locator *api.VolumeLocator, labels map[string]string) ([]*api.Volume, error) {
var volumes []*api.Volume
req := v.c.Get().Resource(volumePath)
if locator.Name != "" {
req.QueryOption(api.OptName, locator.Name)
@@ -236,8 +236,8 @@ func (v *volumeClient) Enumerate(locator *api.VolumeLocator, labels map[string]s

// Enumerate snaps for specified volume
// Count indicates the number of snaps populated.
func (v *volumeClient) SnapEnumerate(ids []string, snapLabels map[string]string) ([]api.Volume, error) {
var volumes []api.Volume
func (v *volumeClient) SnapEnumerate(ids []string, snapLabels map[string]string) ([]*api.Volume, error) {
var volumes []*api.Volume
request := v.c.Get().Resource(snapPath)
for _, id := range ids {
request.QueryOption(api.OptVolumeID, id)
2 changes: 1 addition & 1 deletion volume/drivers/pwx/pwx.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (

const (
Name = "pwx"
Type = api.Block
Type = api.DriverType_DRIVER_TYPE_BLOCK
DefaultUrl = "unix:///" + config.DriverAPIBase + "pxd.sock"
DefaultVersion = "v1"
)