summaryrefslogtreecommitdiffstats
path: root/src/k8splugin/rb/definition.go
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2019-01-18 00:10:54 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-18 00:10:54 +0000
commit002602dc6b09d4012fbca05740eb4e4dbb9ce6ce (patch)
treeaaba4c9c5c22ffc6e9bc87b64081168540da4e10 /src/k8splugin/rb/definition.go
parente9ee50babb3bbfe7a6e774460a46782abefd5107 (diff)
parentcd9644049545a47676e87ad279833ced1b0f9c1a (diff)
Merge "Add resource bundle profile api"
Diffstat (limited to 'src/k8splugin/rb/definition.go')
-rw-r--r--src/k8splugin/rb/definition.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/k8splugin/rb/definition.go b/src/k8splugin/rb/definition.go
index 460dc7a6..eb7a12fc 100644
--- a/src/k8splugin/rb/definition.go
+++ b/src/k8splugin/rb/definition.go
@@ -29,9 +29,9 @@ import (
// Definition contains the parameters needed for resource bundle (rb) definitions
// It implements the interface for managing the definitions
type Definition struct {
+ UUID string `json:"uuid,omitempty"`
Name string `json:"name"`
Description string `json:"description"`
- UUID string `json:"uuid,omitempty"`
ServiceType string `json:"service-type"`
}
@@ -87,11 +87,12 @@ func (v *DefinitionClient) List() ([]Definition, error) {
var results []Definition
for key, value := range res {
+ //value is a byte array
if len(value) > 0 {
def := Definition{}
err = db.DBconn.Unmarshal(value, &def)
if err != nil {
- log.Printf("Error Unmarshaling value for: %s", key)
+ log.Printf("[Definition] Error Unmarshaling value for: %s", key)
continue
}
results = append(results, def)
@@ -108,6 +109,7 @@ func (v *DefinitionClient) Get(id string) (Definition, error) {
return Definition{}, pkgerrors.Wrap(err, "Get Resource Bundle definition")
}
+ //value is a byte array
if value != nil {
def := Definition{}
err = db.DBconn.Unmarshal(value, &def)
@@ -124,7 +126,7 @@ func (v *DefinitionClient) Get(id string) (Definition, error) {
func (v *DefinitionClient) Delete(id string) error {
err := db.DBconn.Delete(v.storeName, id, v.tagMeta)
if err != nil {
- return pkgerrors.Wrap(err, "Delete Resource Bundle Definitions")
+ return pkgerrors.Wrap(err, "Delete Resource Bundle Definition")
}
return nil
@@ -136,7 +138,7 @@ func (v *DefinitionClient) Upload(id string, inp []byte) error {
//ignore the returned data here
_, err := v.Get(id)
if err != nil {
- return pkgerrors.Errorf("Invalid ID provided: %s", err.Error())
+ return pkgerrors.Errorf("Invalid Definition ID provided: %s", err.Error())
}
err = isTarGz(bytes.NewBuffer(inp))