Merge pull request #54 from oracle/kj-oci-go-sdk

Update to use the oci-go-sdk

Author: garthy

Gopkg.lock

@@ -21,10 +21,6 @@
 #  version = "2.4.0"
 
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/oracle/bmcs-go-sdk"
-
 [[constraint]]
   branch = "master"
   name = "k8s.io/utils"

Gopkg.toml

@@ -230,14 +230,14 @@ func ExecDriver(driver Driver, args []string) {
 
 		ExitWithResult(driver.MountDevice(mountDir, mountDevice, opts))
 
-	// <driver executable> unmountdevice <mount device>
+	// <driver executable> unmountdevice <mount dir>
 	case "unmountdevice":
 		if len(args) != 3 {
 			ExitWithResult(Fail("unmountdevice expected exactly 3 arguments; got ", args))
 		}
 
-		mountDevice := args[2]
-		ExitWithResult(driver.UnmountDevice(mountDevice))
+		mountDir := args[2]
+		ExitWithResult(driver.UnmountDevice(mountDir))
 
 	// <driver executable> mount <mount dir> <json options>
 	case "mount":

pkg/flexvolume/flexvolume.go

@@ -20,11 +20,11 @@ import (
 	"os"
 	"syscall"
 
-	baremetal "github.com/oracle/bmcs-go-sdk"
+	"github.com/oracle/oci-go-sdk/core"
 )
 
 type OCICache struct {
-	vnics    map[string]baremetal.Vnic
+	vnics    map[string]core.Vnic
 	file     *os.File
 	filename string
 }
@@ -41,7 +41,7 @@ func Open(filename string) (*OCICache, error) {
 		log.Printf("Failed to lock cache: %v", err)
 		return nil, err
 	}
-	var vnicCache = map[string]baremetal.Vnic{}
+	var vnicCache = map[string]core.Vnic{}
 	decoder := json.NewDecoder(file)
 	err = decoder.Decode(&vnicCache)
 	if err != nil {
@@ -51,13 +51,13 @@ func Open(filename string) (*OCICache, error) {
 }
 
 // GetVnic looks up the vnic id in the cache
-func (nc *OCICache) GetVnic(id string) (*baremetal.Vnic, bool) {
+func (nc *OCICache) GetVnic(id string) (*core.Vnic, bool) {
 	value, ok := nc.vnics[id]
 	return &value, ok
 }
 
 // SetVnic adds a vnic to the cache
-func (nc *OCICache) SetVnic(id string, value *baremetal.Vnic) {
+func (nc *OCICache) SetVnic(id string, value *core.Vnic) {
 	nc.vnics[id] = *value
 }
 

pkg/oci/client/cache/ocicache.go

@@ -19,9 +19,10 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
+	"reflect"
 	"testing"
 
-	baremetal "github.com/oracle/bmcs-go-sdk"
+	"github.com/oracle/oci-go-sdk/core"
 )
 
 func TempFileName(prefix, suffix string) string {
@@ -39,7 +40,8 @@ func TestCache(t *testing.T) {
 	}
 	defer cache.Close()
 
-	var testVnic = baremetal.Vnic{ID: "test"}
+	id := "test"
+	var testVnic = core.Vnic{Id: &id}
 	cache.SetVnic("test", &testVnic)
 	value, ok := cache.GetVnic("test")
 	if !ok {
@@ -80,7 +82,8 @@ func TestCacheLoadSave(t *testing.T) {
 		t.Error(err)
 	}
 	defer firstCache.Close()
-	var testVnic = baremetal.Vnic{ID: "test"}
+	id := "test"
+	var testVnic = core.Vnic{Id: &id}
 	firstCache.SetVnic("test", &testVnic)
 	value, ok := firstCache.GetVnic("test")
 	if !ok {
@@ -101,7 +104,8 @@ func TestCacheLoadSave(t *testing.T) {
 	if !ok {
 		t.Error("test not found")
 	}
-	if *value != testVnic {
+
+	if !reflect.DeepEqual(*value, testVnic) {
 		t.Error("Key not equal to test")
 	}
 	err = otherCache.Close()
@@ -119,7 +123,8 @@ func TestCacheParallel(t *testing.T) {
 			t.Error(err)
 		}
 		defer cache.Close()
-		var testVnic = baremetal.Vnic{ID: "test"}
+		id := "test"
+		var testVnic = core.Vnic{Id: &id}
 		cache.SetVnic("test", &testVnic)
 		value, ok := cache.GetVnic("test")
 		if !ok {