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>

diff --git a/src/k8splugin/internal/app/instance_test.go b/src/k8splugin/internal/app/instance_test.go
index 24558a4..8e817f0 100644 (file)
--- a/src/k8splugin/internal/app/instance_test.go
+++ b/src/k8splugin/internal/app/instance_test.go
@@ -84,13 +84,13 @@ func TestInstanceCreate(t *testing.T) {
                                                "yJ66WPQwcHBwcHBwcHBwcHBwcHBwcHhm8Q/mTHqWgAoAAA="),
                                },
                                rb.DefinitionKey{RBName: "test-rbdef", RBVersion: "v1"}.String(): {
-                                       "metadata": []byte(
+                                       "defmetadata": []byte(
                                                "{\"rb-name\":\"test-rbdef\"," +
                                                        "\"rb-version\":\"v1\"," +
                                                        "\"chart-name\":\"vault-consul-dev\"," +
                                                        "\"description\":\"testresourcebundle\"}"),
                                        // base64 encoding of vagrant/tests/vnfs/testrb/helm/vault-consul-dev
-                                       "content": []byte("H4sICEetS1wAA3ZhdWx0LWNvbnN1bC1kZXYudGFyAO0c7XLbNjK/+R" +
+                                       "defcontent": []byte("H4sICEetS1wAA3ZhdWx0LWNvbnN1bC1kZXYudGFyAO0c7XLbNjK/+R" +
                                                "QYujdJehatb+V4czPnOmnPk9bO2Gk7nbaTgUhIxpgiGAK0o3P9QPca92S3C5AU9GXZiax" +
                                                "c7rA/LJEAFovdxX4AK1/RIlGNSKSySBoxuzp4sn1oAgx6Pf0JsPipv7c63XZ70O61W4Mn" +
                                                "zVZ7MGg9Ib1HoGUJCqloTsiTXAh1V79N7V8oXC3K/+iC5iqY0kmytTlQwP1ud538W51Wf" +

diff --git a/src/k8splugin/internal/rb/definition.go b/src/k8splugin/internal/rb/definition.go
index 476e40e..6998eed 100644 (file)
--- a/src/k8splugin/internal/rb/definition.go
+++ b/src/k8splugin/internal/rb/definition.go
@@ -79,8 +79,8 @@ type DefinitionClient struct {
 func NewDefinitionClient() *DefinitionClient {
        return &DefinitionClient{
                storeName:  "rbdef",
-               tagMeta:    "metadata",
-               tagContent: "content",
+               tagMeta:    "defmetadata",
+               tagContent: "defcontent",
        }
 }
 

diff --git a/src/k8splugin/internal/rb/definition_test.go b/src/k8splugin/internal/rb/definition_test.go
index 054da2c..0140b45 100644 (file)
--- 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\"," +

diff --git a/src/k8splugin/internal/rb/profile_test.go b/src/k8splugin/internal/rb/profile_test.go
index 29efb50..7c9deac 100644 (file)
--- a/src/k8splugin/internal/rb/profile_test.go
+++ b/src/k8splugin/internal/rb/profile_test.go
@@ -56,7 +56,7 @@ func TestCreateProfile(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\"," +
@@ -79,7 +79,7 @@ func TestCreateProfile(t *testing.T) {
                        mockdb: &db.MockDB{
                                Items: map[string]map[string][]byte{
                                        DefinitionKey{RBName: "testresourcebundle", RBVersion: "v2"}.String(): {
-                                               "metadata": []byte(
+                                               "defmetadata": []byte(
                                                        "{\"rb-name\":\"testresourcebundle\"," +
                                                                "\"description\":\"testresourcebundle\"," +
                                                                "\"rb-version\":\"v1\"," +
@@ -545,13 +545,13 @@ func TestResolveProfile(t *testing.T) {
                                                        "yJ66WPQwcHBwcHBwcHBwcHBwcHBwcHhm8Q/mTHqWgAoAAA="),
                                        },
                                        DefinitionKey{RBName: "testresourcebundle", RBVersion: "v1"}.String(): {
-                                               "metadata": []byte(
+                                               "defmetadata": []byte(
                                                        "{\"rb-name\":\"testresourcebundle\"," +
                                                                "\"rb-version\":\"v1\"," +
                                                                "\"chart-name\":\"vault-consul-dev\"," +
                                                                "\"description\":\"testresourcebundle\"}"),
                                                // base64 encoding of vagrant/tests/vnfs/testrb/helm/vault-consul-dev
-                                               "content": []byte("H4sICEetS1wAA3ZhdWx0LWNvbnN1bC1kZXYudGFyAO0c7XLbNjK/+R" +
+                                               "defcontent": []byte("H4sICEetS1wAA3ZhdWx0LWNvbnN1bC1kZXYudGFyAO0c7XLbNjK/+R" +
                                                        "QYujdJehatb+V4czPnOmnPk9bO2Gk7nbaTgUhIxpgiGAK0o3P9QPca92S3C5AU9GXZiax" +
                                                        "c7rA/LJEAFovdxX4AK1/RIlGNSKSySBoxuzp4sn1oAgx6Pf0JsPipv7c63XZ70O61W4Mn" +
                                                        "zVZ7MGg9Ib1HoGUJCqloTsiTXAh1V79N7V8oXC3K/+iC5iqY0kmytTlQwP1ud538W51Wf" +