Merge pull request #46 from oracle/gb-nodename-cache

Add a cache to the nodename to instance lookup and also filter on VCN

Author: kristenjacobs

README.md

@@ -89,6 +89,7 @@ auth:
     <snip>
     -----END RSA PRIVATE KEY-----
   fingerprint: d4:1d:8c:d9:8f:00:b2:04:e9:80:09:98:ec:f8:42:7e
+  vcn: ocid1.vcn.oc1.phx.aaaaaaaaqiqmei4yen2fuyqaiqfcejpguqs6tuaf2n2iaxiwf5cfji2s636a
 ```
 
 If `"region"` and/or `"compartment"` are not specified in the config file

pkg/oci/client/cache/ocicache.go

@@ -0,0 +1,91 @@
+// Copyright 2017 Oracle and/or its affiliates. All rights reserved.
+//
+// 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 cache
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+	"syscall"
+
+	baremetal "github.com/oracle/bmcs-go-sdk"
+)
+
+type OCICache struct {
+	vnics    map[string]baremetal.Vnic
+	file     *os.File
+	filename string
+}
+
+// Open opens the cache and returns the cache handle
+func Open(filename string) (*OCICache, error) {
+	file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0644)
+	if err != nil {
+		log.Printf("Failed to open cache: %v", err)
+		return nil, err
+	}
+
+	if err := syscall.Flock(int(file.Fd()), syscall.LOCK_EX); err != nil {
+		log.Printf("Failed to lock cache: %v", err)
+		return nil, err
+	}
+	var vnicCache = map[string]baremetal.Vnic{}
+	decoder := json.NewDecoder(file)
+	err = decoder.Decode(&vnicCache)
+	if err != nil {
+		log.Printf("Failed to decode cache: %v", err)
+	}
+	return &OCICache{file: file, vnics: vnicCache, filename: filename}, nil
+}
+
+// GetVnic looks up the vnic id in the cache
+func (nc *OCICache) GetVnic(id string) (*baremetal.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) {
+	nc.vnics[id] = *value
+}
+
+// Close closes the vnic cache saving to disk and unlocking the file
+func (nc *OCICache) Close() error {
+	if nc.file != nil {
+		defer func() {
+			nc.file.Close()
+			nc.file = nil
+
+		}()
+		_, err := nc.file.Seek(0, 0)
+		if err != nil {
+			log.Printf("Error marshalling OCICache to JSON: %v", err)
+			return err
+		}
+
+		encoder := json.NewEncoder(nc.file)
+		err = encoder.Encode(&nc.vnics)
+		if err != nil {
+			log.Printf("Error marshalling OCICache to JSON: %v", err)
+			return err
+		}
+
+		if err := syscall.Flock(int(nc.file.Fd()), syscall.LOCK_UN); err != nil {
+			log.Printf("Error marshalling OCICache to JSON: %v", err)
+			return err
+		}
+	}
+	return nil
+}

pkg/oci/client/cache/ocicache_test.go

@@ -0,0 +1,140 @@
+// Copyright 2017 Oracle and/or its affiliates. All rights reserved.
+//
+// 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 cache
+
+import (
+	"encoding/hex"
+	"math/rand"
+	"os"
+	"path/filepath"
+	"testing"
+
+	baremetal "github.com/oracle/bmcs-go-sdk"
+)
+
+func TempFileName(prefix, suffix string) string {
+	randBytes := make([]byte, 16)
+	rand.Read(randBytes)
+	return filepath.Join(os.TempDir(), prefix+hex.EncodeToString(randBytes)+suffix)
+}
+
+func TestCache(t *testing.T) {
+	cacheName := TempFileName("/tmp", "TestCache.json")
+	t.Logf("Testcache: %s", cacheName)
+	cache, err := Open(cacheName)
+	if err != nil {
+		t.Error(err)
+	}
+	defer cache.Close()
+
+	var testVnic = baremetal.Vnic{ID: "test"}
+	cache.SetVnic("test", &testVnic)
+	value, ok := cache.GetVnic("test")
+	if !ok {
+		t.Error("test not found")
+	}
+	if *value != testVnic {
+		t.Error("Key not equal to test")
+	}
+	err = cache.Close()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestCacheMultipleClose(t *testing.T) {
+	cacheName := TempFileName("/tmp", "TestCache.json")
+	t.Logf("Testcache: %s", cacheName)
+	cache, err := Open(cacheName)
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = cache.Close()
+	if err != nil {
+		t.Error(err)
+	}
+	err = cache.Close()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestCacheLoadSave(t *testing.T) {
+	cacheName := TempFileName("/tmp", "TestCache.json")
+	t.Logf("Testcache: %s", cacheName)
+	firstCache, err := Open(cacheName)
+	if err != nil {
+		t.Error(err)
+	}
+	defer firstCache.Close()
+	var testVnic = baremetal.Vnic{ID: "test"}
+	firstCache.SetVnic("test", &testVnic)
+	value, ok := firstCache.GetVnic("test")
+	if !ok {
+		t.Error("test not found")
+	}
+	if *value != testVnic {
+		t.Error("Key not equal to test")
+	}
+	err = firstCache.Close()
+	if err != nil {
+		t.Error(err)
+	}
+	otherCache, err := Open(cacheName)
+	if err != nil {
+		t.Error(err)
+	}
+	value, ok = otherCache.GetVnic("test")
+	if !ok {
+		t.Error("test not found")
+	}
+	if *value != testVnic {
+		t.Error("Key not equal to test")
+	}
+	err = otherCache.Close()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestCacheParallel(t *testing.T) {
+	cacheName := TempFileName("/tmp", "TestCache.json")
+	t.Logf("Testcache: %s", cacheName)
+	use := func() {
+		cache, err := Open(cacheName)
+		if err != nil {
+			t.Error(err)
+		}
+		defer cache.Close()
+		var testVnic = baremetal.Vnic{ID: "test"}
+		cache.SetVnic("test", &testVnic)
+		value, ok := cache.GetVnic("test")
+		if !ok {
+			t.Error("test not found")
+		}
+		if *value != testVnic {
+			t.Error("Key not equal to test")
+		}
+		err = cache.Close()
+		if err != nil {
+			t.Error(err)
+		}
+	}
+
+	for i := 0; i < 4000; i++ {
+		go use()
+	}
+}

pkg/oci/client/config.go

@@ -44,6 +44,7 @@ type AuthConfig struct {
 	UserOCID        string `yaml:"user"`
 	PrivateKey      string `yaml:"key"`
 	Fingerprint     string `yaml:"fingerprint"`
+	VcnOCID         string `yaml:"vcn"`
 }
 
 // Config holds the configuration for the OCI flexvolume driver.