summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
49296cb)
- Removes OS functions from the Utility interface - /image.go
- Adds BPA_REST_API unit test Makefile recipe
- Removed vendor binary
Signed-off-by: Enyinna Ochulor <enyinna.ochulor@intel.com>
Change-Id: I59696b70a9e5bca9aba70e51e385a2a78d21c760
bpa_rest_api_verifier:
pushd $(BPA_REST_API) && make e2e_test && popd
bpa_rest_api_verifier:
pushd $(BPA_REST_API) && make e2e_test && popd
+bpa_rest_api_unit:
+ pushd $(BPA_REST_API) && make unit_test && popd
+
bashate:
bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -name *.sh`
bashate:
bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -name *.sh`
-build: untar
- go build -mod=vendor -o build/_output/bin/bpa-restapi-agent main.go
+build:
+ go build -o build/_output/bin/bpa-restapi-agent main.go
- docker build -t akraino.org/icn/bpa-restapi-agent:latest . -f build/Dockerfile
-
-untar:
- tar -xzvf vendor.tar.gz
+ docker build -t akraino.org/icn/bpa-restapi-agent:latest . -f build/Dockerfile
deploy: docker
./bpa_api_install.sh
deploy: docker
./bpa_api_install.sh
-test: go_install
- go test ./... -v
+unit_test: go_install
+ go test ./internal/app
e2e_test: deploy
./e2e_test.sh
e2e_test: deploy
./e2e_test.sh
-while [[ $curr_status != "Running" ]]; do
+while [[ $cur_status != "Running" ]]; do
+
+ cur_status=$(kubectl get pods | grep bpa-api-deployment | awk '{print $3}')
+ if [[ $cur_status != "Running" ]]; then
+ echo "$(date +%H:%M:%S) - BPA-RESTful-API Pod status: $cur_status"
+ else
+ break
- new_status=$(kubectl get pods | grep bpa-api-deployment | awk '{print $3}')
- if [[ $new_status != $curr_status ]]; then
- echo "$(date +%H:%M:%S) - BPA-RESTful-API Pod status: $new_status"
- curr_status=$new_status
- if [[ $new_status == "Running" ]]; then
- break
- fi
- if [[ $new_status == "Err"* ]]; then
+ if [[ $cur_status == "Err"* ]]; then
DBCreate(storeName string, key ImageKey, meta string, c Image) error
DBRead(storeName string, key ImageKey, meta string) ([]byte, error)
DBUnmarshal(value []byte) (Image, error)
DBCreate(storeName string, key ImageKey, meta string, c Image) error
DBRead(storeName string, key ImageKey, meta string) ([]byte, error)
DBUnmarshal(value []byte) (Image, error)
- OSMakeDir(dirpath string, perm int) error
- OSCreateFile(filePath string) error
GetPath(user *user.User, imageName string, storeName string) (string, string)
DBDelete(storeName string, key ImageKey, meta string) error
GetPath(user *user.User, imageName string, storeName string) (string, string)
DBDelete(storeName string, key ImageKey, meta string) error
- OSRemove(filePath string) error
DBUpdate(storeName string, key ImageKey, tagMeta string, c Image) error
}
DBUpdate(storeName string, key ImageKey, tagMeta string, c Image) error
}
if err != nil {
return pkgerrors.Wrap(err, "Get file path")
}
if err != nil {
return pkgerrors.Wrap(err, "Get file path")
}
- err = v.util.OSMakeDir(dirPath, 0744)
+ err = os.MkdirAll(dirPath, 0744)
if err != nil {
return pkgerrors.Wrap(err, "Make image directory")
}
if err != nil {
return pkgerrors.Wrap(err, "Make image directory")
}
- err = v.util.OSCreateFile(filePath)
+ file, err := os.Create(filePath)
if err != nil {
return pkgerrors.Wrap(err, "Create image file")
}
if err != nil {
return pkgerrors.Wrap(err, "Create image file")
}
-
- return nil
-}
-
-func (d DBService) OSMakeDir(dirPath string, perm int) error {
- err := os.MkdirAll(dirPath, 0744)
- if err != nil {
- return pkgerrors.Wrap(err, "Make image directory")
- }
- return nil
-}
-
-func (d DBService) OSCreateFile(filePath string) error {
- file1, err := os.Create(filePath)
- if err != nil {
- return pkgerrors.Wrap(err, "Create image file")
- }
- defer file1.Close()
if err != nil {
return pkgerrors.Wrap(err, "Get file path")
}
if err != nil {
return pkgerrors.Wrap(err, "Get file path")
}
- err = v.util.OSRemove(filePath)
-
- return nil
-}
-
-func (d DBService) OSRemove(filePath string) error {
- err := os.Remove(filePath)
- if err != nil {
- return pkgerrors.Wrap(err, "Delete image file")
- }
+ err = os.Remove(filePath)
+ if err != nil {
+ return pkgerrors.Wrap(err, "Delete image file")
+ }
+ "io/ioutil"\r
+ "log"\r
+ "os"\r
"testing"\r
\r
"github.com/stretchr/testify/mock"\r
"testing"\r
\r
"github.com/stretchr/testify/mock"\r
return args.Get(0).([]byte), args.Error(1)\r
}\r
\r
return args.Get(0).([]byte), args.Error(1)\r
}\r
\r
-func (m *mockValues) DBUnmarshal(value []byte, c Image) error {\r
+func (m *mockValues) DBUnmarshal(value []byte) (Image, error) {\r
fmt.Println("Mocked Mongo DB Unmarshal Operation")\r
fmt.Println("Mocked Mongo DB Unmarshal Operation")\r
- args := m.Called(value, c)\r
+ args := m.Called(value)\r
+ return args.Get(0).(Image), args.Error(1)\r
}\r
\r
func (m *mockValues) GetPath(u *user.User, imageName string, storeName string) (string, string) {\r
}\r
\r
func (m *mockValues) GetPath(u *user.User, imageName string, storeName string) (string, string) {\r
return args.String(0), args.String(1)\r
}\r
\r
return args.String(0), args.String(1)\r
}\r
\r
-func (m *mockValues) OSMakeDir(dirPath string, perm int) error {\r
- fmt.Println("Mocked OS Create Directory Operation")\r
- args := m.Called(dirPath, perm)\r
- \r
- return args.Error(0)\r
-}\r
-\r
-func (m *mockValues) OSCreateFile(filePath string) error {\r
- fmt.Println("Mocked Create File Operation")\r
- args := m.Called(filePath)\r
-\r
- return args.Error(0)\r
-}\r
-\r
func (m *mockValues) DBDelete(name string, key ImageKey, meta string) error {\r
fmt.Println("Mocked Mongo DB Delete")\r
args := m.Called(name, key, meta)\r
func (m *mockValues) DBDelete(name string, key ImageKey, meta string) error {\r
fmt.Println("Mocked Mongo DB Delete")\r
args := m.Called(name, key, meta)\r
-func (m *mockValues) OSRemove(filePath string) error {\r
- fmt.Println("Mocked OS File Remove")\r
- args := m.Called(filePath)\r
-\r
- return args.Error(0)\r
-}\r
-\r
func (m *mockValues) DBUpdate(s string, k ImageKey, t string, c Image) error {\r
fmt.Println("Mocked Mongo DB Update")\r
args := m.Called(s, k, t, c)\r
func (m *mockValues) DBUpdate(s string, k ImageKey, t string, c Image) error {\r
fmt.Println("Mocked Mongo DB Update")\r
args := m.Called(s, k, t, c)\r
}\r
\r
func TestCreate(t *testing.T) {\r
}\r
\r
func TestCreate(t *testing.T) {\r
+ dir, err := ioutil.TempDir("", "test_images")\r
+ if err != nil {\r
+ log.Fatal(err)\r
+ }\r
+ defer os.RemoveAll(dir)\r
+\r
+ image := Image{\r
+ ImageName: "test_asdf",\r
+ }\r
+ key := ImageKey{ImageName:"test_asdf"}\r
myMocks := new(mockValues)\r
// just to get an error value\r
err1 := errors.New("math: square root of negative number")\r
\r
fakeUser := user.User{}\r
u := &fakeUser\r
myMocks := new(mockValues)\r
// just to get an error value\r
err1 := errors.New("math: square root of negative number")\r
\r
fakeUser := user.User{}\r
u := &fakeUser\r
+ file_path := path.Join(dir, "test_asdf")\r
\r
myMocks.On("DBCreate", "test_image", key, "test_meta", image).Return(nil)\r
myMocks.On("DBRead", "test_image", key, "test_meta").Return(arr_data, err1)\r
\r
myMocks.On("DBCreate", "test_image", key, "test_meta", image).Return(nil)\r
myMocks.On("DBRead", "test_image", key, "test_meta").Return(arr_data, err1)\r
- myMocks.On("DBUnmarshal", arr_data, image).Return(nil)\r
+ myMocks.On("DBUnmarshal", arr_data).Return(image, nil)\r
myMocks.On("GetCurrentUser").Return(&fakeUser, nil)\r
myMocks.On("GetCurrentUser").Return(&fakeUser, nil)\r
- myMocks.On("GetPath", u, "", "test_image").Return("", "")\r
- myMocks.On("OSMakeDir", "", 0744).Return(nil)\r
- myMocks.On("OSCreateFile", "").Return(nil)\r
+ myMocks.On("GetPath", u, "", "test_image").Return(file_path, dir)\r
\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
- _, err := imageClient.Create(image)\r
+ _, err = imageClient.Create(image)\r
if err != nil {\r
t.Errorf("Some error occured!")\r
}\r
}\r
\r
func TestDelete(t *testing.T) {\r
if err != nil {\r
t.Errorf("Some error occured!")\r
}\r
}\r
\r
func TestDelete(t *testing.T) {\r
+ tmpfile, err := ioutil.TempFile("", "test_images")\r
+ if err != nil {\r
+ log.Fatal(err)\r
+ }\r
+ defer os.Remove(tmpfile.Name())\r
+\r
+ key := ImageKey{ImageName: "test_asdf"}\r
fakeUser := user.User{}\r
u := &fakeUser\r
fakeUser := user.User{}\r
u := &fakeUser\r
+ file_path := tmpfile.Name()\r
\r
myMocks := new(mockValues)\r
\r
myMocks.On("DBDelete", "test_image", key, "test_meta").Return(nil)\r
myMocks.On("GetCurrentUser").Return(&fakeUser, nil)\r
\r
myMocks := new(mockValues)\r
\r
myMocks.On("DBDelete", "test_image", key, "test_meta").Return(nil)\r
myMocks.On("GetCurrentUser").Return(&fakeUser, nil)\r
- myMocks.On("GetPath", u, "", "test_image").Return("", "")\r
- myMocks.On("OSRemove", "").Return(nil)\r
+ myMocks.On("GetPath", u, "", "test_image").Return(file_path, "")\r
\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
- err := imageClient.Delete("")\r
+ err = imageClient.Delete("test_asdf")\r
if err != nil {\r
t.Errorf("Some error occured!")\r
}\r
if err != nil {\r
t.Errorf("Some error occured!")\r
}\r
myMocks := new(mockValues)\r
\r
myMocks.On("DBRead", "test_image", key, "test_meta").Return(arr_data, nil)\r
myMocks := new(mockValues)\r
\r
myMocks.On("DBRead", "test_image", key, "test_meta").Return(arr_data, nil)\r
- myMocks.On("DBUnmarshal", arr_data, image).Return(nil)\r
+ myMocks.On("DBUnmarshal", arr_data).Return(image, nil)\r
myMocks.On("DBUpdate", "test_image", key, "test_meta", image).Return(nil)\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
_, err := imageClient.Update("", image)\r
myMocks.On("DBUpdate", "test_image", key, "test_meta", image).Return(nil)\r
imageClient := ImageClient{myMocks, "test_image", "test_meta"}\r
_, err := imageClient.Update("", image)\r