From b5431ed7c0f4659269143daedb1651ef9a303a89 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Wed, 4 Sep 2019 17:22:42 +0200 Subject: Remove ovn4nfvk8s network plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As ovn4nfv networks are now handled on k8s side by created CRD, this plugin is no longer necessary. Removed all references to ovn Issue-ID: MULTICLOUD-733 Signed-off-by: Konrad Bańka Change-Id: I7ad6c6d9b3b4fd8f249796f437e69c7df4e701cc --- .../mock_files/mock_plugins/mocknetworkplugin.go | 41 ---------------------- .../mock_files/mock_yamls/ovn4nfvk8s.yaml | 9 ----- 2 files changed, 50 deletions(-) delete mode 100644 src/k8splugin/mock_files/mock_plugins/mocknetworkplugin.go delete mode 100644 src/k8splugin/mock_files/mock_yamls/ovn4nfvk8s.yaml (limited to 'src/k8splugin/mock_files') diff --git a/src/k8splugin/mock_files/mock_plugins/mocknetworkplugin.go b/src/k8splugin/mock_files/mock_plugins/mocknetworkplugin.go deleted file mode 100644 index f71311b1..00000000 --- a/src/k8splugin/mock_files/mock_plugins/mocknetworkplugin.go +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2018 Intel Corporation. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - pkgerrors "github.com/pkg/errors" - "github.com/onap/multicloud-k8s/src/k8splugin/plugins/network/v1" -) - -// Err is the error message to be sent during functional testing -var Err string - -// NetworkName is the output used for functional tests -var NetworkName string - -// CreateNetwork resource -func CreateNetwork(network *v1.OnapNetwork) (string, error) { - if Err != "" { - return "", pkgerrors.New(Err) - } - return NetworkName, nil -} - -// DeleteNetwork resource -func DeleteNetwork(name string) error { - if Err != "" { - return pkgerrors.New(Err) - } - return nil -} diff --git a/src/k8splugin/mock_files/mock_yamls/ovn4nfvk8s.yaml b/src/k8splugin/mock_files/mock_yamls/ovn4nfvk8s.yaml deleted file mode 100644 index 31351dee..00000000 --- a/src/k8splugin/mock_files/mock_yamls/ovn4nfvk8s.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Network -metadata: - name: ovn-priv-net -spec: - cnitype: "ovn4nfvk8s" - name: "ovn-priv-net" - subnet: "172.16.33.0/24" - gateway: "172.16.33.1/24" -- cgit 1.2.3-korg