diff options
author | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-03-29 16:07:47 -0700 |
---|---|---|
committer | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-03-29 16:12:19 -0700 |
commit | f3875e13c7a6675aa980c29580daae42a32eb97f (patch) | |
tree | 05cbe26f86ce0c3e1f936d724158223d8e522021 /src/k8splugin/internal/app | |
parent | 5f5aabfbaff227c3c134c27ecbd7ecd347f74c09 (diff) |
Make profile key explicit
Using profilename instead of name in the db key
protects it from getting overwritten by anything
else that might use name as a key.
Using explicit key names makes sure that we don't
have to add bson structure tags in the code.
Issue-ID: MULTICLOUD-558
Change-Id: I9bd6f757496af22d8662b0d114f0ef7d33a5784a
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'src/k8splugin/internal/app')
-rw-r--r-- | src/k8splugin/internal/app/vnfhelper.go | 4 | ||||
-rw-r--r-- | src/k8splugin/internal/app/vnfhelper_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/k8splugin/internal/app/vnfhelper.go b/src/k8splugin/internal/app/vnfhelper.go index 0a867090..c5783d69 100644 --- a/src/k8splugin/internal/app/vnfhelper.go +++ b/src/k8splugin/internal/app/vnfhelper.go @@ -47,7 +47,7 @@ func ensuresNamespace(namespace string, kubeclient kubernetes.Interface) error { return pkgerrors.Wrap(err, "Error fetching get namespace function") } - ns, _ := symGetNamespaceFunc.(func(string, string, kubernetes.Interface) (string, error))( + ns, _ := symGetNamespaceFunc.(func(string, string, kubernetes.Interface) (string, error))( namespace, namespace, kubeclient) if ns == "" { @@ -80,7 +80,7 @@ var CreateVNF = func(csarID string, cloudRegionID string, profile rb.Profile, ku externalVNFID := generateExternalVNFID() internalVNFID := cloudRegionID + "-" + profile.Namespace + "-" + externalVNFID - metaMap, err := rb.NewProfileClient().Resolve(profile.RBName, profile.RBVersion, profile.Name, overrideValues) + metaMap, err := rb.NewProfileClient().Resolve(profile.RBName, profile.RBVersion, profile.ProfileName, overrideValues) if err != nil { return "", nil, pkgerrors.Wrap(err, "Error resolving helm charts") } diff --git a/src/k8splugin/internal/app/vnfhelper_test.go b/src/k8splugin/internal/app/vnfhelper_test.go index 06866150..0ed67e5d 100644 --- a/src/k8splugin/internal/app/vnfhelper_test.go +++ b/src/k8splugin/internal/app/vnfhelper_test.go @@ -86,7 +86,7 @@ func TestCreateVNF(t *testing.T) { db.DBconn = &db.MockDB{ Items: map[string]map[string][]byte{ rb.ProfileKey{RBName: "test-rbdef", RBVersion: "v1", - Name: "profile1"}.String(): { + ProfileName: "profile1"}.String(): { "metadata": []byte( "{\"profile-name\":\"profile1\"," + "\"release-name\":\"testprofilereleasename\"," + @@ -196,7 +196,7 @@ func TestCreateVNF(t *testing.T) { rb.Profile{ RBName: "test-rbdef", RBVersion: "v1", - Name: "profile1", + ProfileName: "profile1", ReleaseName: "testprofilereleasename", Namespace: "testnamespace", KubernetesVersion: "1.12.3", |