From a1abd829315d72adb258da20470eaa2445cf3e32 Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Sat, 10 Nov 2018 03:54:15 +0000 Subject: Add Network and OVN4NFV Plugins This patch includes support for Network Objects through a new plugin. It also add the first sub-module plugin for OVN4NFVK8s support. Change-Id: Ia23c42d50f75a5206e1b6a04052c34e940518428 Signed-off-by: Ritu Sood Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-303 --- src/k8splugin/krd/plugins.go | 4 ++-- src/k8splugin/krd/plugins_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/k8splugin/krd') diff --git a/src/k8splugin/krd/plugins.go b/src/k8splugin/krd/plugins.go index 9ccb04fa..1086a2bb 100644 --- a/src/k8splugin/krd/plugins.go +++ b/src/k8splugin/krd/plugins.go @@ -37,7 +37,7 @@ type ResourceData struct { } // DecodeYAML reads a YAMl file to extract the Kubernetes object definition -var DecodeYAML = func(path string) (runtime.Object, error) { +var DecodeYAML = func(path string, into runtime.Object) (runtime.Object, error) { if _, err := os.Stat(path); err != nil { if os.IsNotExist(err) { return nil, pkgerrors.New("File " + path + " not found") @@ -54,7 +54,7 @@ var DecodeYAML = func(path string) (runtime.Object, error) { log.Println("Decoding deployment YAML") decode := scheme.Codecs.UniversalDeserializer().Decode - obj, _, err := decode(rawBytes, nil, nil) + obj, _, err := decode(rawBytes, nil, into) if err != nil { return nil, pkgerrors.Wrap(err, "Deserialize YAML error") } diff --git a/src/k8splugin/krd/plugins_test.go b/src/k8splugin/krd/plugins_test.go index 81d2784e..46499adb 100644 --- a/src/k8splugin/krd/plugins_test.go +++ b/src/k8splugin/krd/plugins_test.go @@ -70,7 +70,7 @@ func TestDecodeYAML(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { - result, err := DecodeYAML(testCase.input) + result, err := DecodeYAML(testCase.input, nil) if err != nil { if testCase.expectedError == "" { t.Fatalf("Decode YAML method return an un-expected (%s)", err) -- cgit 1.2.3-korg