Remove build tags

Remove build tags as this is causing issues where
mock plugins need to be loaded into files that do
unit testing as well.
Full integration testing is being done in the CSIT.

Issue-ID: MULTICLOUD-559
Change-Id: Icd147dac80d16a6fb8f33048c76d4083158cecd2
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

diff --git a/src/k8splugin/Makefile b/src/k8splugin/Makefile
index 3bc7a0e..d5bdb6f 100644 (file)
--- a/src/k8splugin/Makefile
+++ b/src/k8splugin/Makefile
@@ -27,17 +27,10 @@ build: clean plugins test cover
 deploy: build
 
 .PHONY: test
-test: unit integration
-
-.PHONY: unit
-unit:
-       @go test -v -tags 'unit' ./...
-
-.PHONY: integration
-integration: clean
-       @go build -tags 'integration' -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go
-       @go build -tags 'integration' -buildmode=plugin -o ./mock_files/mock_plugins/mocknetworkplugin.so ./mock_files/mock_plugins/mocknetworkplugin.go
-       @go test -v -tags 'integration' ./...
+test: clean
+       @go build -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go
+       @go build -buildmode=plugin -o ./mock_files/mock_plugins/mocknetworkplugin.so ./mock_files/mock_plugins/mocknetworkplugin.go
+       @go test -v ./...
 
 format:
        @go fmt ./...
@@ -51,5 +44,5 @@ clean:
 
 .PHONY: cover
 cover:
-       @go test -tags 'unit' ./... -coverprofile=coverage.out
+       @go test ./... -coverprofile=coverage.out
        @go tool cover -html=coverage.out -o coverage.html

diff --git a/src/k8splugin/api/handler_test.go b/src/k8splugin/api/handler_test.go
index ee4a300..df4d03c 100644 (file)
--- a/src/k8splugin/api/handler_test.go
+++ b/src/k8splugin/api/handler_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/app/client_test.go b/src/k8splugin/internal/app/client_test.go
index 9d89263..7189272 100644 (file)
--- a/src/k8splugin/internal/app/client_test.go
+++ b/src/k8splugin/internal/app/client_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/app/vnfhelper_test.go b/src/k8splugin/internal/app/vnfhelper_test.go
index 0686615..6722bfa 100644 (file)
--- a/src/k8splugin/internal/app/vnfhelper_test.go
+++ b/src/k8splugin/internal/app/vnfhelper_test.go
@@ -1,5 +1,3 @@
-// +build integration
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/db/consul_test.go b/src/k8splugin/internal/db/consul_test.go
index abd264c..139d4f8 100644 (file)
--- a/src/k8splugin/internal/db/consul_test.go
+++ b/src/k8splugin/internal/db/consul_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/db/mongo_test.go b/src/k8splugin/internal/db/mongo_test.go
index 71aaf86..171c908 100644 (file)
--- a/src/k8splugin/internal/db/mongo_test.go
+++ b/src/k8splugin/internal/db/mongo_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
  * Copyright 2018 Intel Corporation, Inc
  *

diff --git a/src/k8splugin/internal/db/store_test.go b/src/k8splugin/internal/db/store_test.go
index eed7065..5043ea9 100644 (file)
--- a/src/k8splugin/internal/db/store_test.go
+++ b/src/k8splugin/internal/db/store_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/db/testing.go b/src/k8splugin/internal/db/testing.go
index ded5067..1fefd63 100644 (file)
--- a/src/k8splugin/internal/db/testing.go
+++ b/src/k8splugin/internal/db/testing.go
@@ -1,5 +1,3 @@
-// +build unit integration
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/internal/helm/helm_test.go b/src/k8splugin/internal/helm/helm_test.go
index a5bcd9c..27bb9d7 100644 (file)
--- a/src/k8splugin/internal/helm/helm_test.go
+++ b/src/k8splugin/internal/helm/helm_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
  * Copyright 2018 Intel Corporation, Inc
  *

diff --git a/src/k8splugin/internal/rb/definition_test.go b/src/k8splugin/internal/rb/definition_test.go
index 96aaafb..0a9e7c7 100644 (file)
--- a/src/k8splugin/internal/rb/definition_test.go
+++ b/src/k8splugin/internal/rb/definition_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
  * Copyright 2018 Intel Corporation, Inc
  *

diff --git a/src/k8splugin/internal/rb/profile_test.go b/src/k8splugin/internal/rb/profile_test.go
index 5d41b01..e0f4382 100644 (file)
--- a/src/k8splugin/internal/rb/profile_test.go
+++ b/src/k8splugin/internal/rb/profile_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
  * Copyright 2018 Intel Corporation, Inc
  *

diff --git a/src/k8splugin/internal/rb/profile_yaml_test.go b/src/k8splugin/internal/rb/profile_yaml_test.go
index c29bf9e..d72f2c4 100644 (file)
--- a/src/k8splugin/internal/rb/profile_yaml_test.go
+++ b/src/k8splugin/internal/rb/profile_yaml_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
  * Copyright 2018 Intel Corporation, Inc
  *

diff --git a/src/k8splugin/internal/utils_test.go b/src/k8splugin/internal/utils_test.go
index 6b49d42..58b17bc 100644 (file)
--- a/src/k8splugin/internal/utils_test.go
+++ b/src/k8splugin/internal/utils_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/plugins/deployment/plugin_test.go b/src/k8splugin/plugins/deployment/plugin_test.go
index bfe5fe3..55e0c80 100644 (file)
--- a/src/k8splugin/plugins/deployment/plugin_test.go
+++ b/src/k8splugin/plugins/deployment/plugin_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/plugins/namespace/plugin_test.go b/src/k8splugin/plugins/namespace/plugin_test.go
index 2f1475d..0019df1 100644 (file)
--- a/src/k8splugin/plugins/namespace/plugin_test.go
+++ b/src/k8splugin/plugins/namespace/plugin_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/plugins/network/plugin_test.go b/src/k8splugin/plugins/network/plugin_test.go
index 0239117..5bf649a 100644 (file)
--- a/src/k8splugin/plugins/network/plugin_test.go
+++ b/src/k8splugin/plugins/network/plugin_test.go
@@ -1,5 +1,3 @@
-// +build integration
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go
index b6b28ea..ce848a7 100644 (file)
--- a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go
+++ b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/k8splugin/plugins/service/plugin_test.go b/src/k8splugin/plugins/service/plugin_test.go
index b919891..7353f24 100644 (file)
--- a/src/k8splugin/plugins/service/plugin_test.go
+++ b/src/k8splugin/plugins/service/plugin_test.go
@@ -1,5 +1,3 @@
-// +build unit
-
 /*
 Copyright 2018 Intel Corporation.
 Licensed under the Apache License, Version 2.0 (the "License");