aboutsummaryrefslogtreecommitdiffstats
path: root/src/k8splugin/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/k8splugin/api')
-rw-r--r--src/k8splugin/api/api.go6
-rw-r--r--src/k8splugin/api/defhandler.go2
-rw-r--r--src/k8splugin/api/defhandler_test.go2
-rw-r--r--src/k8splugin/api/handler.go11
-rw-r--r--src/k8splugin/api/handler_test.go8
-rw-r--r--src/k8splugin/api/profilehandler.go2
-rw-r--r--src/k8splugin/api/profilehandler_test.go2
7 files changed, 16 insertions, 17 deletions
diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index 593e2b0b..f022614e 100644
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -14,7 +14,7 @@ limitations under the License.
package api
import (
- "k8splugin/rb"
+ "k8splugin/internal/rb"
"os"
"path/filepath"
"plugin"
@@ -23,8 +23,8 @@ import (
"github.com/gorilla/mux"
pkgerrors "github.com/pkg/errors"
- "k8splugin/db"
- "k8splugin/krd"
+ krd "k8splugin/internal"
+ "k8splugin/internal/db"
)
// CheckEnvVariables checks for required Environment variables
diff --git a/src/k8splugin/api/defhandler.go b/src/k8splugin/api/defhandler.go
index f53acdd2..21e5e768 100644
--- a/src/k8splugin/api/defhandler.go
+++ b/src/k8splugin/api/defhandler.go
@@ -19,7 +19,7 @@ package api
import (
"encoding/json"
"io/ioutil"
- "k8splugin/rb"
+ "k8splugin/internal/rb"
"net/http"
"github.com/gorilla/mux"
diff --git a/src/k8splugin/api/defhandler_test.go b/src/k8splugin/api/defhandler_test.go
index e638ca05..20ef537e 100644
--- a/src/k8splugin/api/defhandler_test.go
+++ b/src/k8splugin/api/defhandler_test.go
@@ -20,7 +20,7 @@ import (
"bytes"
"encoding/json"
"io"
- "k8splugin/rb"
+ "k8splugin/internal/rb"
"net/http"
"net/http/httptest"
"reflect"
diff --git a/src/k8splugin/api/handler.go b/src/k8splugin/api/handler.go
index 4c49ba78..a6db3c18 100644
--- a/src/k8splugin/api/handler.go
+++ b/src/k8splugin/api/handler.go
@@ -25,9 +25,8 @@ import (
pkgerrors "github.com/pkg/errors"
"k8s.io/client-go/kubernetes"
- "k8splugin/csar"
- "k8splugin/db"
- "k8splugin/krd"
+ helper "k8splugin/internal/app"
+ "k8splugin/internal/db"
)
//TODO: Separate the http handler code and backend code out
@@ -36,7 +35,7 @@ var tagData = "data"
// GetVNFClient retrieves the client used to communicate with a Kubernetes Cluster
var GetVNFClient = func(kubeConfigPath string) (kubernetes.Clientset, error) {
- client, err := krd.GetKubeClient(kubeConfigPath)
+ client, err := helper.GetKubeClient(kubeConfigPath)
if err != nil {
return client, err
}
@@ -105,7 +104,7 @@ func CreateHandler(w http.ResponseWriter, r *http.Request) {
},
nil
*/
- externalVNFID, resourceNameMap, err := csar.CreateVNF(resource.CsarID, resource.CloudRegionID, resource.Namespace, &kubeclient)
+ externalVNFID, resourceNameMap, err := helper.CreateVNF(resource.CsarID, resource.CloudRegionID, resource.Namespace, &kubeclient)
if err != nil {
werr := pkgerrors.Wrap(err, "Read Kubernetes Data information error")
http.Error(w, werr.Error(), http.StatusInternalServerError)
@@ -223,7 +222,7 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- err = csar.DestroyVNF(data, namespace, &kubeclient)
+ err = helper.DestroyVNF(data, namespace, &kubeclient)
if err != nil {
werr := pkgerrors.Wrap(err, "Delete VNF error")
http.Error(w, werr.Error(), http.StatusInternalServerError)
diff --git a/src/k8splugin/api/handler_test.go b/src/k8splugin/api/handler_test.go
index d02b8515..2bac3111 100644
--- a/src/k8splugin/api/handler_test.go
+++ b/src/k8splugin/api/handler_test.go
@@ -27,8 +27,8 @@ import (
pkgerrors "github.com/pkg/errors"
"k8s.io/client-go/kubernetes"
- "k8splugin/csar"
- "k8splugin/db"
+ helper "k8splugin/internal/app"
+ "k8splugin/internal/db"
)
type mockCSAR struct {
@@ -155,7 +155,7 @@ func TestCreateHandler(t *testing.T) {
return kubernetes.Clientset{}, testCase.mockGetVNFClientErr
}
if testCase.mockCreateVNF != nil {
- csar.CreateVNF = testCase.mockCreateVNF.CreateVNF
+ helper.CreateVNF = testCase.mockCreateVNF.CreateVNF
}
if testCase.mockStore != nil {
db.DBconn = testCase.mockStore
@@ -328,7 +328,7 @@ func TestDeleteHandler(t *testing.T) {
db.DBconn = testCase.mockStore
}
if testCase.mockDeleteVNF != nil {
- csar.DestroyVNF = testCase.mockDeleteVNF.DestroyVNF
+ helper.DestroyVNF = testCase.mockDeleteVNF.DestroyVNF
}
request, _ := http.NewRequest("DELETE", "/v1/vnf_instances/cloudregion1/testnamespace/uuid1", nil)
diff --git a/src/k8splugin/api/profilehandler.go b/src/k8splugin/api/profilehandler.go
index 1090efe5..86e0d47f 100644
--- a/src/k8splugin/api/profilehandler.go
+++ b/src/k8splugin/api/profilehandler.go
@@ -19,7 +19,7 @@ package api
import (
"encoding/json"
"io/ioutil"
- "k8splugin/rb"
+ "k8splugin/internal/rb"
"net/http"
"github.com/gorilla/mux"
diff --git a/src/k8splugin/api/profilehandler_test.go b/src/k8splugin/api/profilehandler_test.go
index 49efd659..7594afeb 100644
--- a/src/k8splugin/api/profilehandler_test.go
+++ b/src/k8splugin/api/profilehandler_test.go
@@ -20,7 +20,7 @@ import (
"bytes"
"encoding/json"
"io"
- "k8splugin/rb"
+ "k8splugin/internal/rb"
"net/http"
"net/http/httptest"
"reflect"