From b2b175eae0f4e8b5b0cb9ccbeeca1e98065feeb5 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Fri, 15 Mar 2019 15:18:12 -0700 Subject: Update definition and profile to latest spec Bringing all the definition and profile code upto the latest spec. Integrated the end to end instance code changes that were made. P9: Added updated plugin.sh with updated uri paths based on spec Issue-ID: MULTICLOUD-291 Change-Id: Id6e3c6bc2cd02cfb7005e203ccf03e0793b97e95 Signed-off-by: Kiran Kamineni --- src/k8splugin/internal/db/consul_test.go | 14 +++++++------- src/k8splugin/internal/db/mongo_test.go | 22 +++++++++++----------- src/k8splugin/internal/db/testing.go | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/k8splugin/internal/db') diff --git a/src/k8splugin/internal/db/consul_test.go b/src/k8splugin/internal/db/consul_test.go index 6d127841..abd264c8 100644 --- a/src/k8splugin/internal/db/consul_test.go +++ b/src/k8splugin/internal/db/consul_test.go @@ -108,13 +108,13 @@ func TestConsulCreate(t *testing.T) { }{ { label: "Sucessful register a record to Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, input: map[string]string{"root": "rbinst", "tag": "data", "value": "test-value"}, mock: &mockConsulKVStore{}, }, { label: "Fail to create a new record in Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, input: map[string]string{"root": "rbinst", "tag": "data", "value": "test-value"}, mock: &mockConsulKVStore{ Err: pkgerrors.New("DB error"), @@ -151,7 +151,7 @@ func TestConsulRead(t *testing.T) { }{ { label: "Sucessful retrieve a record from Consul Database", - key: mockKey{Key: "test"}, + key: MockKey{Key: "test"}, input: map[string]string{"root": "rbinst", "tag": "data"}, mock: &mockConsulKVStore{ Items: api.KVPairs{ @@ -165,13 +165,13 @@ func TestConsulRead(t *testing.T) { }, { label: "Fail retrieve a non-existing record from Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, input: map[string]string{"root": "rbinst", "tag": "data"}, mock: &mockConsulKVStore{}, }, { label: "Fail retrieve a record from Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, input: map[string]string{"root": "rbinst", "tag": "data"}, mock: &mockConsulKVStore{ Err: pkgerrors.New("DB error"), @@ -215,13 +215,13 @@ func TestConsulDelete(t *testing.T) { }{ { label: "Sucessful delete a record to Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, input: map[string]string{"root": "rbinst", "tag": "data"}, mock: &mockConsulKVStore{}, }, { label: "Fail to delete a record in Consul Database", - key: mockKey{Key: "test-key"}, + key: MockKey{Key: "test-key"}, mock: &mockConsulKVStore{ Err: pkgerrors.New("DB error"), }, diff --git a/src/k8splugin/internal/db/mongo_test.go b/src/k8splugin/internal/db/mongo_test.go index deb51044..baa442ce 100644 --- a/src/k8splugin/internal/db/mongo_test.go +++ b/src/k8splugin/internal/db/mongo_test.go @@ -84,7 +84,7 @@ func TestCreate(t *testing.T) { label: "Successfull creation of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "tagName", "data": "Data In String Format", }, @@ -95,7 +95,7 @@ func TestCreate(t *testing.T) { label: "UnSuccessfull creation of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "tagName", "data": "Data In String Format", }, @@ -108,7 +108,7 @@ func TestCreate(t *testing.T) { label: "Missing input fields", input: map[string]interface{}{ "coll": "", - "key": mockKey{Key: ""}, + "key": MockKey{Key: ""}, "tag": "", "data": "", }, @@ -156,7 +156,7 @@ func TestRead(t *testing.T) { label: "Successfull Read of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "metadata", }, // Binary form of @@ -186,7 +186,7 @@ func TestRead(t *testing.T) { label: "UnSuccessfull Read of entry: object not found", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "badtag", }, // Binary form of @@ -215,7 +215,7 @@ func TestRead(t *testing.T) { label: "UnSuccessfull Read of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "tagName", }, mockColl: &mockCollection{ @@ -227,7 +227,7 @@ func TestRead(t *testing.T) { label: "Missing input fields", input: map[string]interface{}{ "coll": "", - "key": mockKey{Key: ""}, + "key": MockKey{Key: ""}, "tag": "", }, expectedError: "Mandatory fields are missing", @@ -277,7 +277,7 @@ func TestDelete(t *testing.T) { label: "Successfull Delete of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "metadata", }, // Binary form of @@ -305,7 +305,7 @@ func TestDelete(t *testing.T) { label: "UnSuccessfull Delete of entry", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "tagName", }, mockColl: &mockCollection{ @@ -317,7 +317,7 @@ func TestDelete(t *testing.T) { label: "UnSuccessfull Delete, key not found", input: map[string]interface{}{ "coll": "collname", - "key": mockKey{Key: "keyvalue"}, + "key": MockKey{Key: "keyvalue"}, "tag": "tagName", }, // Binary form of @@ -346,7 +346,7 @@ func TestDelete(t *testing.T) { label: "Missing input fields", input: map[string]interface{}{ "coll": "", - "key": mockKey{Key: ""}, + "key": MockKey{Key: ""}, "tag": "", }, expectedError: "Mandatory fields are missing", diff --git a/src/k8splugin/internal/db/testing.go b/src/k8splugin/internal/db/testing.go index a411790e..e7e7436a 100644 --- a/src/k8splugin/internal/db/testing.go +++ b/src/k8splugin/internal/db/testing.go @@ -20,11 +20,11 @@ import ( pkgerrors "github.com/pkg/errors" ) -type mockKey struct { +type MockKey struct { Key string } -func (m mockKey) String() string { +func (m MockKey) String() string { return m.Key } -- cgit 1.2.3-korg