Skip to content

feat: expose ZoneTopologyKey #16

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 18, 2020
Merged

feat: expose ZoneTopologyKey #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions driver/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
return nil, status.Error(codes.Internal, err.Error())
}
segments := map[string]string{
zoneTopologyKey: string(volumeResp.Volume.Zone),
ZoneTopologyKey: string(volumeResp.Volume.Zone),
}

return &csi.CreateVolumeResponse{
Expand All @@ -213,7 +213,7 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
}

segments := map[string]string{
zoneTopologyKey: string(volumeResp.Volume.Zone),
ZoneTopologyKey: string(volumeResp.Volume.Zone),
}

return &csi.CreateVolumeResponse{
Expand Down
2 changes: 1 addition & 1 deletion driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
const (
// DriverName is the official name for the Scaleway CSI plugin
DriverName = "csi.scaleway.com"
zoneTopologyKey = "topology." + DriverName + "/zone"
ZoneTopologyKey = "topology." + DriverName + "/zone"
)

// Mode represents the mode in which the CSI driver started
Expand Down
10 changes: 5 additions & 5 deletions driver/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func chooseZones(accessibilityRequirements *csi.TopologyRequirement, snapshotZon
topologyKeys := req.GetSegments()
for topologyKey, topologyValue := range topologyKeys {
switch topologyKey {
case zoneTopologyKey:
case ZoneTopologyKey:
zone, err := scw.ParseZone(topologyValue)
if err != nil {
klog.Warningf("the given value for requisite %s: %s is not a valid zone", zoneTopologyKey, topologyValue)
klog.Warningf("the given value for requisite %s: %s is not a valid zone", ZoneTopologyKey, topologyValue)
continue
}
if snapshotZone == scw.Zone("") || snapshotZone == zone {
Expand All @@ -76,10 +76,10 @@ func chooseZones(accessibilityRequirements *csi.TopologyRequirement, snapshotZon
topologyKeys := pref.GetSegments()
for topologyKey, topologyValue := range topologyKeys {
switch topologyKey {
case zoneTopologyKey:
case ZoneTopologyKey:
zone, err := scw.ParseZone(topologyValue)
if err != nil {
klog.Warningf("the given value for preferred %s: %s is not a valid zone", zoneTopologyKey, topologyValue)
klog.Warningf("the given value for preferred %s: %s is not a valid zone", ZoneTopologyKey, topologyValue)
continue
}
if snapshotZone == scw.Zone("") || snapshotZone == zone {
Expand Down Expand Up @@ -212,7 +212,7 @@ func getVolumeRequestCapacity(capacityRange *csi.CapacityRange) (int64, error) {
func newAccessibleTopology(zone scw.Zone) []*csi.Topology {
return []*csi.Topology{
{
Segments: map[string]string{zoneTopologyKey: zone.String()},
Segments: map[string]string{ZoneTopologyKey: zone.String()},
},
}
}
Expand Down
70 changes: 35 additions & 35 deletions driver/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func Test_chooseZones(t *testing.T) {
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Expand All @@ -179,14 +179,14 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Expand All @@ -200,19 +200,19 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Expand All @@ -226,24 +226,24 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Expand All @@ -257,24 +257,24 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: "fr-par-4",
ZoneTopologyKey: "fr-par-4",
},
},
{
Segments: map[string]string{
zoneTopologyKey: "fr-par-3",
ZoneTopologyKey: "fr-par-3",
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: "fr-par-4",
ZoneTopologyKey: "fr-par-4",
},
},
{
Segments: map[string]string{
zoneTopologyKey: "fr-par-3",
ZoneTopologyKey: "fr-par-3",
},
},
},
Expand All @@ -288,14 +288,14 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: "fr-ams",
ZoneTopologyKey: "fr-ams",
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: "fr-par",
ZoneTopologyKey: "fr-par",
},
},
},
Expand Down Expand Up @@ -330,7 +330,7 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Expand All @@ -344,19 +344,19 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Expand All @@ -370,19 +370,19 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Expand All @@ -396,24 +396,24 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Expand All @@ -427,24 +427,24 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
Expand All @@ -458,26 +458,26 @@ func Test_chooseZones(t *testing.T) {
Preferred: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar1),
ZoneTopologyKey: string(scw.ZoneFrPar1),
},
},
},
Requisite: []*csi.Topology{
{
Segments: map[string]string{
zoneTopologyKey: string(scw.ZoneFrPar2),
ZoneTopologyKey: string(scw.ZoneFrPar2),
},
},
},
},
zone: scw.Zone(""),
expected: nil,
err: status.Errorf(codes.InvalidArgument, "%s: %s is specified in preferred but not in requisite", zoneTopologyKey, scw.ZoneFrPar1),
err: status.Errorf(codes.InvalidArgument, "%s: %s is specified in preferred but not in requisite", ZoneTopologyKey, scw.ZoneFrPar1),
},
}

Expand Down
2 changes: 1 addition & 1 deletion driver/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ func (d *nodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque
MaxVolumesPerNode: maxVolumesPerNode - 1, // One is already used by the l_ssd root volume
AccessibleTopology: &csi.Topology{
Segments: map[string]string{
zoneTopologyKey: d.nodeZone.String(),
ZoneTopologyKey: d.nodeZone.String(),
},
},
}, nil
Expand Down