Add CRUD support for availability zone

client/client.go

@@ -43,6 +43,7 @@ type Client struct {
 	*ReplicationMgr
 	*FileShareMgr
 	*HostMgr
+	*AvailabilityZoneMgr
 
 	cfg *Config
 }
@@ -100,6 +101,7 @@ func NewClient(c *Config) (*Client, error) {
 		ReplicationMgr: NewReplicationMgr(r, c.Endpoint, t),
 		FileShareMgr:   NewFileShareMgr(r, c.Endpoint, t),
 		HostMgr:        NewHostMgr(r, c.Endpoint, t),
+		AvailabilityZoneMgr:        NewAvailabilityZoneMgr(r, c.Endpoint, t),
 	}, nil
 }
 

client/fake.go

@@ -67,6 +67,10 @@ func NewFakeClient(config *Config) *Client {
 				Receiver: NewFakeHostReceiver(),
 				Endpoint: config.Endpoint,
 			},
+			AvailabilityZoneMgr: &AvailabilityZoneMgr{
+				Receiver: NewFakeZoneReceiver(),
+				Endpoint: config.Endpoint,
+			},
 		}
 	})
 	return fakeClient
@@ -488,3 +492,63 @@ func (*fakeHostReceiver) Recv(
 
 	return nil
 }
+
+func NewFakeZoneReceiver() Receiver {
+	return &fakeZoneReceiver{}
+}
+
+type fakeZoneReceiver struct{}
+
+func (*fakeZoneReceiver) Recv(
+	string,
+	method string,
+	in interface{},
+	out interface{},
+) error {
+	switch strings.ToUpper(method) {
+	case "POST":
+		switch out.(type) {
+		case *model.AvailabilityZoneSpec:
+			if err := json.Unmarshal([]byte(ByteAvailabilityZone), out); err != nil {
+				return err
+			}
+			break
+		default:
+			return errors.New("output format not supported")
+		}
+		break
+	case "GET":
+		switch out.(type) {
+		case *model.AvailabilityZoneSpec:
+			if err := json.Unmarshal([]byte(ByteAvailabilityZone), out); err != nil {
+				return err
+			}
+			break
+		case *[]*model.AvailabilityZoneSpec:
+			if err := json.Unmarshal([]byte(ByteAvailabilityZones), out); err != nil {
+				return err
+			}
+			break
+		default:
+			return errors.New("output format not supported")
+		}
+		break
+	case "PUT":
+		switch out.(type) {
+		case *model.AvailabilityZoneSpec:
+			if err := json.Unmarshal([]byte(ByteAvailabilityZone), out); err != nil {
+				return err
+			}
+			break
+		default:
+			return errors.New("output format not supported")
+		}
+		break
+	case "DELETE":
+		break
+	default:
+		return errors.New("inputed method format not supported")
+	}
+
+	return nil
+}

client/zone.go

@@ -0,0 +1,117 @@
+// Copyright 2019 The OpenSDS Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package client
+
+import (
+	"strings"
+
+	"github.com/opensds/opensds/pkg/model"
+	"github.com/opensds/opensds/pkg/utils/urls"
+)
+
+// AvailabilityZoneBuilder contains request body of handling a zone request.
+// Currently it's assigned as the pointer of AvailabilityZoneSpec struct, but it
+// could be discussed if it's better to define an interface.
+type AvailabilityZoneBuilder *model.AvailabilityZoneSpec
+
+// NewAvailabilityZoneMgr
+func NewAvailabilityZoneMgr(r Receiver, edp string, tenantId string) *AvailabilityZoneMgr {
+	return &AvailabilityZoneMgr{
+		Receiver: r,
+		Endpoint: edp,
+		TenantId: tenantId,
+	}
+}
+
+// AvailabilityZoneMgr
+type AvailabilityZoneMgr struct {
+	Receiver
+	Endpoint string
+	TenantId string
+}
+
+// CreateAvailabilityZone
+func (p *AvailabilityZoneMgr) CreateAvailabilityZone(body AvailabilityZoneBuilder) (*model.AvailabilityZoneSpec, error) {
+	var res model.AvailabilityZoneSpec
+	url := strings.Join([]string{
+		p.Endpoint,
+		urls.GenerateZoneURL(urls.Client, p.TenantId)}, "/")
+
+	if err := p.Recv(url, "POST", body, &res); err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
+// GetAvailabilityZone
+func (p *AvailabilityZoneMgr) GetAvailabilityZone(zoneID string) (*model.AvailabilityZoneSpec, error) {
+	var res model.AvailabilityZoneSpec
+	url := strings.Join([]string{
+		p.Endpoint,
+		urls.GenerateZoneURL(urls.Client, p.TenantId, zoneID)}, "/")
+
+	if err := p.Recv(url, "GET", nil, &res); err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
+// UpdateAvailabilityZone ...
+func (p *AvailabilityZoneMgr) UpdateAvailabilityZone(zoneID string, body AvailabilityZoneBuilder) (*model.AvailabilityZoneSpec, error) {
+	var res model.AvailabilityZoneSpec
+	url := strings.Join([]string{
+		p.Endpoint,
+		urls.GenerateZoneURL(urls.Client, p.TenantId, zoneID)}, "/")
+
+	if err := p.Recv(url, "PUT", body, &res); err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
+// ListAvailabilityZones
+func (p *AvailabilityZoneMgr) ListAvailabilityZones(args ...interface{}) ([]*model.AvailabilityZoneSpec, error) {
+	var res []*model.AvailabilityZoneSpec
+
+	url := strings.Join([]string{
+		p.Endpoint,
+		urls.GenerateZoneURL(urls.Client, p.TenantId)}, "/")
+
+	param, err := processListParam(args)
+	if err != nil {
+		return nil, err
+	}
+
+	if param != "" {
+		url += "?" + param
+	}
+	if err := p.Recv(url, "GET", nil, &res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// DeleteAvailabilityZone
+func (p *AvailabilityZoneMgr) DeleteAvailabilityZone(zoneID string) error {
+	url := strings.Join([]string{
+		p.Endpoint,
+		urls.GenerateZoneURL(urls.Client, p.TenantId, zoneID)}, "/")
+
+	return p.Recv(url, "DELETE", nil, nil)
+}

client/zone_test.go

@@ -0,0 +1,129 @@
+// Copyright 2019 The OpenSDS Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package client
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/opensds/opensds/pkg/model"
+)
+
+var fzn = &AvailabilityZoneMgr{
+	Receiver: NewFakeZoneReceiver(),
+}
+
+func TestCreateAvailabilityZone(t *testing.T) {
+	expected := &model.AvailabilityZoneSpec{
+		BaseModel: &model.BaseModel{
+			Id: "1106b972-66ef-11e7-b172-db03f3689c9c",
+		},
+		Name:        "default",
+		Description: "default zone",
+	}
+
+	zn, err := fzn.CreateAvailabilityZone(&model.AvailabilityZoneSpec{})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if !reflect.DeepEqual(zn, expected) {
+		t.Errorf("Expected %v, got %v", expected, zn)
+		return
+	}
+}
+
+func TestGetAvailabilityZone(t *testing.T) {
+	var znID = "1106b972-66ef-11e7-b172-db03f3689c9c"
+	expected := &model.AvailabilityZoneSpec{
+		BaseModel: &model.BaseModel{
+			Id: "1106b972-66ef-11e7-b172-db03f3689c9c",
+		},
+		Name:        "default",
+		Description: "default zone",
+	}
+
+	zn, err := fzn.GetAvailabilityZone(znID)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if !reflect.DeepEqual(zn, expected) {
+		t.Errorf("Expected %v, got %v", expected, zn)
+		return
+	}
+}
+
+func TestListAvailabilityZone(t *testing.T) {
+	expected := []*model.AvailabilityZoneSpec{
+		{
+			BaseModel: &model.BaseModel{
+				Id: "1106b972-66ef-11e7-b172-db03f3689c9c",
+			},
+			Name:        "default",
+			Description: "default zone",
+		},
+		{
+			BaseModel: &model.BaseModel{
+				Id: "2f9c0a04-66ef-11e7-ade2-43158893e017",
+			},
+			Name:        "test",
+			Description: "test zone",
+		},
+	}
+
+	zns, err := fzn.ListAvailabilityZones()
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if !reflect.DeepEqual(zns, expected) {
+		t.Errorf("Expected %v, got %v", expected[1], zns[1])
+		return
+	}
+}
+
+func TestUpdateAvailabilityZone(t *testing.T) {
+	expected := &model.AvailabilityZoneSpec{
+		BaseModel: &model.BaseModel{
+			Id: "1106b972-66ef-11e7-b172-db03f3689c9c",
+		},
+		Name:        "default",
+		Description: "default zone",
+	}
+
+	zn, err := fzn.UpdateAvailabilityZone("1106b972-66ef-11e7-b172-db03f3689c9c", &model.AvailabilityZoneSpec{})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if !reflect.DeepEqual(zn, expected) {
+		t.Errorf("Expected %v, got %v", expected, zn)
+		return
+	}
+}
+
+func TestDeleteAvailabilityZone(t *testing.T) {
+	var znID = "1106b972-66ef-11e7-b172-db03f3689c9c"
+
+	if err := fzn.DeleteAvailabilityZone(znID); err != nil {
+		t.Error(err)
+		return
+	}
+}

examples/policy.json

@@ -47,6 +47,10 @@
   "volume_group:update": "rule:admin_or_owner",
   "volume_group:delete": "rule:admin_or_owner",
   "availability_zone:list":"",
+  "availability_zone:get":"",
+  "availability_zone:create":"admin_api",
+  "availability_zone:delete":"admin_api",
+  "availability_zone:update":"admin_api",
   "metrics:get": "rule:admin_or_owner",
   "metrics:collect": "rule:admin_or_owner",
   "metrics:uploadconf": "rule:admin_api",

osdsctl/cli/cli.go

@@ -50,6 +50,7 @@ func init() {
 	rootCommand.AddCommand(profileCommand)
 	rootCommand.AddCommand(fileShareCommand)
 	rootCommand.AddCommand(hostCommand)
+	rootCommand.AddCommand(zoneCommand)
 	flags := rootCommand.PersistentFlags()
 	flags.BoolVar(&Debug, "debug", false, "shows debugging output.")
 }