From 045ce10b7c48136dee24761e23ea0156f6255521 Mon Sep 17 00:00:00 2001
From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Thu, 18 Jul 2019 15:28:34 -0700
Subject: Make definition tags specific

Tags used in db such as metadata
are too generic. Instead we are using specific
ones with the type prefixed.

Issue-ID: MULTICLOUD-730
Change-Id: Ice76cf743f0782a3d7e76747cde1f0e0b116b14e
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
---
 src/k8splugin/internal/rb/definition_test.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/k8splugin/internal/rb/definition_test.go')

diff --git a/src/k8splugin/internal/rb/definition_test.go b/src/k8splugin/internal/rb/definition_test.go
index 054da2cd..0140b459 100644
--- a/src/k8splugin/internal/rb/definition_test.go
+++ b/src/k8splugin/internal/rb/definition_test.go
@@ -113,14 +113,14 @@ func TestListDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
 								"\"chart-name\":\"testchart\"}"),
 					},
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v2"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle_version2\"," +
 								"\"rb-version\":\"v2\"," +
@@ -196,7 +196,7 @@ func TestGetDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
@@ -326,7 +326,7 @@ func TestUploadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"}"),
@@ -362,7 +362,7 @@ func TestUploadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
@@ -400,7 +400,7 @@ func TestUploadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
@@ -438,7 +438,7 @@ func TestUploadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
@@ -459,7 +459,7 @@ func TestUploadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
@@ -551,12 +551,12 @@ func TestDownloadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
 								"\"chart-name\":\"firewall\"}"),
-						"content": []byte("H4sICLBr9FsAA3Rlc3QudGFyAO3OQQrCMBCF4aw9RU5" +
+						"defcontent": []byte("H4sICLBr9FsAA3Rlc3QudGFyAO3OQQrCMBCF4aw9RU5" +
 							"QEtLE40igAUtSC+2IHt9IEVwIpYtShP/bvGFmFk/SLI08Re3IVCG077Rn" +
 							"b75zYZ2yztVV8N7XP9vWSWmzZ6mP+yxx0lrF7pJzjkN/Sz//1u5/6ppKG" +
 							"R/jVLrT0VUAAAAAAAAAAAAAAAAAABu8ALXoSvkAKAAA"),
@@ -572,7 +572,7 @@ func TestDownloadDefinition(t *testing.T) {
 			mockdb: &db.MockDB{
 				Items: map[string]map[string][]byte{
 					DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-						"metadata": []byte(
+						"defmetadata": []byte(
 							"{\"rb-name\":\"testresourcebundle\"," +
 								"\"description\":\"testresourcebundle\"," +
 								"\"rb-version\":\"v1\"," +
-- 
cgit 1.2.3-korg