aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRajamohan Raj <rajamohan.raj@intel.com>2020-05-01 22:45:00 +0000
committerRajamohan Raj <rajamohan.raj@intel.com>2020-05-01 22:58:54 +0000
commit022d294c1bcec5b33ff09883327ce2f9bd6d855d (patch)
tree53d966102e2a52e3e5925cd424eac108fcbbb8be /src
parent7f6d2717e367c007ad836c39626c9eacc572f068 (diff)
Update ncm code for upstream changes
The signature of two functions of upstream code in orchestration is to be changed. The new function signature for changes in appcontext.go: AddResource(handle interface{}, resname string, value []byte) UpdateResourceValue(handle interface{}, value []byte) The above code shall be pushed in the next patch for orchestration Issue-ID: MULTICLOUD-1064 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: I58db28e2e0ea27fba9b88839156a43517cdad1c9
Diffstat (limited to 'src')
-rw-r--r--src/ncm/pkg/module/cluster.go2
-rw-r--r--src/ncm/pkg/module/netcontrolintent.go2
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,