Merge pull request #45 from oracle/ol-resolve-regional-differences

Fix incorrect volume OCID returned for Frankfurt

Author: prydie

pkg/oci/driver/driver.go

@@ -67,6 +67,22 @@ func (d OCIFlexvolumeDriver) Init() flexvolume.DriverStatus {
 	return flexvolume.Succeed()
 }
 
+// deriveVolumeOCID will figure out the correct OCID for a volume
+// based solely on the region key and volumeName. Because of differences
+// across regions we need to impose some awkward logic here to get the correct
+// OCID
+func deriveVolumeOCID(regionKey string, volumeName string) string {
+	var volumeOCID string
+
+	if regionKey == "fra" {
+		volumeOCID = fmt.Sprintf(volumeOCIDTemplate, "eu-frankfurt-1", volumeName)
+	} else {
+		volumeOCID = fmt.Sprintf(volumeOCIDTemplate, regionKey, volumeName)
+	}
+
+	return volumeOCID
+}
+
 // Attach initiates the attachment of the given OCI volume to the k8s worker
 // node.
 func (d OCIFlexvolumeDriver) Attach(opts flexvolume.Options, nodeName string) flexvolume.DriverStatus {
@@ -80,7 +96,7 @@ func (d OCIFlexvolumeDriver) Attach(opts flexvolume.Options, nodeName string) fl
 		return flexvolume.Fail(err)
 	}
 
-	volumeOCID := fmt.Sprintf(volumeOCIDTemplate, c.GetConfig().Auth.RegionKey, opts["kubernetes.io/pvOrVolumeName"])
+	volumeOCID := deriveVolumeOCID(c.GetConfig().Auth.RegionKey, opts["kubernetes.io/pvOrVolumeName"])
 
 	log.Printf("Attaching volume %s -> instance %s", volumeOCID, instance.ID)
 
@@ -122,7 +138,7 @@ func (d OCIFlexvolumeDriver) Detach(pvOrVolumeName, nodeName string) flexvolume.
 		return flexvolume.Fail(err)
 	}
 
-	volumeOCID := fmt.Sprintf(volumeOCIDTemplate, c.GetConfig().Auth.RegionKey, pvOrVolumeName)
+	volumeOCID := deriveVolumeOCID(c.GetConfig().Auth.RegionKey, pvOrVolumeName)
 	attachment, err := c.FindVolumeAttachment(volumeOCID)
 	if err != nil {
 		return flexvolume.Fail(err)
@@ -155,7 +171,7 @@ func (d OCIFlexvolumeDriver) IsAttached(opts flexvolume.Options, nodeName string
 		return flexvolume.Fail(err)
 	}
 
-	volumeOCID := fmt.Sprintf(volumeOCIDTemplate, c.GetConfig().Auth.RegionKey, opts["kubernetes.io/pvOrVolumeName"])
+	volumeOCID := deriveVolumeOCID(c.GetConfig().Auth.RegionKey, opts["kubernetes.io/pvOrVolumeName"])
 	attachment, err := c.FindVolumeAttachment(volumeOCID)
 	if err != nil {
 		return flexvolume.DriverStatus{

pkg/oci/driver/driver_test.go

@@ -0,0 +1,36 @@
+// Copyright 2017 The OCI Flexvolume Driver 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 driver
+
+import "testing"
+
+var volumeOCIDTests = []struct {
+	regionKey  string
+	volumeName string
+	expected   string
+}{
+	{"phx", "aaaaaa", "ocid1.volume.oc1.phx.aaaaaa"},
+	{"iad", "aaaaaa", "ocid1.volume.oc1.iad.aaaaaa"},
+	{"fra", "aaaaaa", "ocid1.volume.oc1.eu-frankfurt-1.aaaaaa"},
+}
+
+func TestDeriveVolumeOCID(t *testing.T) {
+	for _, tt := range volumeOCIDTests {
+		result := deriveVolumeOCID(tt.regionKey, tt.volumeName)
+		if result != tt.expected {
+			t.Errorf("Failed to derive OCID. Expected %s got %s", tt.expected, result)
+		}
+	}
+}