diff options
| author |   Ritu Sood <Ritu.Sood@intel.com> | 2020-05-02 00:06:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-02 00:06:42 +0000 |
| commit | 17db22b1ed8c1ed8e0b524f6c4a4b9fae35e0a4f (patch) | |
| tree | c5cc382851bb64fab67caca1e1e781305239ff25 | |
| parent | 4100bfb764c40e2a788d28691b0f891e2ae86b74 (diff) | |
| parent | 022d294c1bcec5b33ff09883327ce2f9bd6d855d (diff) | |
Merge "Update ncm code for upstream changes"
| -rw-r--r-- | src/ncm/pkg/module/cluster.go | 2 | ||||
| -rw-r--r-- | src/ncm/pkg/module/netcontrolintent.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ncm/pkg/module/cluster.go b/src/ncm/pkg/module/cluster.go index 2397a091..e0464c96 100644 --- a/src/ncm/pkg/module/cluster.go +++ b/src/ncm/pkg/module/cluster.go @@ -512,7 +512,7 @@ func (v *ClusterClient) ApplyNetworkIntents(provider, name string) error { // add the resources to the app context for _, resource := range resources { - _, err = context.AddResource(clusterhandle, resource.name, resource.value) + _, err = context.AddResource(clusterhandle, resource.name, []byte(resource.value)) if err != nil { cleanuperr := context.DeleteCompositeApp() if cleanuperr != nil { diff --git a/src/ncm/pkg/module/netcontrolintent.go b/src/ncm/pkg/module/netcontrolintent.go index c005a935..da8f9a85 100644 --- a/src/ncm/pkg/module/netcontrolintent.go +++ b/src/ncm/pkg/module/netcontrolintent.go @@ -281,7 +281,7 @@ func (v *NetControlIntentClient) ApplyNetControlIntent(name, project, compositea } // Update resource in AppContext - err = context.UpdateResourceValue(rh, string(y)) + err = context.UpdateResourceValue(rh, y) if err != nil { log.Error("Network updating app context resource handle", log.Fields{ "error": err, |