From 083465d10c8fdeaffa89aa7daa93def3eca77df1 Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Thu, 24 Jan 2019 17:46:43 -0800
Subject: Use a standard Go project layout

This project wasn't following some Standard Go Project Layout
guidelines(https://github.com/golang-standards/project-layout). This
change pretends to organize the source code and following those
guidelines.

Change-Id: I61085ac20f28069cede013f83034bed06892d87c
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-301
---
 src/k8splugin/plugins/service/plugin.go      | 10 +++++-----
 src/k8splugin/plugins/service/plugin_test.go |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/k8splugin/plugins/service')

diff --git a/src/k8splugin/plugins/service/plugin.go b/src/k8splugin/plugins/service/plugin.go
index 69acb348..e9b45fc8 100644
--- a/src/k8splugin/plugins/service/plugin.go
+++ b/src/k8splugin/plugins/service/plugin.go
@@ -23,16 +23,16 @@ import (
 	coreV1 "k8s.io/api/core/v1"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"k8splugin/krd"
+	utils "k8splugin/internal"
 )
 
 // Create a service object in a specific Kubernetes cluster
-func Create(data *krd.ResourceData, client kubernetes.Interface) (string, error) {
+func Create(data *utils.ResourceData, client kubernetes.Interface) (string, error) {
 	namespace := data.Namespace
 	if namespace == "" {
 		namespace = "default"
 	}
-	obj, err := krd.DecodeYAML(data.YamlFilePath, nil)
+	obj, err := utils.DecodeYAML(data.YamlFilePath, nil)
 	if err != nil {
 		return "", pkgerrors.Wrap(err, "Decode service object error")
 	}
@@ -59,7 +59,7 @@ func List(namespace string, kubeclient kubernetes.Interface) ([]string, error) {
 	}
 
 	opts := metaV1.ListOptions{
-		Limit: krd.ResourcesListLimit,
+		Limit: utils.ResourcesListLimit,
 	}
 	opts.APIVersion = "apps/v1"
 	opts.Kind = "Service"
@@ -69,7 +69,7 @@ func List(namespace string, kubeclient kubernetes.Interface) ([]string, error) {
 		return nil, pkgerrors.Wrap(err, "Get Service list error")
 	}
 
-	result := make([]string, 0, krd.ResourcesListLimit)
+	result := make([]string, 0, utils.ResourcesListLimit)
 	if list != nil {
 		for _, deployment := range list.Items {
 			log.Printf("%v", deployment.Name)
diff --git a/src/k8splugin/plugins/service/plugin_test.go b/src/k8splugin/plugins/service/plugin_test.go
index 25eeb730..b9198914 100644
--- a/src/k8splugin/plugins/service/plugin_test.go
+++ b/src/k8splugin/plugins/service/plugin_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8splugin/krd"
+	utils "k8splugin/internal"
 
 	coreV1 "k8s.io/api/core/v1"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,14 +33,14 @@ func TestCreateService(t *testing.T) {
 	internalVNFID := "1"
 	testCases := []struct {
 		label          string
-		input          *krd.ResourceData
+		input          *utils.ResourceData
 		clientOutput   *coreV1.Service
 		expectedResult string
 		expectedError  string
 	}{
 		{
 			label: "Fail to create a service with invalid type",
-			input: &krd.ResourceData{
+			input: &utils.ResourceData{
 				YamlFilePath: "../../mock_files/mock_yamls/deployment.yaml",
 			},
 			clientOutput:  &coreV1.Service{},
@@ -48,7 +48,7 @@ func TestCreateService(t *testing.T) {
 		},
 		{
 			label: "Successfully create a service",
-			input: &krd.ResourceData{
+			input: &utils.ResourceData{
 				VnfId:        internalVNFID,
 				YamlFilePath: "../../mock_files/mock_yamls/service.yaml",
 			},
-- 
cgit