summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <Ritu.Sood@intel.com>2020-05-21 19:00:55 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-21 19:00:55 +0000
commit10b401413dd722ef57de79ba3caaa873ed1093b8 (patch)
tree83d75b461470220bec765779d6b62129a4b336ff
parent2b63abfd3033208fbed6f9e99c212647470d47eb (diff)
parent55df44a00598b127a0243094042e9eaa526f2071 (diff)
Merge "Change NCM for upstream change in orchestrator"
-rw-r--r--src/ncm/go.mod7
-rw-r--r--src/ncm/pkg/module/cluster.go2
-rw-r--r--src/ncm/pkg/module/netcontrolintent.go2
3 files changed, 2 insertions, 9 deletions
diff --git a/src/ncm/go.mod b/src/ncm/go.mod
index da625300..07fff467 100644
--- a/src/ncm/go.mod
+++ b/src/ncm/go.mod
@@ -1,14 +1,10 @@
module github.com/onap/multicloud-k8s/src/ncm
require (
- github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/ghodss/yaml v1.0.0
- github.com/google/gofuzz v1.1.0 // indirect
github.com/gorilla/handlers v1.3.0
github.com/gorilla/mux v1.6.2
- github.com/json-iterator/go v1.1.9 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200127152046-0ee521d56061
- github.com/onap/multicloud-k8s/src/orchestrator v0.0.0-20200515060444-c77850a75eee
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.8.1
google.golang.org/grpc v1.27.1
@@ -16,10 +12,7 @@ require (
k8s.io/api v0.0.0-20190831074750-7364b6bdad65
k8s.io/apimachinery v0.0.0-20190831074630-461753078381
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
- k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
k8s.io/kubernetes v1.14.1
- k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
- sigs.k8s.io/yaml v1.2.0 // indirect
)
replace (
diff --git a/src/ncm/pkg/module/cluster.go b/src/ncm/pkg/module/cluster.go
index e0464c96..2397a091 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, []byte(resource.value))
+ _, err = context.AddResource(clusterhandle, resource.name, 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 da8f9a85..c005a935 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, y)
+ err = context.UpdateResourceValue(rh, string(y))
if err != nil {
log.Error("Network updating app context resource handle", log.Fields{
"error": err,